From 14bbfd8548d28528db2f89823024ef85011eb2ba Mon Sep 17 00:00:00 2001 From: davidak Date: Mon, 6 Jan 2020 05:52:37 +0100 Subject: [PATCH 001/520] anarchism: init at 15.3-1 --- pkgs/data/documentation/anarchism/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/data/documentation/anarchism/default.nix diff --git a/pkgs/data/documentation/anarchism/default.nix b/pkgs/data/documentation/anarchism/default.nix new file mode 100644 index 00000000000..5b63e104d9d --- /dev/null +++ b/pkgs/data/documentation/anarchism/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitLab, xdg_utils }: + +stdenv.mkDerivation rec { + pname = "anarchism"; + version = "15.3-1"; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = pname; + rev = "debian%2F${version}"; # %2F = urlquote("/") + sha256 = "04ylk0y5b3jml2awmyz7m1hnymni8y1n83m0k6ychdh0px8frhm5"; + }; + + phases = [ "unpackPhase" "postPatch" "installPhase" ]; + + postPatch = '' + substituteInPlace debian/anarchism.desktop \ + --replace "/usr/bin/xdg-open" "${xdg_utils}/bin/xdg-open" + substituteInPlace debian/anarchism.desktop \ + --replace "file:///usr" "file://$out" + ''; + + installPhase = '' + mkdir -p $out/share/doc/anarchism $out/share/applications $out/share/icons/hicolor/scalable/apps + cp -r {html,markdown} $out/share/doc/anarchism + cp debian/anarchism.svg $out/share/icons/hicolor/scalable/apps + cp debian/anarchism.desktop $out/share/applications + ''; + + meta = with stdenv.lib; { + homepage = "http://www.anarchistfaq.org/"; + changelog = "http://anarchism.pageabode.com/afaq/new.html"; + description = "Exhaustive exploration of Anarchist theory and practice"; + longDescription = '' + The Anarchist FAQ is an excellent source of information regarding Anarchist + (libertarian socialist) theory and practice. It covers all major topics, + from the basics of Anarchism to very specific discussions of politics, + social organization, and economics. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ davidak ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ac4f781ad7..d2f988dd635 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17163,6 +17163,8 @@ in amiri = callPackage ../data/fonts/amiri { }; + anarchism = callPackage ../data/documentation/anarchism { }; + andagii = callPackage ../data/fonts/andagii { }; andika = callPackage ../data/fonts/andika { }; From e23ba2a1b0ec3d06c347c241042bd1e9f1fee074 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 2 Feb 2020 08:08:02 -0500 Subject: [PATCH 002/520] Revert "nixos/httpd: symlink apache configuration to /etc/httpd/httpd.conf for use in the apachectl command" This reverts commit 336a6f471f1e40d4a440b4176c2a1b8db65fe007. --- nixos/modules/services/web-servers/apache-httpd/default.nix | 3 --- pkgs/servers/http/apache-httpd/2.4.nix | 1 - 2 files changed, 4 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 3200a26364f..6a497c40def 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -643,9 +643,6 @@ in environment.systemPackages = [ pkg ]; - # required for "apachectl configtest" - environment.etc."httpd/httpd.conf".source = httpdConf; - services.httpd.phpOptions = '' ; Needed for PHP's mail() function. diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 252365098dd..d5da6df8d68 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { prePatch = '' sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|' - sed -i support/apachectl.in -e 's|$HTTPD -t|$HTTPD -t -f /etc/httpd/httpd.conf|' ''; # Required for ‘pthread_cancel’. From 0b91dfedbc4fda3068b58e8514b58f94c7fa972b Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 2 Feb 2020 08:38:57 -0500 Subject: [PATCH 003/520] nixos/httpd: override apachectl command to use generated httpd configuration --- .../services/web-servers/apache-httpd/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 6a497c40def..5ff3c5d313b 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -10,6 +10,12 @@ let pkg = cfg.package.out; + apachectl = pkgs.runCommand "apachectl" { meta.priority = -1; } '' + mkdir -p $out/bin + cp ${pkg}/bin/apachectl $out/bin/apachectl + sed -i $out/bin/apachectl -e 's|$HTTPD -t|$HTTPD -t -f ${httpdConf}|' + ''; + httpdConf = cfg.configFile; php = cfg.phpPackage.override { apacheHttpd = pkg.dev; /* otherwise it only gets .out */ }; @@ -641,7 +647,10 @@ in postRun = "systemctl reload httpd.service"; }) (filterAttrs (name: hostOpts: hostOpts.enableACME) cfg.virtualHosts); - environment.systemPackages = [ pkg ]; + environment.systemPackages = [ + apachectl + pkg + ]; services.httpd.phpOptions = '' From a1704db04e9dff14be2029c50d67a8495cfedc42 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Wed, 1 Apr 2020 16:18:29 -0700 Subject: [PATCH 004/520] emulateApp: document $NIX_ANDROID_EMULATOR_FLAGS --- doc/languages-frameworks/android.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index d76b590ede3..23547085b38 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -191,6 +191,8 @@ androidenv.emulateApp { } ``` +Additional flags may be applied to the Android SDK's emulator through the runtime environment variable `$NIX_ANDROID_EMULATOR_FLAGS`. + It is also possible to specify an APK to deploy inside the emulator and the package and activity names to launch it: From 3f27f5b022e208e07b545a47805a26491f1e87b0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 10 May 2020 12:10:49 +0000 Subject: [PATCH 005/520] snd: 20.2 -> 20.3 --- pkgs/applications/audio/snd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 9bc8fcb6694..76ea4efeace 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-20.2"; + name = "snd-20.3"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0ip4sfyxqlbghlggipmvvqjqs1a7qas0zcmzw8d1nwg6krjkfj0r"; + sha256 = "016slh34gb6qqb38m8k9yg48rbhc5p12084szcwvanhh5v7fc7mk"; }; nativeBuildInputs = [ pkgconfig ]; From 8f4070c4c6a48a5360ecfa6f803e36dfc3ca822c Mon Sep 17 00:00:00 2001 From: Joe Dupuis Date: Sat, 9 May 2020 21:10:06 -0400 Subject: [PATCH 006/520] nixos/monit: Allow splitting the config in multiple files --- nixos/modules/services/monitoring/monit.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix index ca935227217..aa51b83912c 100644 --- a/nixos/modules/services/monitoring/monit.nix +++ b/nixos/modules/services/monitoring/monit.nix @@ -4,19 +4,29 @@ with lib; let cfg = config.services.monit; + extraConfig = pkgs.writeText "monitConfig" cfg.extraConfig; in { + imports = [ + (mkRenamedOptionModule [ "services" "monit" "config" ] ["services" "monit" "extraConfig" ]) + ]; + options.services.monit = { enable = mkEnableOption "Monit"; - config = mkOption { - type = types.lines; - default = ""; - description = "monitrc content"; + configFiles = mkOption { + type = types.listOf types.path; + default = []; + description = "List of paths to be included in the monitrc file"; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Additional monit config as string"; + }; }; config = mkIf cfg.enable { @@ -24,7 +34,7 @@ in environment.systemPackages = [ pkgs.monit ]; environment.etc.monitrc = { - text = cfg.config; + text = concatMapStringsSep "\n" (path: "include ${path}") (cfg.configFiles ++ [extraConfig]); mode = "0400"; }; From 6a78816d7420ba5cb3093d4f0412d2bf0a57bfdd Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Tue, 12 May 2020 19:41:38 +0300 Subject: [PATCH 007/520] draco: init at 1.3.6 --- pkgs/development/libraries/draco/default.nix | 34 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/draco/default.nix diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix new file mode 100644 index 00000000000..f8b806482ac --- /dev/null +++ b/pkgs/development/libraries/draco/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake +}: + +stdenv.mkDerivation rec { + version = "1.3.6"; + pname = "draco"; + + src = fetchFromGitHub { + owner = "google"; + repo = "draco"; + rev = version; + sha256 = "06adhz8gsnns6q98yzjm64xs04qp2fhm9bv0wxny68rkw0bh95a0"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + # Fake these since we are building from a tarball + "-Ddraco_git_hash=${version}" + "-Ddraco_git_desc=${version}" + + "-DBUILD_UNITY_PLUGIN=1" + ]; + + meta = with stdenv.lib; { + description = "Library for compressing and decompressing 3D geometric meshes and point clouds"; + homepage = "https://google.github.io/draco/"; + license = licenses.asl20; + maintainers = with maintainers; [ jansol ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a22878b284e..b0784dc4f3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11495,6 +11495,8 @@ in dotconf = callPackage ../development/libraries/dotconf { }; + draco = callPackage ../development/libraries/draco { }; + # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { inherit (pkgsi686Linux) From 15002bf1fb27dbb4e595c8eaeccf8685137766f3 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 21 Apr 2020 22:03:38 +0200 Subject: [PATCH 008/520] libfakeXinerama: fix dangling symlinks --- pkgs/tools/X11/xpra/libfakeXinerama.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix index 712f47fb2c8..da5be29cae1 100644 --- a/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib cp libfakeXinerama.so.1.0 $out/lib + ln -s libfakeXinerama.so.1.0 $out/lib/libXinerama.so.1.0 ln -s libXinerama.so.1.0 $out/lib/libXinerama.so.1 ln -s libXinerama.so.1 $out/lib/libXinerama.so ''; From 3573aef274435abd0eb4b93a3a232391cc6efbf9 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 6 May 2020 12:00:16 +0200 Subject: [PATCH 009/520] libfakeXinerama: remove deprecated pattern per #28910 --- pkgs/tools/X11/xpra/libfakeXinerama.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix index da5be29cae1..e43043d78f2 100644 --- a/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXinerama ]; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - buildPhase = '' gcc -O2 -Wall fakeXinerama.c -fPIC -o libfakeXinerama.so.1.0 -shared ''; From 4384bebab8d44599ddd369618678fca45ec30764 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 May 2020 20:50:37 +0000 Subject: [PATCH 010/520] grails: 4.0.3 -> 4.1.0.M1 --- pkgs/development/web/grails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index fc68fa53246..55ec74eb173 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "4.0.3"; + version = "4.1.0.M1"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "107dvgwv2ldpdr99q1nvb1i93jj635p1n7md6q14v9m4a6a226sa"; + sha256 = "0l99x3g485qjpdd7ga553xpi1s6rq21p8v16qjzqwdhyld961qsr"; }; buildInputs = [ unzip ]; From 678711641627fd0ea1c21f1780f17099c2beb229 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Mon, 25 May 2020 23:01:28 +0200 Subject: [PATCH 011/520] talentedhack: init at 1.86 --- .../audio/talentedhack/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/audio/talentedhack/default.nix diff --git a/pkgs/applications/audio/talentedhack/default.nix b/pkgs/applications/audio/talentedhack/default.nix new file mode 100644 index 00000000000..b30cf59f7b3 --- /dev/null +++ b/pkgs/applications/audio/talentedhack/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, lv2, fftwFloat, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "talentedhack"; + version = "1.86"; + + src = fetchFromGitHub { + owner = "jeremysalwen"; + repo = "talentedhack"; + rev = "v${version}"; + sha256 = "0kwvayalysmk7y49jq0k16al252md8d45z58hphzsksmyz6148bx"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ lv2 fftwFloat ]; + + # To avoid name clashes, plugins should be compiled with symbols hidden, except for `lv2_descriptor`: + preConfigure = '' + sed -r 's/^CFLAGS.*$/\0 -fvisibility=hidden/' -i Makefile + ''; + + installPhase = '' + d=$out/lib/lv2/talentedhack.lv2 + mkdir -p $d + cp *.so *.ttl $d + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/jeremysalwen/TalentedHack"; + description = "LV2 port of Autotalent pitch correction plugin"; + license = licenses.gpl3; + maintainers = [ maintainers.michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 062e5bc97bc..6336523ca1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22191,6 +22191,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + talentedhack = callPackage ../applications/audio/talentedhack { }; + tambura = callPackage ../applications/audio/tambura { }; teams = callPackage ../applications/networking/instant-messengers/teams { }; From 2e0e62bf9835e7ab4653c7f47e59c26662b10cb1 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Mon, 25 May 2020 23:13:39 +0200 Subject: [PATCH 012/520] vocproc: init at 0.2.1 --- .../audio/lv2-cpp-tools/default.nix | 28 +++++++++++++++++++ pkgs/applications/audio/vocproc/default.nix | 27 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 59 insertions(+) create mode 100644 pkgs/applications/audio/lv2-cpp-tools/default.nix create mode 100644 pkgs/applications/audio/vocproc/default.nix diff --git a/pkgs/applications/audio/lv2-cpp-tools/default.nix b/pkgs/applications/audio/lv2-cpp-tools/default.nix new file mode 100644 index 00000000000..d98135fb014 --- /dev/null +++ b/pkgs/applications/audio/lv2-cpp-tools/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchzip, pkgconfig, lv2, gtkmm2, boost }: + +stdenv.mkDerivation rec { + pname = "lv2-cpp-tools"; + version = "1.0.5"; + + src = fetchzip { + url = "http://deb.debian.org/debian/pool/main/l/lv2-c++-tools/lv2-c++-tools_${version}.orig.tar.bz2"; + sha256 = "039bq7d7s2bhfcnlsfq0mqxr9a9iqwg5bwcpxfi24c6yl6krydsi"; + }; + + preConfigure = '' + sed -r 's,/bin/bash,${stdenv.shell},g' -i ./configure + sed -r 's,/sbin/ldconfig,ldconfig,g' -i ./Makefile.template + ''; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ lv2 gtkmm2 boost ]; + + meta = with stdenv.lib; { + homepage = "http://ll-plugins.nongnu.org/hacking.html"; + description = "Tools and libraries that may come in handy when writing LV2 plugins in C++"; + license = licenses.gpl3; + maintainers = [ maintainers.michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/vocproc/default.nix b/pkgs/applications/audio/vocproc/default.nix new file mode 100644 index 00000000000..ddaa5b790e2 --- /dev/null +++ b/pkgs/applications/audio/vocproc/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip, pkgconfig, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }: + +stdenv.mkDerivation rec { + pname = "vocproc"; + version = "0.2.1"; + + src = fetchzip { + url = "https://hyperglitch.com/files/vocproc/${pname}-${version}.default.tar.gz"; + sha256 = "07a1scyz14mg2jdbw6fpv4qg91zsw61qqii64n9qbnny9d5pn8n2"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ lv2 fftw lv2-cpp-tools gtkmm2 ]; + + makeFlags = [ + "INSTALL_DIR=$(out)/lib/lv2" + ]; + + meta = with stdenv.lib; { + homepage = "https://hyperglitch.com/dev/VocProc"; + description = "An LV2 plugin for pitch shifting (with or without formant correction), vocoding, automatic pitch correction and harmonizing of singing voice (harmonizer)"; + license = licenses.gpl2; + maintainers = [ maintainers.michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 062e5bc97bc..83934e9c80a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20654,6 +20654,8 @@ in lv2bm = callPackage ../applications/audio/lv2bm { }; + lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { }; + lynx = callPackage ../applications/networking/browsers/lynx { }; lyx = libsForQt5.callPackage ../applications/misc/lyx { }; @@ -22590,6 +22592,8 @@ in vmpk = callPackage ../applications/audio/vmpk { }; + vocproc = callPackage ../applications/audio/vocproc { }; + vnstat = callPackage ../applications/networking/vnstat { }; vocal = callPackage ../applications/audio/vocal { }; From d5b0454f43931d4ee8d2c4df079428d2743f3046 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Wed, 27 May 2020 14:14:36 +0200 Subject: [PATCH 013/520] imag: init at 0.10.1 Co-authored-by: Oleksii Filonenko --- pkgs/applications/misc/imag/default.nix | 63 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 67 insertions(+) create mode 100644 pkgs/applications/misc/imag/default.nix diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix new file mode 100644 index 00000000000..bb6956aaa59 --- /dev/null +++ b/pkgs/applications/misc/imag/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, llvmPackages +, openssl +, pkg-config +, installShellFiles +, Security +, gitMinimal +, utillinuxMinimal +}: + +rustPlatform.buildRustPackage rec { + pname = "imag"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "matthiasbeyer"; + repo = pname; + rev = "v${version}"; + sha256 = "0f9915f083z5qqcxyavj0w6m973c8m1x7kfb89pah5agryy5mkaq"; + }; + + nativeBuildInputs = [ installShellFiles pkg-config ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + checkInputs = [ gitMinimal utillinuxMinimal ]; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + cargoSha256 = "0n8cw70qh8g4hfwfaxwwxbrrx5hm2z037z8kdhvdpqkxljl9189x"; + + checkPhase = '' + export HOME=$TMPDIR + git config --global user.email "nobody@example.com" + git config --global user.name "Nobody" + + # UI tests uses executables directly, so we need to build them before + # launching the tests + cargo build + '' + ( + # CLI uses the presence of a controlling TTY to check if arguments are + # passed in stdin, or in the command-line, so we use script to create + # a PTY for us. + if !stdenv.isDarwin then '' + script -qfec "cargo test --workspace" + '' else '' + script -q "cargo test --workspace" + '' + ); + + postInstall = '' + installShellCompletion target/imag.{bash,fish} --zsh target/_imag + ''; + + meta = with stdenv.lib; { + description = "Commandline personal information management suite"; + homepage = "https://imag-pim.org/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ filalex77 minijackson ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbac14b4852..69384874509 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20184,6 +20184,10 @@ in iksemel = callPackage ../development/libraries/iksemel { }; + imag = callPackage ../applications/misc/imag { + inherit (darwin.apple_sdk.frameworks) Security; + }; + imagej = callPackage ../applications/graphics/imagej { }; imagemagick_light = imagemagick.override { From 3b1ed035c3e09c245cbb89449fe3a8ebfdfa61a7 Mon Sep 17 00:00:00 2001 From: David Wagner Date: Thu, 28 May 2020 17:38:40 +0200 Subject: [PATCH 014/520] create-amis: fix argument check Because this script enables `set -u` when no arguments are provided bash exits with the error: $1: unbound variable instead of the helpful usage message. --- nixos/maintainers/scripts/ec2/create-amis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 145eb49ced7..89e24f2ccfd 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -29,7 +29,7 @@ log() { echo "$@" >&2 } -if [ -z "$1" ]; then +if [ "$#" -ne 1 ]; then log "Usage: ./upload-amazon-image.sh IMAGE_OUTPUT" exit 1 fi From c56b2821a1b6d7ea942db24bb271e035e02634db Mon Sep 17 00:00:00 2001 From: wchresta <34962284+wchresta@users.noreply.github.com> Date: Thu, 28 May 2020 23:19:58 -0400 Subject: [PATCH 015/520] legendary-gl: init at 0.0.14 * Adds requested launcher for EPIC games * Fix #88963 --- pkgs/games/legendary-gl/default.nix | 30 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/games/legendary-gl/default.nix diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix new file mode 100644 index 00000000000..114aa6ab12a --- /dev/null +++ b/pkgs/games/legendary-gl/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitHub +, buildPythonApplication +, pythonOlder +, requests +}: + +buildPythonApplication rec { + pname = "legendary-gl"; # Name in pypi + version = "0.0.14"; + + src = fetchFromGitHub { + owner = "derrod"; + repo = "legendary"; + rev = version; + sha256 = "05r88qi8mmbj07wxcpb3fhbl40qscbq1aqb0mnj9bpmi9gf5zll5"; + }; + + propagatedBuildInputs = [ requests ]; + + disabled = pythonOlder "3.8"; + + meta = with lib; { + description = "A free and open-source Epic Games Launcher alternative"; + homepage = "https://github.com/derrod/legendary"; + license = licenses.gpl3; + maintainers = with maintainers; [ wchresta ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f3447d9936..84c287a00ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23770,6 +23770,8 @@ in leela-zero = libsForQt5.callPackage ../games/leela-zero { }; + legendary-gl = python38Packages.callPackage ../games/legendary-gl { }; + lgogdownloader = callPackage ../games/lgogdownloader { }; liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; From 9581a0873980edfb5320351f14ee3ce3b8914138 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sun, 31 May 2020 20:35:15 +0200 Subject: [PATCH 016/520] pipenv: refactor runtimeDeps Make `runtimeDeps` a function, so that it will return a selection of the packages in the set passed to it by `python3.withPackages`, rather than the same packages taken directly from `python3.pkgs`. --- pkgs/development/tools/pipenv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 4176db2940c..fa56feb09fb 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -6,7 +6,7 @@ with python3.pkgs; let - runtimeDeps = [ + runtimeDeps = ps: with ps; [ certifi setuptools pip @@ -14,7 +14,7 @@ let virtualenv-clone ]; - pythonEnv = python3.withPackages(ps: with ps; runtimeDeps); + pythonEnv = python3.withPackages runtimeDeps; in buildPythonApplication rec { pname = "pipenv"; @@ -36,7 +36,7 @@ in buildPythonApplication rec { --replace "sys.executable" "'${pythonEnv.interpreter}'" ''; - propagatedBuildInputs = runtimeDeps; + propagatedBuildInputs = runtimeDeps python3.pkgs; doCheck = true; checkPhase = '' From e2341359953dcf1361c47e80d6ca3bdb83cfbdc6 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 25 Sep 2017 13:07:25 +0200 Subject: [PATCH 017/520] stage-1: retry mounting ZFS root a few times This is a workaround for NixOS/nixpkgs#25383 --- nixos/modules/system/boot/stage-1-init.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 607aec87f01..0f6648b4dca 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -370,12 +370,14 @@ mountFS() { mkdir -p "/mnt-root$mountPoint" - # For CIFS mounts, retry a few times before giving up. + # For ZFS and CIFS mounts, retry a few times before giving up. + # We do this for ZFS as a workaround for issue NixOS/nixpkgs#25383. local n=0 while true; do mount "/mnt-root$mountPoint" && break - if [ "$fsType" != cifs -o "$n" -ge 10 ]; then fail; break; fi + if [ \( "$fsType" != cifs -a "$fsType" != zfs \) -o "$n" -ge 10 ]; then fail; break; fi echo "retrying..." + sleep 1 n=$((n + 1)) done From eafecc8d512b1f920fe5881940b6f6952d2d5d28 Mon Sep 17 00:00:00 2001 From: David Izquierdo Date: Fri, 5 Jun 2020 11:57:36 +0200 Subject: [PATCH 018/520] tests: transmission is now tested with apparmor --- nixos/tests/transmission.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix index f4f2186be1f..37c0352dcfb 100644 --- a/nixos/tests/transmission.nix +++ b/nixos/tests/transmission.nix @@ -9,6 +9,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { networking.firewall.allowedTCPPorts = [ 9091 ]; + security.apparmor.enable = true; + services.transmission.enable = true; }; From d00bd8200bbdcb6003ba676ce09b1a96d809bed7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 09:25:34 +0000 Subject: [PATCH 019/520] hyperrogue: 11.3l -> 11.3o --- pkgs/games/hyperrogue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 1ef0fd147d8..32882f16894 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "11.3l"; + version = "11.3o"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "0fniyaf9mgg99s03wbdc36zg909kshpdfk9pn8pkai0x99lghkwb"; + sha256 = "0bijgbqpc867pq8lbwwvcnc713gm51mmz625xb5br0q2qw09nkyh"; }; CPPFLAGS = "-I${SDL.dev}/include/SDL"; From 06d0a781d8a3818d08f2f8faf8a288471b85a48f Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 29 May 2020 20:24:21 +0700 Subject: [PATCH 020/520] gocode-gomod: 2019-03-27 -> 1.0.0 --- .../development/tools/gocode-gomod/default.nix | 18 ++++++------------ pkgs/development/tools/gocode-gomod/deps.nix | 11 ----------- 2 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/tools/gocode-gomod/deps.nix diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index 603568236e6..f868b4bf761 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -1,11 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - pname = "gocode-gomod-unstable"; - version = "2019-03-27"; - rev = "81059208699789f992bb4a4a3fedd734e335468d"; - - goPackagePath = "github.com/stamblerre/gocode"; +buildGoModule rec { + pname = "gocode-gomod"; + version = "1.0.0"; # we must allow references to the original `go` package, # because `gocode` needs to dig into $GOROOT to provide completions for the @@ -15,15 +12,12 @@ buildGoPackage rec { excludedPackages = ''internal/suggest/testdata''; src = fetchFromGitHub { - inherit rev; - owner = "stamblerre"; repo = "gocode"; - sha256 = "0y5lc7sq3913mvvczwx8mq5l3l9yg34jzaw742q8jpd1jzqyza94"; + rev = "v${version}"; + sha256 = "YAOYrPPKgnjCErq8+iW0Le51clGBv0MJy2Nnn7UVo/s="; }; - goDeps = ./deps.nix; - postInstall = '' mv $out/bin/gocode $out/bin/gocode-gomod ''; diff --git a/pkgs/development/tools/gocode-gomod/deps.nix b/pkgs/development/tools/gocode-gomod/deps.nix deleted file mode 100644 index ac966269706..00000000000 --- a/pkgs/development/tools/gocode-gomod/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "78dc5bac0cacea7969e98b79c3b86597e0aa4e25"; - sha256 = "16jg2x1sfm39kz4rchn0gxyq99fnkxw6v51wxriqbs76a2wrznp9"; - }; - } -] From e77c051f79381b37cc8a8087c5810632fc6f3ed8 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 28 May 2020 12:55:01 +0700 Subject: [PATCH 021/520] go-migrate: init at 4.11.0 --- pkgs/development/tools/go-migrate/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/go-migrate/default.nix diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix new file mode 100644 index 00000000000..2864308c14d --- /dev/null +++ b/pkgs/development/tools/go-migrate/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-migrate"; + version = "4.11.0"; + + src = fetchFromGitHub { + owner = "golang-migrate"; + repo = "migrate"; + rev = "v${version}"; + sha256 = "Dw+TiuksgOfFBCzNc9rsxyQCoXES+fpr4wTrZfqohGM="; + }; + + vendorSha256 = "CezVFRZ/cknvK4t/MjyP46zJACGkzj4CZ5JVQ502Ihw="; + + subPackages = [ "cmd/migrate" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/golang-migrate/migrate"; + description = "Database migrations. CLI and Golang library."; + maintainers = with maintainers; [ offline ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2b95da052c..ece92076a89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17389,6 +17389,8 @@ in gotop = callPackage ../tools/system/gotop { }; + go-migrate = callPackage ../development/tools/go-migrate { }; + gomodifytags = callPackage ../development/tools/gomodifytags { }; go-langserver = callPackage ../development/tools/go-langserver { }; From a0189a4c495da3c7945c42b56c5dae501206c268 Mon Sep 17 00:00:00 2001 From: "J. Konrad Tegtmeier-Rottach" Date: Mon, 8 Jun 2020 02:17:55 +0200 Subject: [PATCH 022/520] nixos/acme: add extraLegoFlags option --- nixos/modules/security/acme.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 776ef07d716..7b492a67b28 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -150,6 +150,14 @@ let ''; }; + extraLegoFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Additional global flags to pass to all lego commands. + ''; + }; + extraLegoRenewFlags = mkOption { type = types.listOf types.str; default = []; @@ -308,7 +316,8 @@ in ++ optionals (data.dnsProvider != null && !data.dnsPropagationCheck) [ "--dns.disable-cp" ] ++ concatLists (mapAttrsToList (name: root: [ "-d" name ]) data.extraDomains) ++ (if data.dnsProvider != null then [ "--dns" data.dnsProvider ] else [ "--http" "--http.webroot" data.webroot ]) - ++ optionals (cfg.server != null || data.server != null) ["--server" (if data.server == null then cfg.server else data.server)]; + ++ optionals (cfg.server != null || data.server != null) ["--server" (if data.server == null then cfg.server else data.server)] + ++ data.extraLegoFlags; certOpts = optionals data.ocspMustStaple [ "--must-staple" ]; runOpts = escapeShellArgs (globalOpts ++ [ "run" ] ++ certOpts); renewOpts = escapeShellArgs (globalOpts ++ From 1719353619662f5fed705cc10f54834edb01bb38 Mon Sep 17 00:00:00 2001 From: "J. Konrad Tegtmeier-Rottach" Date: Mon, 8 Jun 2020 02:18:31 +0200 Subject: [PATCH 023/520] nixos/acme: add extraLegoRunFlags option --- nixos/modules/security/acme.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 7b492a67b28..6c26e39524c 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -165,6 +165,14 @@ let Additional flags to pass to lego renew. ''; }; + + extraLegoRunFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Additional flags to pass to lego run. + ''; + }; }; }; @@ -319,7 +327,7 @@ in ++ optionals (cfg.server != null || data.server != null) ["--server" (if data.server == null then cfg.server else data.server)] ++ data.extraLegoFlags; certOpts = optionals data.ocspMustStaple [ "--must-staple" ]; - runOpts = escapeShellArgs (globalOpts ++ [ "run" ] ++ certOpts); + runOpts = escapeShellArgs (globalOpts ++ [ "run" ] ++ certOpts ++ data.extraLegoRunFlags); renewOpts = escapeShellArgs (globalOpts ++ [ "renew" "--days" (toString cfg.validMinDays) ] ++ certOpts ++ data.extraLegoRenewFlags); From ebc2067bc57fa918e57f8cd61d1574e6fe231e1b Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Mon, 8 Jun 2020 00:04:15 -0400 Subject: [PATCH 024/520] logstash: fix support for multiple plugin paths --- nixos/modules/services/logging/logstash.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 21a83803fd8..bf92425f998 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -4,13 +4,9 @@ with lib; let cfg = config.services.logstash; - pluginPath = lib.concatStringsSep ":" cfg.plugins; - havePluginPath = lib.length cfg.plugins > 0; ops = lib.optionalString; verbosityFlag = "--log.level " + cfg.logLevel; - pluginsPath = "--path.plugins ${pluginPath}"; - logstashConf = pkgs.writeText "logstash.conf" '' input { ${cfg.inputConfig} @@ -173,7 +169,7 @@ in ExecStart = concatStringsSep " " (filter (s: stringLength s != 0) [ "${cfg.package}/bin/logstash" "-w ${toString cfg.filterWorkers}" - (ops havePluginPath pluginsPath) + (concatMapStringsSep " " (x: "--path.plugins ${x}") cfg.plugins) "${verbosityFlag}" "-f ${logstashConf}" "--path.settings ${logstashSettingsDir}" From dc9db8607d0770ce2f7fbb773fdd9d041c4c7cd5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 01:49:54 +0000 Subject: [PATCH 025/520] sickgear: 0.21.33 -> 0.21.36 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index e67b7244a32..b04675d64f4 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.21.33"; + version = "0.21.36"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "0ilgjm21psfb0ix32qm560976wn84qg0y5cg7506ybwsynlmway2"; + sha256 = "0kssz44agvb5zxjq2i566f4xk9924372hjpj0czjckrrjvzjqvci"; }; dontBuild = true; From b1049a61f1378af4a7c67090bdaee3c94ba0700c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 02:32:13 +0000 Subject: [PATCH 026/520] star: 2.7.3a -> 2.7.4a --- pkgs/applications/science/biology/star/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index 6f4211d0c0d..3f362e6d46a 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "star"; - version = "2.7.3a"; + version = "2.7.4a"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "1hgiqw5qhs0pc1xazzihcfd92na02xyq2kb469z04y1v51kpvvjq"; + sha256 = "1y4g7h6f95pa9g8kv1aihrfglavqymdx4mnqh6ascs50ibm7zdmz"; }; sourceRoot = "source/source"; From a1661151c60c9d2e1dd8f333a4332ca06f70d52d Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Tue, 9 Jun 2020 13:54:38 -0700 Subject: [PATCH 027/520] lattice-diamond: add libusb-compat-0_1 dependency Lattice Diamond won't be able to produce a PROM file without libusb 0.1 so one has to be supplied. --- pkgs/development/tools/lattice-diamond/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix index 1dea1440113..6720603b2e5 100644 --- a/pkgs/development/tools/lattice-diamond/default.nix +++ b/pkgs/development/tools/lattice-diamond/default.nix @@ -1,5 +1,5 @@ { stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, - freetype, fontconfig, xorg }: + freetype, fontconfig, xorg, libusb-compat-0_1 }: stdenv.mkDerivation { name = "diamond-3.10"; @@ -98,6 +98,7 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ glib zlib freetype fontconfig xorg.libSM xorg.libICE xorg.libXrender xorg.libXext xorg.libX11 xorg.libXt + libusb-compat-0_1 ]; meta = { From 27373f56b4813e2ac39ee21617f00c75668ff1e8 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Fri, 12 Jun 2020 21:55:49 -0400 Subject: [PATCH 028/520] crawl: 0.24.1 -> 0.25.0 Thanks to @emilazy adding support for pkgconfig for SQLite upstream, we can drop that part of the patch. The rest is still needed. --- pkgs/games/crawl/crawl_purify.patch | 43 ++++++++++------------------- pkgs/games/crawl/default.nix | 4 +-- 2 files changed, 16 insertions(+), 31 deletions(-) diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch index f792dc013f0..dda55b09f32 100644 --- a/pkgs/games/crawl/crawl_purify.patch +++ b/pkgs/games/crawl/crawl_purify.patch @@ -1,37 +1,22 @@ -diff -ru3 crawl-ref-0.23.2-src-old/crawl-ref/source/Makefile crawl-ref-0.23.2-src-new/crawl-ref/source/Makefile ---- crawl-ref-0.23.2-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300 -+++ crawl-ref-0.23.2-src-new/crawl-ref/source/Makefile 2017-07-27 14:45:34.611221571 +0300 -@@ -224,9 +224,9 @@ - STRIP := strip -x - NEED_APPKIT = YesPlease - LIBNCURSES_IS_UNICODE = Yes +diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile +--- a/crawl-ref/source/Makefile ++++ b/crawl-ref/source/Makefile +@@ -248,9 +248,9 @@ ifeq ($(uname_S),Darwin) + STRIP := strip -x + NEED_APPKIT = YesPlease + LIBNCURSES_IS_UNICODE = Yes - NO_PKGCONFIG = Yes - BUILD_SQLITE = YesPlease - BUILD_ZLIB = YesPlease + #NO_PKGCONFIG = Yes + #BUILD_SQLITE = YesPlease + #BUILD_ZLIB = YesPlease - ifdef TILES - EXTRA_LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL -framework AudioToolbox -framework CoreVideo contrib/install/$(ARCH)/lib/libSDL2main.a - BUILD_FREETYPE = YesPlease -@@ -286,13 +286,7 @@ - LIBZ := contrib/install/$(ARCH)/lib/libz.a - - ifndef CROSSHOST -- # FreeBSD keeps all of its userland includes in /usr/local so -- # look there -- ifeq ($(uname_S),FreeBSD) -- SQLITE_INCLUDE_DIR := /usr/local/include -- else -- SQLITE_INCLUDE_DIR := /usr/include -- endif -+ SQLITE_INCLUDE_DIR := ${sqlite}/include - else - # This is totally wrong, works only with some old-style setups, and - # on some architectures of Debian/new FHS multiarch -- excluding, for -diff -ru3 crawl-ref-0.23.2-src-old/crawl-ref/source/util/find_font crawl-ref-0.23.2-src-new/crawl-ref/source/util/find_font ---- crawl-ref-0.23.2-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300 -+++ crawl-ref-0.23.2-src-new/crawl-ref/source/util/find_font 2017-07-27 14:44:29.784235540 +0300 + ifdef TILES + EXTRA_LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL -framework AudioToolbox -framework CoreVideo contrib/install/$(ARCH)/lib/libSDL2main.a + BUILD_FREETYPE = YesPlease +diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font +--- a/crawl-ref/source/util/find_font ++++ b/crawl-ref/source/util/find_font @@ -1,6 +1,6 @@ #! /bin/sh @@ -59,4 +44,4 @@ diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmana +# include # if defined(USE_SOUND) && !defined(WINMM_PLAY_SOUNDS) # include - # endif \ No newline at end of file + # endif diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 8fe3b20419a..eeb8bd7f9db 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.24.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "1fiizkigmbrw0nb1l1m3syl2mw4a4r36l1y0n4z8z7slp79bsbv4"; + sha256 = "0swcl8cxz64yw8dl9macz8ar1ccwrkwz89j7s1f60inb5jlxifqm"; }; # Patch hard-coded paths and remove force library builds From 19c5353b7379fca02914767f96f0c36e846267e5 Mon Sep 17 00:00:00 2001 From: Aditya Sharma Date: Sat, 13 Jun 2020 16:44:39 -0400 Subject: [PATCH 029/520] solargraph: 0.38.6 -> 0.39.8 --- .../ruby-modules/solargraph/Gemfile.lock | 26 +++++---- .../ruby-modules/solargraph/gemset.nix | 56 ++++++++++++------- 2 files changed, 52 insertions(+), 30 deletions(-) diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock index d9438a79956..f5ef7d8d32f 100644 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - ast (2.4.0) + ast (2.4.1) backport (1.1.2) benchmark (0.1.0) e2mmap (0.1.0) @@ -11,22 +11,26 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.0.5) + parser (2.7.1.3) ast (~> 2.4.0) rainbow (3.0.0) - reverse_markdown (1.4.0) + regexp_parser (1.7.1) + reverse_markdown (2.0.0) nokogiri rexml (3.2.4) - rubocop (0.80.1) - jaro_winkler (~> 1.5.1) + rubocop (0.85.1) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) rexml + rubocop-ast (>= 0.0.3) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.0.3) + parser (>= 2.7.0.1) ruby-progressbar (1.10.1) - solargraph (0.38.6) + solargraph (0.39.8) backport (~> 1.1) benchmark bundler (>= 1.17.2) @@ -35,15 +39,15 @@ GEM maruku (~> 0.7, >= 0.7.3) nokogiri (~> 1.9, >= 1.9.1) parser (~> 2.3) - reverse_markdown (~> 1.0, >= 1.0.5) + reverse_markdown (>= 1.0.5, < 3) rubocop (~> 0.52) thor (~> 1.0) tilt (~> 2.0) - yard (~> 0.9) + yard (~> 0.9, >= 0.9.24) thor (1.0.1) tilt (2.0.10) - unicode-display_width (1.6.1) - yard (0.9.24) + unicode-display_width (1.7.0) + yard (0.9.25) PLATFORMS ruby diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix index a6ec78b7458..655384ec49a 100644 --- a/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -1,14 +1,13 @@ { ast = { - dependencies = []; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; + sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; backport = { dependencies = []; @@ -104,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iirjc36irgwpfb58jdf9gli382cj893y9caqhxas8anpzzlikgc"; + sha256 = "162122h7vkg9crc9gsjwpy6bjrwg9r8ghhimwk952i5rrln3kird"; type = "gem"; }; - version = "2.7.0.5"; + version = "2.7.1.3"; }; rainbow = { dependencies = []; @@ -120,16 +119,26 @@ }; version = "3.0.0"; }; + regexp_parser = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "106azpr2c280y2f8jnr6fd49q1abb43xh9hhgbxc4d4kvzpa8094"; + type = "gem"; + }; + version = "1.7.1"; + }; reverse_markdown = { dependencies = ["nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53"; + sha256 = "0w6fv779542vdliq2kmikfhymjv55z8mgzblkfjdy2agl07da9c6"; type = "gem"; }; - version = "1.4.0"; + version = "2.0.0"; }; rexml = { dependencies = []; @@ -143,15 +152,26 @@ version = "3.2.4"; }; rubocop = { - dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i8pw7p4dk11xpahs0j6vlvqlv3rgapaccj933g0i34hbx392lj8"; + sha256 = "1ghvlbaxcvwqqpkikzdg125frf5i733lhnih79ghrvc4rykvi86h"; type = "gem"; }; - version = "0.80.1"; + version = "0.85.1"; + }; + rubocop-ast = { + dependencies = ["parser"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lbs9is1y85cmd6p3yq3v0nppq4rhpy8ynk2ln0y4rwrlb5088dh"; + type = "gem"; + }; + version = "0.0.3"; }; ruby-progressbar = { dependencies = []; @@ -170,10 +190,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kcqm032sq1y4pgg7cl32hv74573b1vsy79x81zglar80ybgzv4"; + sha256 = "140zs7syf6l641p6459rg1byc2h9z2ldhmc0hbzmkgqp4lw18n7c"; type = "gem"; }; - version = "0.38.6"; + version = "0.39.8"; }; thor = { dependencies = []; @@ -198,25 +218,23 @@ version = "2.0.10"; }; unicode-display_width = { - dependencies = []; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x"; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; type = "gem"; }; - version = "1.6.1"; + version = "1.7.0"; }; yard = { - dependencies = []; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g0bw2qcl48fxawrdf68l229508z53mrqisavji2lkxzv4w4j2pp"; + sha256 = "126m49mvh4lbvlvrprq7xj2vjixbq3xqr8dwr089vadvs0rkn4rd"; type = "gem"; }; - version = "0.9.24"; + version = "0.9.25"; }; -} +} \ No newline at end of file From 730b64875bdbab13cf51fa4cf9ec93d0511423ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 12:45:40 +0000 Subject: [PATCH 030/520] csound: 6.13.0 -> 6.14.0 --- pkgs/applications/audio/csound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 4b426609fea..944a2d189d7 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # When updating, please check if https://github.com/csound/csound/issues/1078 # has been fixed in the new version so we can use the normal fluidsynth # version and remove fluidsynth 1.x from nixpkgs again. - version = "6.13.0"; + version = "6.14.0"; enableParallelBuilding = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "14822ybqyp31z18gky2y9zadr9dkbhabg97y139py73w7v3af1bh"; + sha256 = "1sr9knfhbm2m0wpkjq2l5n471vnl51wy4p6j4m95zqybimzb4s2j"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp From 5d9a5c864e6a94eda5dcdd20f2fc1dc94101af38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 13:49:03 +0000 Subject: [PATCH 031/520] duckdb: 0.1.7 -> 0.1.8 --- pkgs/development/libraries/duckdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index e37856abe2b..05961bce89c 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "cwida"; repo = "duckdb"; rev = "v${version}"; - sha256 = "1pz2q9c3803w8vbqiz9lag4g1kgl4ff9xca0kpcz72ap39pbp5jk"; + sha256 = "15qn967q9v23l0sgb2jqb77z4qdkyn1zwdpj4b0rd9zk5h3fzj55"; }; nativeBuildInputs = [ cmake ]; From 6cddce1d1d5fd0dca9ca955be41ce20f7495e40d Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 15 Jun 2020 19:12:34 +0200 Subject: [PATCH 032/520] rebazel: init at 0.1.4 --- pkgs/development/tools/rebazel/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/tools/rebazel/default.nix diff --git a/pkgs/development/tools/rebazel/default.nix b/pkgs/development/tools/rebazel/default.nix new file mode 100644 index 00000000000..73a58ee100b --- /dev/null +++ b/pkgs/development/tools/rebazel/default.nix @@ -0,0 +1,21 @@ +{ lib, rustPlatform, fetchFromGitHub }: +rustPlatform.buildRustPackage rec { + pname = "rebazel"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "meetup"; + repo = "rebazel"; + rev = "v${version}"; + hash = "sha256-v84ZXhtJpejQmP61NmP06+qrtMu/0yb7UyD7U12xlME="; + }; + + cargoSha256 = "sha256-2FmtbvtNfNoocj3Ly553KBLfOgBAa/eAxOrfZ3NGzzw="; + + meta = with lib; { + description = "tool for expediting bazel build workflows"; + homepage = "https://github.com/meetup/rebazel"; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78f1bf6ac24..51e43851779 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10075,6 +10075,8 @@ in bazelisk = callPackage ../development/tools/bazelisk { }; + rebazel = callPackage ../development/tools/rebazel { }; + buildBazelPackage = callPackage ../build-support/build-bazel-package { }; bear = callPackage ../development/tools/build-managers/bear { }; From f67ea884ff2b19f704f62f2c94672d8cf1ba5a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sat, 6 Jun 2020 09:45:19 +0100 Subject: [PATCH 033/520] ssb-patchwork: 3.17.7 -> 3.18.0 removing thedavidmeister as per his request as well --- .../networking/ssb-patchwork/default.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/ssb-patchwork/default.nix b/pkgs/applications/networking/ssb-patchwork/default.nix index db33e7e6bb2..7bc5563d470 100644 --- a/pkgs/applications/networking/ssb-patchwork/default.nix +++ b/pkgs/applications/networking/ssb-patchwork/default.nix @@ -2,12 +2,12 @@ let pname = "ssb-patchwork"; - version = "3.17.7"; + version = "3.18.0"; name = "Patchwork-${version}"; src = fetchurl { url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage"; - sha256 = "1xj2aqy7daf4r3ypch6hkvk1s0jnx70qwh0p63c7rzm16vh8kb2f"; + sha256 = "1sb9q1qj5mj4cf8d9dsc498mg8a1ri2y0p9qbh44i8ykby8jkgjc"; }; binary = appimageTools.wrapType2 { @@ -40,14 +40,14 @@ in cp ${desktopItem}/share/applications/* $out/share/applications/ ''; - meta = with lib; { - description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)"; - longDescription = '' - sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship. - ''; - homepage = "https://www.scuttlebutt.nz/"; - license = licenses.agpl3; - maintainers = with maintainers; [ asymmetric ninjatrappeur thedavidmeister ]; - platforms = [ "x86_64-linux" ]; - }; -} + meta = with lib; { + description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)"; + longDescription = '' + sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship. + ''; + homepage = "https://www.scuttlebutt.nz/"; + license = licenses.agpl3; + maintainers = with maintainers; [ asymmetric ninjatrappeur ]; + platforms = [ "x86_64-linux" ]; + }; + } From 6ee536ac94f079de27cadb2ec8733899c0dd5def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Abdelkader=20Mart=C3=ADnez=20P=C3=A9rez?= Date: Sun, 14 Jun 2020 13:31:48 +0200 Subject: [PATCH 034/520] wiimms-iso-tools: init at 3.02a --- .../filesystems/wiimms-iso-tools/default.nix | 37 +++++++++++++++++++ .../wiimms-iso-tools/fix-paths.diff | 12 ++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 51 insertions(+) create mode 100644 pkgs/tools/filesystems/wiimms-iso-tools/default.nix create mode 100644 pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix new file mode 100644 index 00000000000..cb09fdcf131 --- /dev/null +++ b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, zlib, ncurses, fuse}: + +stdenv.mkDerivation rec { + name = "wiimms-iso-tools"; + version = "3.02a"; + + src = fetchurl { + url = "https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-${version}.tar.bz2"; + sha256 = "074cvcaqz23xyihslc6n64wwxwcnl6xp7l0750yb9pc0wrqxmj69"; + }; + + buildInputs = [ zlib ncurses fuse ]; + + patches = [ ./fix-paths.diff ]; + postPatch = '' + patchShebangs setup.sh + patchShebangs gen-template.sh + patchShebangs gen-text-file.sh + ''; + + NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; + INSTALL_PATH = "$out"; + + installPhase = '' + mkdir "$out" + patchShebangs install.sh + ./install.sh --no-sudo + ''; + + meta = with stdenv.lib; { + homepage = "https://wit.wiimm.de"; + description = "A set of command line tools to manipulate Wii and GameCube ISO images and WBFS containers"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ nilp0inter ]; + }; +} diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff b/pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff new file mode 100644 index 00000000000..4a545e92a18 --- /dev/null +++ b/pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff @@ -0,0 +1,12 @@ +diff -r -u wiimms-iso-tools.source-3.02a.patched/setup.sh wiimms-iso-tools.source-3.02a/setup.sh +--- wiimms-iso-tools.source-3.02a.patched/setup.sh 2020-06-02 23:48:18.651495869 +0200 ++++ wiimms-iso-tools.source-3.02a/setup.sh 2020-06-02 23:48:29.758162513 +0200 +@@ -57,7 +57,7 @@ + + #-------------------------------------------------- + +-INSTALL_PATH=/usr/local ++ INSTALL_PATH="$out" + + if [[ -d $INSTALL_PATH/bin ]] + then diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3760114301e..928e937bfd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1083,6 +1083,8 @@ in wiiload = callPackage ../development/tools/wiiload { }; + wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; ssh-agents = callPackage ../tools/networking/ssh-agents { }; From d427c421fd62545552f3c91345804cd216e351fd Mon Sep 17 00:00:00 2001 From: Dominik Michael Rauh Date: Fri, 19 Jun 2020 17:49:57 +0200 Subject: [PATCH 035/520] rockbox-utility: 1.4.0 -> 1.4.1 --- pkgs/tools/misc/rockbox-utility/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 995a8b5eb15..6be32e21478 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 -, qtbase, qttools, makeWrapper, qmake -, withEspeak ? false, espeak ? null, qt5 }: +{ stdenv, fetchurl, pkgconfig, cryptopp +, libusb1, qtbase, qttools, makeWrapper +, qmake, withEspeak ? false, espeak ? null +, qt5 }: let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { pname = "rockbox-utility"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2"; - sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w"; + sha256 = "0zm9f01a810y7aq0nravbsl0vs9vargwvxnfl4iz9qsqygwlj69y"; }; - buildInputs = [ libusb1 qtbase qttools ] + buildInputs = [ cryptopp libusb1 qtbase qttools ] ++ stdenv.lib.optional withEspeak espeak; nativeBuildInputs = [ makeWrapper pkgconfig qmake qt5.wrapQtAppsHook ]; @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { preConfigure = '' cd rbutil/rbutilqt + lrelease rbutilqt.pro ''; installPhase = '' From 3d093cbbea2d4dff25a044f0967817c071b73355 Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Sat, 20 Jun 2020 12:25:02 -0300 Subject: [PATCH 036/520] alda: init at 1.4.2 --- .../development/interpreters/alda/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/interpreters/alda/default.nix diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/development/interpreters/alda/default.nix new file mode 100644 index 00000000000..3e5273d6329 --- /dev/null +++ b/pkgs/development/interpreters/alda/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, jre }: + +stdenv.mkDerivation rec { + pname = "alda"; + version = "1.4.2"; + + src = fetchurl { + url = "https://github.com/alda-lang/alda/releases/download/${version}/alda"; + sha256 = "1d0412jw37gh1y7i8cmaml8r4sn516i6pxmm8m16yprqmz6glx28"; + }; + + dontUnpack = true; + + installPhase = '' + install -Dm755 $src $out/bin/alda + sed -i -e '1 s!java!${jre}/bin/java!' $out/bin/alda + ''; + + meta = with stdenv.lib; { + description = "A music programming language for musicians."; + homepage = "https://alda.io"; + license = licenses.epl10; + maintainers = [ maintainers.ericdallo ]; + platforms = jre.meta.platforms; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ae58bff225..436d40acc63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -132,6 +132,8 @@ in addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; + alda = callPackage ../development/interpreters/alda { }; + ankisyncd = callPackage ../servers/ankisyncd { }; avro-tools = callPackage ../development/tools/avro-tools { }; From cd9401268a47d83ea7ca7ac46c376e3197b0ddbd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 18:15:36 +0000 Subject: [PATCH 037/520] moolticute: 0.43.19 -> 0.44.0 --- pkgs/applications/misc/moolticute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index efd9cc4c021..c815a74e019 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.43.19"; + version = "0.44.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "1rpkiyhy7z5zq0rmn0kj2kva57bnhkhvaplrlhfczv99h1kwsixg"; + sha256 = "1xlbhx6f1ysx8gka8g67271whzhkzsnkavpq3x58hdxr8v88khby"; }; outputs = [ "out" "udev" ]; From d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3 Mon Sep 17 00:00:00 2001 From: DavHau Date: Sat, 27 Jun 2020 14:26:03 +0000 Subject: [PATCH 038/520] fix indentation in mk-python-derivation.nix --- .../python/mk-python-derivation.nix | 132 +++++++++--------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index a632efa416e..df945c645a8 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -105,81 +105,81 @@ let "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" ]) // { - name = namePrefix + name; + name = namePrefix + name; - nativeBuildInputs = [ - python - wrapPython - ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? - pythonRecompileBytecodeHook # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441 - pythonRemoveTestsDirHook - ] ++ lib.optionals catchConflicts [ - setuptools pythonCatchConflictsHook - ] ++ lib.optionals removeBinBytecode [ - pythonRemoveBinBytecodeHook - ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ - unzip - ] ++ lib.optionals (format == "setuptools") [ - setuptoolsBuildHook - ] ++ lib.optionals (format == "flit") [ - flitBuildHook - ] ++ lib.optionals (format == "pyproject") [ - pipBuildHook - ] ++ lib.optionals (format == "wheel") [ - wheelUnpackHook - ] ++ lib.optionals (format == "egg") [ - eggUnpackHook eggBuildHook eggInstallHook - ] ++ lib.optionals (!(format == "other") || dontUsePipInstall) [ - pipInstallHook - ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ - # This is a test, however, it should be ran independent of the checkPhase and checkInputs - pythonImportsCheckHook - ] ++ lib.optionals (python.pythonAtLeast "3.3") [ - # Optionally enforce PEP420 for python3 - pythonNamespacesHook - ] ++ nativeBuildInputs; + nativeBuildInputs = [ + python + wrapPython + ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? + pythonRecompileBytecodeHook # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441 + pythonRemoveTestsDirHook + ] ++ lib.optionals catchConflicts [ + setuptools pythonCatchConflictsHook + ] ++ lib.optionals removeBinBytecode [ + pythonRemoveBinBytecodeHook + ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ + unzip + ] ++ lib.optionals (format == "setuptools") [ + setuptoolsBuildHook + ] ++ lib.optionals (format == "flit") [ + flitBuildHook + ] ++ lib.optionals (format == "pyproject") [ + pipBuildHook + ] ++ lib.optionals (format == "wheel") [ + wheelUnpackHook + ] ++ lib.optionals (format == "egg") [ + eggUnpackHook eggBuildHook eggInstallHook + ] ++ lib.optionals (!(format == "other") || dontUsePipInstall) [ + pipInstallHook + ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ + # This is a test, however, it should be ran independent of the checkPhase and checkInputs + pythonImportsCheckHook + ] ++ lib.optionals (python.pythonAtLeast "3.3") [ + # Optionally enforce PEP420 for python3 + pythonNamespacesHook + ] ++ nativeBuildInputs; - buildInputs = buildInputs ++ pythonPath; + buildInputs = buildInputs ++ pythonPath; - propagatedBuildInputs = propagatedBuildInputs ++ [ python ]; + propagatedBuildInputs = propagatedBuildInputs ++ [ python ]; - inherit strictDeps; + inherit strictDeps; - LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; + LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; - # Python packages don't have a checkPhase, only an installCheckPhase - doCheck = false; - doInstallCheck = attrs.doCheck or true; - installCheckInputs = [ - ] ++ lib.optionals (format == "setuptools") [ - # Longer-term we should get rid of this and require - # users of this function to set the `installCheckPhase` or - # pass in a hook that sets it. - setuptoolsCheckHook - ] ++ checkInputs; + # Python packages don't have a checkPhase, only an installCheckPhase + doCheck = false; + doInstallCheck = attrs.doCheck or true; + installCheckInputs = [ + ] ++ lib.optionals (format == "setuptools") [ + # Longer-term we should get rid of this and require + # users of this function to set the `installCheckPhase` or + # pass in a hook that sets it. + setuptoolsCheckHook + ] ++ checkInputs; - postFixup = lib.optionalString (!dontWrapPythonPrograms) '' - wrapPythonPrograms - '' + attrs.postFixup or ''''; + postFixup = lib.optionalString (!dontWrapPythonPrograms) '' + wrapPythonPrograms + '' + attrs.postFixup or ''''; - # Python packages built through cross-compilation are always for the host platform. - disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; + # Python packages built through cross-compilation are always for the host platform. + disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; - # For now, revert recompilation of bytecode. - dontUsePythonRecompileBytecode = true; + # For now, revert recompilation of bytecode. + dontUsePythonRecompileBytecode = true; - meta = { - # default to python's platforms - platforms = python.meta.platforms; - isBuildPythonPackage = python.meta.platforms; - } // meta; -} // lib.optionalAttrs (attrs?checkPhase) { - # If given use the specified checkPhase, otherwise use the setup hook. - # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`. - installCheckPhase = attrs.checkPhase; -})); + meta = { + # default to python's platforms + platforms = python.meta.platforms; + isBuildPythonPackage = python.meta.platforms; + } // meta; + } // lib.optionalAttrs (attrs?checkPhase) { + # If given use the specified checkPhase, otherwise use the setup hook. + # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`. + installCheckPhase = attrs.checkPhase; + })); -passthru.updateScript = let - filename = builtins.head (lib.splitString ":" self.meta.position); - in attrs.passthru.updateScript or [ update-python-libraries filename ]; + passthru.updateScript = let + filename = builtins.head (lib.splitString ":" self.meta.position); + in attrs.passthru.updateScript or [ update-python-libraries filename ]; in lib.extendDerivation true passthru self From e3f76fb62d83a587e3759c2b48d7c10af268d3ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferry=20J=C3=A9r=C3=A9mie?= Date: Sun, 28 Jun 2020 12:30:40 +0200 Subject: [PATCH 039/520] gSpeech: 0.9.2 -> 0.10.1 --- pkgs/applications/audio/gspeech/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/gspeech/default.nix b/pkgs/applications/audio/gspeech/default.nix index f51eb338d28..920c06038fe 100644 --- a/pkgs/applications/audio/gspeech/default.nix +++ b/pkgs/applications/audio/gspeech/default.nix @@ -20,13 +20,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gSpeech"; - version = "0.9.2"; + version = "0.10.1"; src = fetchFromGitHub { owner = "mothsart"; repo = pname; rev = version; - sha256 = "11pvdpb9jjssp8nmlj21gs7ncgfm89kw26mfc8c2x8w2q4h92ja3"; + sha256 = "1i0jwgxcn94nsi7c0ad0w77y04g04ka2szijzfqzqfnacdmdyrfc"; }; nativeBuildInputs = [ @@ -56,8 +56,8 @@ python3.pkgs.buildPythonApplication rec { ]; postFixup = '' - wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts ]} - wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts ]} + wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts sox ]} + wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts sox ]} ''; strictDeps = false; From 958e120b479fff70eb6c789992c3b8c686fc7298 Mon Sep 17 00:00:00 2001 From: dawidsowa Date: Sun, 28 Jun 2020 13:10:24 +0200 Subject: [PATCH 040/520] persepolis: 3.1.0 -> 3.2.0 --- pkgs/tools/networking/persepolis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index a9bd2739a8a..800f497ece7 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -13,13 +13,13 @@ buildPythonApplication rec { pname = "persepolis"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "persepolisdm"; repo = "persepolis"; rev = version; - sha256 = "0xngk8wgj5k27mh3bcrf2wwzqr8a3g0d4pc5i5vcavnnaj03j44m"; + sha256 = "1rh7q432ynbysapsd075nif975ync71icpb71x2mb4j8jx1vzs45"; }; # see: https://github.com/persepolisdm/persepolis/blob/3.1.0/setup.py#L130 From d552a13571252bd98ed0596c28ac5dd27ae5fa34 Mon Sep 17 00:00:00 2001 From: David Sawatzke Date: Sun, 28 Jun 2020 20:57:34 +0200 Subject: [PATCH 041/520] maxcso: init at 1.12.0 --- pkgs/tools/archivers/maxcso/default.nix | 26 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/archivers/maxcso/default.nix diff --git a/pkgs/tools/archivers/maxcso/default.nix b/pkgs/tools/archivers/maxcso/default.nix new file mode 100644 index 00000000000..333b0dcabc3 --- /dev/null +++ b/pkgs/tools/archivers/maxcso/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, libuv, lz4, zlib }: + +stdenv.mkDerivation rec { + pname = "maxcso"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "unknownbrackets"; + repo = "maxcso"; + rev = "v${version}"; + sha256 = "10r0vb3ndpq1pw5224d48nim5xz8jj94zhlfy29br6h6jblq8zap"; + }; + + buildInputs = [ libuv lz4 zlib ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/unknownbrackets/maxcso"; + description = + "A fast ISO to CSO compression program for use with PSP and PS2 emulators, which uses multiple algorithms for best compression ratio"; + maintainers = with maintainers; [ david-sawatzke ]; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.isc; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 105d34b3d18..53ae8044876 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2046,6 +2046,8 @@ in massren = callPackage ../tools/misc/massren { }; + maxcso = callPackage ../tools/archivers/maxcso {}; + medusa = callPackage ../tools/security/medusa { }; megasync = libsForQt5.callPackage ../applications/misc/megasync { }; From 1811fea9eb70e897dbc32648e2406118f185084a Mon Sep 17 00:00:00 2001 From: Quentin Date: Mon, 29 Jun 2020 16:58:18 +0300 Subject: [PATCH 042/520] maintainers: add quentini --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ec34287442e..50fa2739361 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6452,6 +6452,12 @@ githubId = 115877; name = "Kenny Shen"; }; + quentini = { + email = "quentini@airmail.cc"; + github = "QuentinI"; + githubId = 18196237; + name = "Quentin Inkling"; + }; qyliss = { email = "hi@alyssa.is"; github = "alyssais"; From eace830aa373518548aa5a4e00b87d62fbf20d04 Mon Sep 17 00:00:00 2001 From: Quentin Date: Mon, 29 Jun 2020 16:59:47 +0300 Subject: [PATCH 043/520] summon: init at 0.8.2 --- pkgs/development/tools/summon/default.nix | 35 +++++++++++++++++ .../tools/summon/resolve-paths.patch | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 76 insertions(+) create mode 100644 pkgs/development/tools/summon/default.nix create mode 100644 pkgs/development/tools/summon/resolve-paths.patch diff --git a/pkgs/development/tools/summon/default.nix b/pkgs/development/tools/summon/default.nix new file mode 100644 index 00000000000..e01c60e3a89 --- /dev/null +++ b/pkgs/development/tools/summon/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildGoModule, fetchFromGitHub, lib, patchResolver ? true }: + +with stdenv.lib; + +buildGoModule rec { + pname = "summon"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "cyberark"; + repo = "summon"; + rev = "v${version}"; + sha256 = "1z4xnrncwvp3rfm97zvc0ivvw2fh1hrjhj3rplvidzxjfyasbvwv"; + }; + + vendorSha256 = "1597vrs4b7k6gkmkvf7xnd38rvjixmlcz0j7npmik9nbkm57l74m"; + + subPackages = [ "cmd" ]; + + # Patches provider resolver to support resolving unqualified names + # from $PATH, e.g. `summon -p gopass` instead of `summon -p $(which gopass)` + patches = optional patchResolver [ ./resolve-paths.patch ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/summon + ''; + + meta = with lib; { + description = + "CLI that provides on-demand secrets access for common DevOps tools"; + homepage = "https://cyberark.github.io/summon"; + license = lib.licenses.mit; + maintainers = with maintainers; [ quentini ]; + }; +} diff --git a/pkgs/development/tools/summon/resolve-paths.patch b/pkgs/development/tools/summon/resolve-paths.patch new file mode 100644 index 00000000000..cd49c50e2bd --- /dev/null +++ b/pkgs/development/tools/summon/resolve-paths.patch @@ -0,0 +1,39 @@ +From dd34727ebfbd59738084eeb7c2a020e40a4d0abe Mon Sep 17 00:00:00 2001 +From: Quentin +Date: Mon, 29 Jun 2020 17:35:04 +0300 +Subject: [PATCH] Patch for + +--- + provider/provider.go | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/provider/provider.go b/provider/provider.go +index c1e28d9..f20fdaa 100644 +--- a/provider/provider.go ++++ b/provider/provider.go +@@ -78,7 +78,22 @@ func expandPath(provider string) string { + if path.Base(provider) != provider { + return provider + } ++ ++ var ( ++ stdOut bytes.Buffer ++ stdErr bytes.Buffer ++ ) ++ cmd := exec.Command("which", provider) ++ cmd.Stdout = &stdOut ++ cmd.Stderr = &stdErr ++ err := cmd.Run() ++ ++ if err == nil { ++ return strings.TrimSpace(stdOut.String()) ++ } ++ + return path.Join(DefaultPath, provider) ++ + } + + func getDefaultPath() string { +-- +2.27.0 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c6bcecc645..51538f25dca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11090,6 +11090,8 @@ in strace = callPackage ../development/tools/misc/strace { }; + summon = callPackage ../development/tools/summon { }; + swarm = callPackage ../development/tools/analysis/swarm { }; swiftformat = callPackage ../development/tools/swiftformat { }; From dab071460bdbb2ffab54310f6552b0a0dcbf648e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 08:05:17 +0000 Subject: [PATCH 044/520] lucky-cli: 0.21.0 -> 0.23.0 --- pkgs/development/web/lucky-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix index f2f6ab0f35d..4c983d0931e 100644 --- a/pkgs/development/web/lucky-cli/default.nix +++ b/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.21.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - sha256 = "0g0arf13brh6g0hynxs8bsp8jh3dd66rmf2d3qh2qjvk10101g0r"; + sha256 = "1qggbczrnrfjba6ipzjkqp6ni4rjc79pxy3vhgd7nq88ipa1sygk"; }; # the integration tests will try to clone a remote repos From 80244984592291720a2ed7613ca8787356f28927 Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Tue, 30 Jun 2020 11:19:28 +0200 Subject: [PATCH 045/520] ZODB: 3.5.1 -> 3.6.0 ZODB depends on ZConfig which is currently incompatible with Python 3.8. Disabling ZODB on 3.8 as long as there has been no new ZConfig release. --- .../development/python-modules/zodb/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index bcc164ea380..e8097461d3b 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -1,8 +1,8 @@ { stdenv , fetchPypi -, fetchpatch , buildPythonPackage , python +, pythonAtLeast , zope_testrunner , transaction , six @@ -17,26 +17,21 @@ buildPythonPackage rec { pname = "ZODB"; - version = "5.5.1"; + version = "5.6.0"; src = fetchPypi { inherit pname version; - sha256 = "20155942fa326e89ad8544225bafd74237af332ce9d7c7105a22318fe8269666"; + sha256 = "1zh7rd182l15swkbkm3ib0wgyn16xasdz2mzry8k4lwk6dagnm26"; }; - patches = [ - # Compatibility with transaction v3.0 - (fetchpatch { - url = "https://github.com/zopefoundation/ZODB/commit/0adcc6877f690186c97cc5da7e13788946d5e0df.patch"; - sha256 = "1zmbgm7r36nj5w7icpinp61fm81svh2wk213pzr3l0jxzr9i5qi4"; - }) - ]; - # remove broken test postPatch = '' rm -vf src/ZODB/tests/testdocumentation.py ''; + # ZConfig 3.5.0 is not compatible with Python 3.8 + disabled = pythonAtLeast "3.8"; + propagatedBuildInputs = [ transaction six From 19321f38cbf3da02053ea6ff5abeec572a24d9b1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 10:27:49 +0000 Subject: [PATCH 046/520] orcania: 2.1.0 -> 2.1.1 --- pkgs/development/libraries/orcania/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index 2f8765f9a72..4a01de54a6d 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "1zp2rk267dfmfap6qsyn7maivrpid8s3rkicwk1q5v6j20cgh1f8"; + sha256 = "0l035zbzyv623h5186rk6iq1097rxx64iwnk4s2c7l9gzv9wyapp"; }; nativeBuildInputs = [ cmake ]; From 9b847cac0f3bef0a657ebc5e90a7b8e81d31bdf3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 11:06:51 +0000 Subject: [PATCH 047/520] parlatype: 2.0 -> 2.1 --- pkgs/applications/audio/parlatype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index e4728b9b9c4..b9babddb800 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "parlatype"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "gkarsay"; repo = pname; rev = "v${version}"; - sha256 = "026i19vkdq35rldbjp1wglamr22a1330iv736mmgbd8fs7vz22nx"; + sha256 = "1k53q0kbwpnbgyr0lmfzf5sm4f93d8nbjrzdz9pdhzpxgihndg25"; }; nativeBuildInputs = [ From 4b9dca0f4598eb27eeba363c3af6a73d60a00ea9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 3 Jul 2020 14:33:42 +0300 Subject: [PATCH 048/520] vokoscreen: use latest ffmpeg --- pkgs/applications/video/vokoscreen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index 0cd3c814b17..94d0de20ccf 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mkDerivation , pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr -, ffmpeg_3 +, ffmpeg }: mkDerivation rec { @@ -35,7 +35,7 @@ mkDerivation rec { ''; postConfigure = '' - substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg_3} + substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg} ''; meta = with stdenv.lib; { From d2b35f4a051f84fa95a63e03c454eaa3758d4eb5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 3 Jul 2020 14:44:50 +0300 Subject: [PATCH 049/520] bs1770gain: use latest ffmpeg --- pkgs/applications/audio/bs1770gain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix index 47de14ecb25..76a78935619 100644 --- a/pkgs/applications/audio/bs1770gain/default.nix +++ b/pkgs/applications/audio/bs1770gain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ffmpeg_3, sox }: +{ stdenv, fetchurl, ffmpeg, sox }: stdenv.mkDerivation rec { pname = "bs1770gain"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk"; }; - buildInputs = [ ffmpeg_3 sox ]; + buildInputs = [ ffmpeg sox ]; NIX_CFLAGS_COMPILE = "-Wno-error"; From 12b36a950b290bce8dcf9358273fab1d9927044f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 14:25:04 +0000 Subject: [PATCH 050/520] ltl2ba: 1.2 -> 1.3 --- pkgs/applications/science/logic/ltl2ba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix index 02e9844115e..b5d13db3b9a 100644 --- a/pkgs/applications/science/logic/ltl2ba/default.nix +++ b/pkgs/applications/science/logic/ltl2ba/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ltl2ba"; - version = "1.2"; + version = "1.3"; src = fetchurl { url = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${pname}-${version}.tar.gz"; - sha256 = "0vzv5g7v87r41cvdafxi6yqnk7glzxrzgavy8213k59f6v11dzlx"; + sha256 = "1bz9gjpvby4mnvny0nmxgd81rim26mqlcnjlznnxxk99575pfa4i"; }; hardeningDisable = [ "format" ]; From 313959727797a511ce906411b077c989e8b9bb42 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Wed, 22 Apr 2020 16:56:11 +1000 Subject: [PATCH 051/520] whisper: init at 2.0.1 --- .../science/biology/whisper/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/science/biology/whisper/default.nix diff --git a/pkgs/applications/science/biology/whisper/default.nix b/pkgs/applications/science/biology/whisper/default.nix new file mode 100644 index 00000000000..9e336600202 --- /dev/null +++ b/pkgs/applications/science/biology/whisper/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, fetchurl }: + +stdenv.mkDerivation rec { + pname = "whisper"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "refresh-bio"; + repo = pname; + rev = "v${version}"; + sha256 = "0wpx1w1mar2d6zq2v14vy6nn896ds1n3zshxhhrrj5d528504iyw"; + }; + + preConfigure = '' + cd src + + # disable default static linking + sed -i 's/ -static / /' makefile + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/bin whisper whisper-index + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Short read sequence mapper"; + license = licenses.gpl3; + homepage = "https://github.com/refresh-bio/whisper"; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a11116c96b2..2d636b02ddd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24906,6 +24906,8 @@ in varscan = callPackage ../applications/science/biology/varscan { }; + whisper = callPackage ../applications/science/biology/whisper { }; + hmmer = callPackage ../applications/science/biology/hmmer { }; bwa = callPackage ../applications/science/biology/bwa { }; From 8301cbe951198c113528075e3b59d204c8ca0ced Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jul 2020 03:03:16 +0000 Subject: [PATCH 052/520] qtractor: 0.9.14 -> 0.9.15 --- pkgs/applications/audio/qtractor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index f2ee5eac70f..2975e6464e1 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1gh268gdpj7nw19xfh7k2l3aban4yrs1lmx33qswrnngs2izj1fk"; + sha256 = "0k7a6llwrzs07flr9mvzvay9ygc2x64syg8npyabsw5a4d85fwsx"; }; nativeBuildInputs = [ From 2853b032557fb7ece907dc8d117310e9344e552c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jul 2020 09:44:28 +0000 Subject: [PATCH 053/520] reaper: 6.10 -> 6.12c --- pkgs/applications/audio/reaper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 9de70d83ee5..e15addd78b1 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.10"; + version = "6.12c"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "1p54phmsa6xbqxb5cpgwnz7ny4famb8zi25y3cmxwgr4pfy94b2p"; + sha256 = "1xnd4qvgwsz1dmgb656i611776dqcb84m1gh30i8jhpwcr9ym46w"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; From 3331e1af702c7f9d349bd863c75523ec79d7908a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jul 2020 15:02:23 +0000 Subject: [PATCH 054/520] smplayer: 20.4.2 -> 20.6.0 --- pkgs/applications/video/smplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 85c71e86a64..a8d2aaaff0e 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "smplayer"; - version = "20.4.2"; + version = "20.6.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0kqdx6q2274gm83rycvdcglka60ymdk4iw2lc39iw7z1zgsv6ky3"; + sha256 = "0c59gfgm2ya8yb2nx7gy1zc0nrr4206213xy86y7jw0bk9mmjxmy"; }; buildInputs = [ qtscript ]; From 6da120980063d8cb32d01f00b3e52432b52d17de Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jul 2020 16:49:06 +0000 Subject: [PATCH 055/520] smtube: 20.1.0 -> 20.6.0 --- pkgs/applications/video/smtube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 1cd6fb693e8..26b14ab739c 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { lib, mkDerivation, fetchurl, qmake, qtscript, qtwebkit }: mkDerivation rec { - version = "20.1.0"; + version = "20.6.0"; pname = "smtube"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2"; - sha256 = "00x7gyk06d01hrr1lcqbrffbkkpj2j0j1fy9mkxc7slbzqcl27dz"; + sha256 = "0hnza5gszwqnkc1py5g34hi4p976vpkc4h3ab0247ynqs83fpwc2"; }; makeFlags = [ From 20479cd3492c98024e01cd029ab481fba5281dbc Mon Sep 17 00:00:00 2001 From: tilpner Date: Tue, 7 Jul 2020 22:17:58 +0200 Subject: [PATCH 056/520] godot: 3.2.1 -> 3.2.2 --- pkgs/development/tools/godot/default.nix | 4 +-- .../godot/dont_clobber_environment.patch | 20 ++++++------ .../tools/godot/pkg_config_additions.patch | 31 ++++++++++--------- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 832d30ee8e8..0d35ce253b1 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { pname = "godot"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "1kndls0rklha7kz9l4i2ivjxab4jpk3b2j7dcgcg2qc3s81yd0r6"; + sha256 = "1libz83mbyrkbbsmmi8z2rydv3ls0w9r4vb5v6diqqwn7ka8z804"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/godot/dont_clobber_environment.patch b/pkgs/development/tools/godot/dont_clobber_environment.patch index 3782aced1a4..b7c1d3d6233 100644 --- a/pkgs/development/tools/godot/dont_clobber_environment.patch +++ b/pkgs/development/tools/godot/dont_clobber_environment.patch @@ -1,16 +1,18 @@ -+++ build/SConstruct -@@ -63,10 +63,10 @@ elif platform_arg == 'javascript': - custom_tools = ['cc', 'c++', 'ar', 'link', 'textfile', 'zip'] - +diff --git a/SConstruct b/SConstruct +index b3d033dc90..04b8dcc832 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -62,10 +62,9 @@ elif platform_arg == "javascript": + custom_tools = ["cc", "c++", "ar", "link", "textfile", "zip"] + env_base = Environment(tools=custom_tools) --if 'TERM' in os.environ: -- env_base['ENV']['TERM'] = os.environ['TERM'] --env_base.AppendENVPath('PATH', os.getenv('PATH')) --env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH')) +-if "TERM" in os.environ: +- env_base["ENV"]["TERM"] = os.environ["TERM"] +-env_base.AppendENVPath("PATH", os.getenv("PATH")) +-env_base.AppendENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH")) +for k in ("TERM", "PATH", "PKG_CONFIG_PATH"): + if (k in os.environ): + env_base["ENV"][k] = os.environ[k] -+ env_base.disabled_modules = [] env_base.use_ptrcall = False env_base.module_version_string = "" diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch index 409baaa6f26..9e2e5c3536d 100644 --- a/pkgs/development/tools/godot/pkg_config_additions.patch +++ b/pkgs/development/tools/godot/pkg_config_additions.patch @@ -1,22 +1,25 @@ +diff --git a/platform/x11/detect.py b/platform/x11/detect.py +index 5674e78350..7051d8e73c 100644 +--- a/platform/x11/detect.py +++ b/platform/x11/detect.py -@@ -175,6 +175,11 @@ def configure(env): - env.ParseConfig('pkg-config xrender --cflags --libs') - env.ParseConfig('pkg-config xi --cflags --libs') +@@ -201,6 +201,11 @@ def configure(env): + env.ParseConfig("pkg-config xrender --cflags --libs") + env.ParseConfig("pkg-config xi --cflags --libs") -+ env.ParseConfig('pkg-config xext --cflags --libs') -+ env.ParseConfig('pkg-config xfixes --cflags --libs') -+ env.ParseConfig('pkg-config glu --cflags --libs') -+ env.ParseConfig('pkg-config zlib --cflags --libs') ++ env.ParseConfig("pkg-config xext --cflags --libs") ++ env.ParseConfig("pkg-config xfixes --cflags --libs") ++ env.ParseConfig("pkg-config glu --cflags --libs") ++ env.ParseConfig("pkg-config zlib --cflags --libs") + - if (env['touch']): - env.Append(CPPFLAGS=['-DTOUCH_ENABLED']) + if env["touch"]: + env.Append(CPPDEFINES=["TOUCH_ENABLED"]) -@@ -264,7 +269,7 @@ def configure(env): +@@ -299,7 +304,7 @@ def configure(env): print("Enabling ALSA") - env.Append(CPPFLAGS=["-DALSA_ENABLED", "-DALSAMIDI_ENABLED"]) - # Don't parse --cflags, we don't need to add /usr/include/alsa to include path -- env.ParseConfig('pkg-config alsa --libs') -+ env.ParseConfig('pkg-config alsa --cflags --libs') + env.Append(CPPDEFINES=["ALSA_ENABLED", "ALSAMIDI_ENABLED"]) + # Don't parse --cflags, we don't need to add /usr/include/alsa to include path +- env.ParseConfig("pkg-config alsa --libs") ++ env.ParseConfig("pkg-config alsa --cflags --libs") else: print("ALSA libraries not found, disabling driver") From 6e33fbd35864d5b8495da61953f3b71397f16c81 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Jul 2020 14:20:51 -0700 Subject: [PATCH 057/520] bitcoinunlimited: 1.7.0.0 -> 1.8.0.0 --- pkgs/applications/blockchains/bitcoin-unlimited.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix index f755efaa0e1..fe39b955a28 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; - version = "1.7.0.0"; + version = "1.8.0.0"; src = fetchFromGitHub { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; - rev = "bucash${version}"; - sha256 = "0lil6rivrj4cnr8a7n8zn9rp9f4h2nk88jjxc29m6dwqn5gk6f1i"; + rev = "BCHunlimited${version}"; + sha256 = "01qi15li5x9fvhsmvx7ai5fz6yzqqd3r9yv7081h75jn0nxai49q"; }; nativeBuildInputs = [ pkgconfig autoreconfHook python3 ] From 6713ee8f4a181d59ba8d511e17dda91f26ae235d Mon Sep 17 00:00:00 2001 From: "Christopher A. Williamson" Date: Mon, 22 Jun 2020 17:25:48 +0100 Subject: [PATCH 058/520] nixos/onlykey: fix typo --- nixos/modules/hardware/onlykey.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/onlykey.nix b/nixos/modules/hardware/onlykey.nix index b6820fe0191..07358c8a878 100644 --- a/nixos/modules/hardware/onlykey.nix +++ b/nixos/modules/hardware/onlykey.nix @@ -26,7 +26,7 @@ with lib; ####### implementation config = mkIf config.hardware.onlykey.enable { - services.udev.extraRules = builtin.readFile ./onlykey.udev; + services.udev.extraRules = builtins.readFile ./onlykey.udev; }; From ba1bbc41abace62b60496823422f976f4802e23c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 8 Jul 2020 11:04:52 +0000 Subject: [PATCH 059/520] mstflint: 4.14.0-1 -> 4.14.0-3 --- pkgs/tools/misc/mstflint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index cf90e93929d..20d7110944d 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mstflint"; - version = "4.14.0-1"; + version = "4.14.0-3"; src = fetchFromGitHub { owner = "Mellanox"; repo = pname; rev = "v${version}"; - sha256 = "0xrwx623vl17cqzpacil74m2fi4xrshgvvzxiplz1wq47gq7wp1i"; + sha256 = "0zy9npyzf7dkxlfl9mx6997aa61mk23ixpjb01ckb1wvav5k6z82"; }; nativeBuildInputs = [ autoreconfHook ]; From 0d39f408eada237629a5ddbe3413e3d6c0c29f64 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 10 Jul 2020 16:45:43 +0200 Subject: [PATCH 060/520] demoit: unstable-2019-05-10 -> unstable-2020-06-11 --- pkgs/servers/demoit/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix index 514b6873a1a..675792da680 100644 --- a/pkgs/servers/demoit/default.nix +++ b/pkgs/servers/demoit/default.nix @@ -1,19 +1,21 @@ { stdenv -, buildGoPackage +, buildGoModule , fetchFromGitHub }: -buildGoPackage { +buildGoModule { pname = "demoit"; - version = "unstable-2019-05-10"; + version = "unstable-2020-06-11"; goPackagePath = "github.com/dgageot/demoit"; src = fetchFromGitHub { owner = "dgageot"; repo = "demoit"; - rev = "c1d4780620ebf083cb4a81b83c80e7547ff7bc23"; - sha256 = "0l0pw0kzgnrk6a6f4ls3s82icjp7q9djbaxwfpjswbcfdzrsk4p2"; + rev = "5762b169e7f2fc18913874bf52323ffbb906ce84"; + sha256 = "1jcjqr758d29h3y9ajvzhy1xmxfix5mwhylz6jwhy5nmk28bjzx9"; }; + vendorSha256 = null; + subPackages = [ "." ]; meta = with stdenv.lib; { description = "Live coding demos without Context Switching"; From 519798cb5beadc286697f83d06cdf3924ee7e7e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 13:46:40 +0000 Subject: [PATCH 061/520] syncplay: 1.6.4a -> 1.6.5 --- pkgs/applications/networking/syncplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 0613a5c5bcd..ac242eb9dc9 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "syncplay"; - version = "1.6.4a"; + version = "1.6.5"; format = "other"; @@ -10,7 +10,7 @@ buildPythonApplication rec { owner = "Syncplay"; repo = "syncplay"; rev = "v${version}"; - sha256 = "0zz4a3vzfg808z1qkqz31z4818wzpfa2lika7wl0jgpmw4zi85ix"; + sha256 = "107dgsrjv95ww6gj77q89dirl604b2ljlpjg79gffm9c4gkmjj2m"; }; propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls; From d9d4307ef2740744c9e0b55372229ed0fe92bed1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jul 2020 19:37:22 +0000 Subject: [PATCH 062/520] copyq: 3.11.1 -> 3.12.0 --- pkgs/applications/misc/copyq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index fb177e8278f..7cf89a74e10 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "CopyQ"; - version = "3.11.1"; + version = "3.12.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "1xxf8d220pa77195d9f3l3scvvyqsh1pvlrbw4cq6ydj9qbp5kf0"; + sha256 = "04jidibf0b80c5vd659pz2wibmggjyyj9yz2bw7j4g84hwraksxb"; }; nativeBuildInputs = [ cmake ]; From 2698b4b5e3dd38206abc9b046f56e6755982222f Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 7 Jul 2020 13:23:01 -0400 Subject: [PATCH 063/520] perlPackages.Dotenv: init at 0.002 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6520ee88a61..a180f6be6f4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6133,6 +6133,21 @@ let }; }; + Dotenv = buildPerlPackage { + pname = "Dotenv"; + version = "0.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BO/BOOK/Dotenv-0.002.tar.gz"; + sha256 = "04c7a7cc4511617d7a70c4ca410d10707dc496248cdad20240ae242223212454"; + }; + buildInputs = [ TestCPANMeta TestPod TestPodCoverage ]; + propagatedBuildInputs = [ PathTiny PodParser ]; + meta = { + description = "Support for C in Perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Dumbbench = buildPerlPackage { pname = "Dumbbench"; version = "0.111"; From d9ca548d95e2d30589213c07dd8f216e6b6fff28 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 16 Jul 2020 19:22:18 +0000 Subject: [PATCH 064/520] gitAndTools.git-remote-hg: 1.0.1 -> unstable-2020-06-12 This package needs to use the same Python as Mercurial, but the released version doesn't support Python 3. --- .../git-and-tools/git-remote-hg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 37c06d3a85e..58d9bf80fb3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-remote-hg"; - version = "1.0.1"; + version = "unstable-2020-06-12"; src = fetchFromGitHub { owner = "mnauw"; repo = "git-remote-hg"; - rev = "v${version}"; - sha256 = "1by5ygqvq9ww990kdrjndaqsssyf2jc4n380f9pfh2avsr7871wc"; + rev = "28ed63b707919734d230cb13bff7d231dfeee8fc"; + sha256 = "0dw48vbnk7pp0w6fzgl29mq8fyn52pacbya2w14z9c6jfvh5sha1"; }; buildInputs = [ mercurial.python mercurial makeWrapper @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mnauw/git-remote-hg"; description = "Semi-official Mercurial bridge from Git project"; license = licenses.gpl2; - maintainers = [ ]; + maintainers = with maintainers; [ qyliss ]; platforms = platforms.unix; }; } From 8deb97c2108bdd970d8b44ab276d33c9345d36c1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 16 Jul 2020 19:52:45 +0000 Subject: [PATCH 065/520] python3Packages.mercurial: init This exposes mercurial as a Python library. Packages that call into Mercurial from Python can now do so in a less hacky way. --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf3c2f23aab..04a58ccc48e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3256,6 +3256,10 @@ in { measurement = callPackage ../development/python-modules/measurement {}; + mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { + python3Packages = self; + })); + midiutil = callPackage ../development/python-modules/midiutil {}; mido = callPackage ../development/python-modules/mido { }; From 8e9c0cbe2b483bdb2d31d498b22f6518e3051b11 Mon Sep 17 00:00:00 2001 From: Ivar Date: Sun, 24 May 2020 23:53:57 +0200 Subject: [PATCH 066/520] sm64ex: init at unstable-2020-06-19 --- pkgs/games/sm64ex/default.nix | 69 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/games/sm64ex/default.nix diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix new file mode 100644 index 00000000000..e5aeb84fbf1 --- /dev/null +++ b/pkgs/games/sm64ex/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, fetchFromGitHub +, python3 +, pkg-config +, audiofile +, SDL2 +, hexdump +, requireFile +, compileFlags ? [ ] +, region ? "us" +, baseRom ? requireFile { + name = "baserom.${region}.z64"; + message = '' + This nix expression requires that baserom.${region}.z64 is + already part of the store. To get this file you can dump your Super Mario 64 cartridge's contents + and add it to the nix store with nix-store --add-fixed sha256 . + Note that if you are not using a US baserom, you must overwrite the "region" attribute with either "eu" or "jp". + ''; + sha256 = { + "us" = "17ce077343c6133f8c9f2d6d6d9a4ab62c8cd2aa57c40aea1f490b4c8bb21d91"; + "eu" = "c792e5ebcba34c8d98c0c44cf29747c8ee67e7b907fcc77887f9ff2523f80572"; + "jp" = "9cf7a80db321b07a8d461fe536c02c87b7412433953891cdec9191bfad2db317"; + }.${region}; + } +}: + +stdenv.mkDerivation rec { + pname = "sm64ex"; + version = "unstable-2020-06-19"; + + src = fetchFromGitHub { + owner = "sm64pc"; + repo = "sm64ex"; + rev = "f5005418348cf1a53bfa75ff415a513ef0b9b273"; + sha256 = "0adyshkqk5c4lxhdxc3j6ax4svfka26486qpa5q2gl2nixwg9zxn"; + }; + + nativeBuildInputs = [ python3 pkg-config ]; + buildInputs = [ audiofile SDL2 hexdump ]; + + makeFlags = [ "VERSION=${region}" ] ++ compileFlags + ++ stdenv.lib.optionals stdenv.isDarwin [ "OSX_BUILD=1" ]; + + inherit baseRom; + + preBuild = '' + patchShebangs extract_assets.py + cp $baseRom ./baserom.${region}.z64 + ''; + + installPhase = '' + mkdir -p $out/bin + cp build/${region}_pc/sm64.${region}.f3dex2e $out/bin/sm64ex + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/sm64pc/sm64ex"; + description = "Super Mario 64 port based off of decompilation"; + longDescription = '' + Super Mario 64 port based off of decompilation. + Note that you must supply a baserom yourself to extract assets from. + If you are not using an US baserom, you must overwrite the "region" attribute with either "eu" or "jp". + If you would like to use patches sm64ex distributes as makeflags, add them to the "compileFlags" attribute. + ''; + license = licenses.unfree; + maintainers = with maintainers; [ ivar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf92cae7a6a..2ff602fc7c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6585,6 +6585,8 @@ in conf = config.slstatus.conf or null; }; + sm64ex = callPackage ../games/sm64ex { }; + smartdns = callPackage ../tools/networking/smartdns { }; smartmontools = callPackage ../tools/system/smartmontools { From f459122ea3c9fda1ea7bb97974571df5134d6769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 18 Jul 2020 16:46:33 +0200 Subject: [PATCH 067/520] nixos/gitlab: Support extra config for shell --- nixos/modules/services/misc/gitlab.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 1ada131bd7b..9b843e81dc5 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -54,7 +54,7 @@ let '') gitlabConfig.production.repositories.storages))} ''; - gitlabShellConfig = { + gitlabShellConfig = flip recursiveUpdate cfg.extraShellConfig { user = cfg.user; gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}"; http_settings.self_signed_cert = false; @@ -511,6 +511,12 @@ in { ''; }; + extraShellConfig = mkOption { + type = types.attrs; + default = {}; + description = "Extra configuration to merge into shell-config.yml"; + }; + extraConfig = mkOption { type = types.attrs; default = {}; From 38db4a92e5297c0cf44f5e68a8a92ee089a72f8a Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 14 Jul 2020 22:40:36 +0200 Subject: [PATCH 068/520] protonvpn-cli: replace old protonvpn-cli with protonvpn-cli-ng --- .../networking/protonvpn-cli-ng/default.nix | 36 ------------ .../networking/protonvpn-cli/default.nix | 57 ++++++++----------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 25 insertions(+), 70 deletions(-) delete mode 100644 pkgs/applications/networking/protonvpn-cli-ng/default.nix diff --git a/pkgs/applications/networking/protonvpn-cli-ng/default.nix b/pkgs/applications/networking/protonvpn-cli-ng/default.nix deleted file mode 100644 index e2870c58e97..00000000000 --- a/pkgs/applications/networking/protonvpn-cli-ng/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, fetchFromGitHub, python3Packages, openvpn, dialog, iptables }: - -python3Packages.buildPythonApplication rec { - pname = "protonvpn-cli-ng"; - version = "2.2.4"; - - src = fetchFromGitHub { - owner = "protonvpn"; - repo = "${pname}"; - rev = "v${version}"; - sha256 = "08yca0a0prrnrc7ir7ajd56yxvxpcs4m1k8f5kf273f5whgr7wzw"; - }; - - propagatedBuildInputs = (with python3Packages; [ - requests - docopt - setuptools - jinja2 - pythondialog - ]) ++ [ - dialog - openvpn - iptables - ]; - - # No tests - doCheck = false; - - meta = with lib; { - description = "Linux command-line client for ProtonVPN"; - homepage = "https://github.com/protonvpn/protonvpn-cli-ng"; - maintainers = with maintainers; [ jtcoolen jefflabonte ]; - license = licenses.gpl3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index c48f6c82026..1c72d4ef88c 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -1,43 +1,36 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils -, openvpn, python, dialog, wget, update-resolv-conf }: +{ lib, fetchFromGitHub, python3Packages, openvpn, dialog, iptables }: -let - expectedUpdateResolvPath = "/etc/openvpn/update-resolv-conf"; - actualUpdateResolvePath = "${update-resolv-conf}/libexec/openvpn/update-resolv-conf"; - -in stdenv.mkDerivation rec { - name = "protonvpn-cli"; - version = "1.1.2"; +python3Packages.buildPythonApplication rec { + pname = "protonvpn-linux-cli"; + version = "2.2.4"; src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "protonvpn-cli"; + owner = "protonvpn"; + repo = "linux-cli"; rev = "v${version}"; - sha256 = "0xvflr8zf267n3dv63nkk4wjxhbckw56sqmyca3krf410vrd7zlv"; + sha256 = "08yca0a0prrnrc7ir7ajd56yxvxpcs4m1k8f5kf273f5whgr7wzw"; }; - nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = (with python3Packages; [ + requests + docopt + setuptools + jinja2 + pythondialog + ]) ++ [ + dialog + openvpn + iptables + ]; - installPhase = '' - mkdir -p "$out/bin" - substituteInPlace protonvpn-cli.sh \ - --replace ${expectedUpdateResolvPath} ${actualUpdateResolvePath} \ - --replace \$UID 0 \ - --replace /etc/resolv.conf /dev/null \ - --replace \ - " echo \"Connecting...\"" \ - " sed -ri 's@${expectedUpdateResolvPath}@${actualUpdateResolvePath}@g' \"\$openvpn_config\"; echo \"Connecting...\"" - cp protonvpn-cli.sh "$out/bin/protonvpn-cli" - wrapProgram $out/bin/protonvpn-cli \ - --prefix PATH : ${lib.makeBinPath [ coreutils openvpn python dialog wget update-resolv-conf ]} - ln -s "$out/bin/protonvpn-cli" "$out/bin/pvpn" - ''; + # No tests + doCheck = false; - meta = with stdenv.lib; { - description = "ProtonVPN Command-Line Tool"; - homepage = "https://github.com/ProtonVPN/protonvpn-cli"; - maintainers = with maintainers; [ caugner ]; - license = licenses.mit; + meta = with lib; { + description = "Linux command-line client for ProtonVPN"; + homepage = "https://github.com/protonvpn/linux-cli"; + maintainers = with maintainers; [ jtcoolen jefflabonte ]; + license = licenses.gpl3; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e397bf1556..b45e3d85ccc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21948,8 +21948,6 @@ in protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; - protonvpn-cli-ng = callPackage ../applications/networking/protonvpn-cli-ng { }; - ps2client = callPackage ../applications/networking/ps2client { }; psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { }; From b488383c0ba39fa8af44e3ca5bf973770456a219 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 14 Jul 2020 22:44:55 +0200 Subject: [PATCH 069/520] protonvpn-gui: init at 2.1.1 --- .../networking/protonvpn-gui/default.nix | 86 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 88 insertions(+) create mode 100644 pkgs/applications/networking/protonvpn-gui/default.nix diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix new file mode 100644 index 00000000000..38ffb42aaf8 --- /dev/null +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -0,0 +1,86 @@ +{ lib, fetchFromGitHub, makeDesktopItem, makeWrapper, imagemagick +, python3Packages, wrapGAppsHook, protonvpn-cli, gtk3, pango +, gobject-introspection, libnotify, libappindicator-gtk3 +, procps, openvpn }: + +let + extraPath = lib.makeBinPath [ procps openvpn ]; + +in python3Packages.buildPythonApplication rec { + pname = "protonvpn-linux-gui"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "protonvpn"; + repo = "linux-gui"; + rev = "v${version}"; + sha256 = "avo5/2eq53HSHCnnjtxrsmpURtHvxmLZn2BxActImGY="; + }; + + desktopItem = makeDesktopItem { + name = "ProtonVPN"; + desktopName = "ProtonVPN GUI"; + type = "Application"; + exec = "protonvpn-gui"; + icon = "protonvpn"; + categories = "Network;"; + terminal = "false"; + }; + + trayDesktopItem = makeDesktopItem { + name = "ProtonVPN Tray"; + desktopName = "ProtonVPN Tray"; + type = "Application"; + exec = "protonvpn-tray"; + icon = "protonvpn"; + categories = "Network;"; + terminal = "false"; + }; + + nativeBuildInputs = [ wrapGAppsHook makeWrapper imagemagick ]; + + propagatedBuildInputs = (with python3Packages; [ + pygobject3 + pycairo + requests + configparser + ]) ++ [ + protonvpn-cli + gtk3 + gobject-introspection + libnotify + libappindicator-gtk3 + ]; + + prePatch = '' + # if pkexec is used, we want to have more time to enter password + substituteInPlace linux_gui/services/login_service.py --replace 'timeout=8' 'timeout=30' + ''; + + postInstall = '' + # wrap binaries with extra required path + wrapProgram "$out/bin/protonvpn-tray" --prefix PATH ":" ${extraPath} + wrapProgram "$out/bin/protonvpn-gui" --prefix PATH ":" ${extraPath} + + # install desktop files + mkdir -p $out/share/applications + cp "$desktopItem/share/applications/ProtonVPN.desktop" $out/share/applications/protonvpn-gui.desktop + cp "$trayDesktopItem/share/applications/ProtonVPN Tray.desktop" $out/share/applications/protonvpn-tray.desktop + + # create icons + for size in 16 32 48 64 72 96 128 192 512 1024; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + convert -resize "$size"x"$size" \ + linux_gui/resources/img/logo/protonvpn_logo.png \ + $out/share/icons/hicolor/"$size"x"$size"/apps/protonvpn.png + done + ''; + + meta = with lib; { + description = "Linux GUI for ProtonVPN, written in Python."; + homepage = "https://github.com/ProtonVPN/linux-gui"; + maintainers = with maintainers; [ offline ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b45e3d85ccc..f9a4c67bd89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21948,6 +21948,8 @@ in protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; + protonvpn-gui = callPackage ../applications/networking/protonvpn-gui { }; + ps2client = callPackage ../applications/networking/ps2client { }; psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { }; From d6f6424ac8c29fb840f0fc52bcc5623e4419dff3 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Thu, 9 Jan 2020 16:24:36 +0100 Subject: [PATCH 070/520] nixos/gollum: introduce --h1-title option --- nixos/modules/services/misc/gollum.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index f4a9c72b154..46f90c78eb8 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -50,6 +50,12 @@ in description = "Parse and interpret emoji tags"; }; + h1-title = mkOption { + type = types.bool; + default = false; + description = "Use the first h1 as page title"; + }; + branch = mkOption { type = types.str; default = "master"; @@ -102,6 +108,7 @@ in --ref ${cfg.branch} \ ${optionalString cfg.mathjax "--mathjax"} \ ${optionalString cfg.emoji "--emoji"} \ + ${optionalString cfg.h1-title "--h1-title"} \ ${optionalString (cfg.allowUploads != null) "--allow-uploads ${cfg.allowUploads}"} \ ${cfg.stateDir} ''; From 08211476347a6e684166169d7d34f18c2ec3e775 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Jul 2020 00:47:58 +0000 Subject: [PATCH 071/520] gnuplot: 5.2.8 -> 5.4.0 --- pkgs/tools/graphics/gnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index fc1892317fa..ce2a87981e7 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -20,11 +20,11 @@ let in (if withQt then mkDerivation else stdenv.mkDerivation) rec { pname = "gnuplot"; - version = "5.2.8"; + version = "5.4.0"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${pname}-${version}.tar.gz"; - sha256 = "0dxc52d17mpyb2xm24da1nvhlacryv0irwa0q5l1cjj0rx67d9k0"; + sha256 = "0iwwliq5a6qcawbpxk4d7l17fpkq9xxcz05kwblx37rr7bq84h7b"; }; nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; From d7dd12326f5518b7001629784a87acd22a20d2bd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 28 Jul 2020 09:52:28 -0500 Subject: [PATCH 072/520] steam-runtime: 0.20200604.0 -> 0.20200720.0 --- pkgs/games/steam/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index f2e023e056f..4f373b9be30 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/ - version = "0.20200604.0"; + version = "0.20200720.0"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "04ficg3lnf6ijwkj08094vgcsskfncnlhk61v2csls3wfwvkrmhv"; + sha256 = "03qdlr1xk84jb4c60ilis00vjhj70bxc0bbgk5g5b1883l2frljd"; name = "scout-runtime-${version}.tar.gz"; }; From dcbfb8177b0ad049048330fc5b514465310c1b81 Mon Sep 17 00:00:00 2001 From: Serge Bazanski Date: Thu, 30 Jul 2020 15:14:38 +0200 Subject: [PATCH 073/520] lightburn: init at 0.9.15 --- .../graphics/lightburn/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/graphics/lightburn/default.nix diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix new file mode 100644 index 00000000000..1ed5f07c5f0 --- /dev/null +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -0,0 +1,49 @@ +{ stdenv, patchelf, fetchurl, p7zip +, nss, nspr, libusb1 +, qtbase, qtmultimedia, qtserialport +, autoPatchelfHook, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "lightburn"; + version = "0.9.15"; + + nativeBuildInputs = [ + p7zip + autoPatchelfHook + wrapQtAppsHook + ]; + + src = fetchurl { + url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; + sha256 = "1dwmrili4jfw55gnlnda3imgli7f4jqz9smwlynf7k87lxrhppmh"; + }; + + buildInputs = [ + nss nspr libusb1 + qtbase qtmultimedia qtserialport + ]; + + # We nuke the vendored Qt5 libraries that LightBurn ships and instead use our + # own. + unpackPhase = '' + 7z x $src + rm -rf LightBurn/lib LightBurn/plugins + ''; + + installPhase = '' + mkdir -p $out/share $out/bin + cp -ar LightBurn $out/share/LightBurn + ln -s $out/share/LightBurn/LightBurn $out/bin + + wrapQtApp $out/bin/LightBurn + ''; + + meta = { + description = "LightBurn is layout, editing, and control software for your laser cutter."; + homepage = "https://lightburnsoftware.com/"; + license = stdenv.lib.licenses.unfree; + maintainers = with stdenv.lib.maintainers; [ q3k ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e61e8e51b7..4f97dea51ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21056,6 +21056,8 @@ in ledger-autosync = callPackage ../applications/office/ledger-autosync { }; ledger-web = callPackage ../applications/office/ledger-web { }; + + lightburn = libsForQt5.callPackage ../applications/graphics/lightburn { }; lighthouse = callPackage ../applications/misc/lighthouse { }; From e827315aa876519b7b9f89405709f5909917db81 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jul 2020 15:28:24 +0000 Subject: [PATCH 074/520] libsForQt5.vlc: 3.0.11 -> 3.0.11.1 --- pkgs/applications/video/vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 91fb36c3974..e655e0fbff4 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -25,11 +25,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wra stdenv.mkDerivation rec { pname = "vlc"; - version = "3.0.11"; + version = "3.0.11.1"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz"; - sha256 = "06a9hfl60f6l0fs5c9ma5s8np8kscm4ala6m2pdfji9lyfna351y"; + sha256 = "1f46h0hv7fk35zg4iczlp7ib7h2jmh8m4r5klw3g2558ib9134qq"; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of From 91764a047c932293f7c2d90e0e428f261ca4ffaf Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Thu, 30 Jul 2020 17:40:47 +0200 Subject: [PATCH 075/520] electrum-ltc: fix #94238 --- pkgs/applications/misc/electrum/ltc.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index b7c655caaaf..4bcb66f48b9 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , python3Packages +, wrapQtAppsHook }: python3Packages.buildPythonApplication rec { @@ -12,7 +13,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7"; }; - nativeBuildInputs = with python3Packages; [ pyqt5 ]; + nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ]; propagatedBuildInputs = with python3Packages; [ pyaes @@ -35,6 +36,10 @@ python3Packages.buildPythonApplication rec { sed -i '/Created: .*/d' gui/qt/icons_rc.py ''; + postFixup = '' + wrapQtApp $out/bin/electrum-ltc + ''; + checkPhase = '' $out/bin/electrum-ltc help >/dev/null ''; @@ -54,4 +59,3 @@ python3Packages.buildPythonApplication rec { maintainers = with maintainers; [ ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e61e8e51b7..43f6208ddbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19654,7 +19654,7 @@ in electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; - electrum-ltc = callPackage ../applications/misc/electrum/ltc.nix { }; + electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; elementary-planner = callPackage ../applications/office/elementary-planner { }; From 3378dbde65ad4486c34a9c0fdb8182cdc3a4f9b0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 10:03:23 +0000 Subject: [PATCH 076/520] souffle: 2.0.0 -> 2.0.1 --- pkgs/development/compilers/souffle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index d7fc7b114ab..dbc5c1fa517 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "1azn32x0xbbk8gagipb34qk3y1srm927j5d34w20isgjxir4xsnz"; + sha256 = "0f7jwmgv83m85lrb2qwvr4cfwzbqww7pik884xd2593fsfqhpnkn"; }; nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; From 925a5e09e969f80f93951ada96163981f09182a7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 14:30:42 +0000 Subject: [PATCH 077/520] atlassian-confluence: 7.6.0 -> 7.6.1 --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 1460daa95ee..116b8b935b1 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.6.0"; + version = "7.6.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "1s69b19kz8z8dbac3dsj9yvkvynlygzgnlpm72fbnqg6knp95fyz"; + sha256 = "0ipkr0d4mwsah698fg320h9g5il9xcnwlifbfvfnsijs60y9ps8x"; }; buildPhase = '' From 90450805e5c3f841c3f2d51dd98361f6462a9eff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 17:01:53 +0000 Subject: [PATCH 078/520] asciidoctorj: 2.3.1 -> 2.4.0 --- pkgs/tools/typesetting/asciidoctorj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix index 0d2e8004f55..c518ddeaf39 100644 --- a/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "asciidoctorj"; - version = "2.3.1"; + version = "2.4.0"; src = fetchzip { url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "0gp45vwm0hl8590014qrxlpw2rycxm7ir819d242mh38v3hdjgkz"; + sha256 = "1bp26x5mhbl25s9djlq6yani1vaqrgbi5mjljhwhj97iapwsd0yb"; }; nativeBuildInputs = [ makeWrapper ]; From 6239e44edf83baad7956b878152dae3d23f16d58 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 12 Jun 2020 15:24:42 +0200 Subject: [PATCH 079/520] redkite: init at 1.0.1 --- .../development/libraries/redkite/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/redkite/default.nix diff --git a/pkgs/development/libraries/redkite/default.nix b/pkgs/development/libraries/redkite/default.nix new file mode 100644 index 00000000000..63e5eea25a4 --- /dev/null +++ b/pkgs/development/libraries/redkite/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitLab, cmake, cairo }: + +stdenv.mkDerivation rec { + pname = "redkite"; + version = "1.0.1"; + + src = fetchFromGitLab { + owner = "iurie-sw"; + repo = pname; + rev = "v${version}"; + sha256 = "1qd4r7ps0fg2m1vx3j48chfdh2c5909j4f9wip4af59inrid4w6a"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ cairo ]; + + meta = { + homepage = "https://gitlab.com/iurie-sw/redkite"; + description = "A small GUI toolkit"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0a82466ce6..00e69476c4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14367,6 +14367,8 @@ in randomx = callPackage ../development/libraries/randomx { }; + redkite = callPackage ../development/libraries/redkite { }; + resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { From f98e5c17a98384fb4ecec348f8fdf0d3ffe42f19 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 12 Jun 2020 15:25:19 +0200 Subject: [PATCH 080/520] geonkick: init at 2.3.3 --- pkgs/applications/audio/geonkick/default.nix | 27 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/audio/geonkick/default.nix diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix new file mode 100644 index 00000000000..c2dc39fe610 --- /dev/null +++ b/pkgs/applications/audio/geonkick/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson, libjack2, lv2, libX11, cairo }: + +stdenv.mkDerivation rec { + pname = "geonkick"; + version = "2.3.3"; + + src = fetchFromGitLab { + owner = "iurie-sw"; + repo = pname; + rev = "v${version}"; + sha256 = "0h1abb6q2bmi01a3v37adkc4zc03j47jpvffz8p2lpp33xhljghs"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ]; + + cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" ]; + + meta = { + homepage = "https://gitlab.com/iurie-sw/geonkick"; + description = "A free software percussion synthesizer"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00e69476c4d..1c5a5d4a2c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3662,6 +3662,8 @@ in genimage = callPackage ../tools/filesystems/genimage { }; + geonkick = callPackage ../applications/audio/geonkick {}; + gerrit = callPackage ../applications/version-management/gerrit { }; geteltorito = callPackage ../tools/misc/geteltorito { }; From 30205d76adf793f06c8a5669def74b63d0d9466d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 1 Aug 2020 17:02:48 -0400 Subject: [PATCH 081/520] texlive: disable revisioned tarballs for now --- pkgs/tools/typesetting/tex/texlive/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 29c07408e7e..a2651c63e1d 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -99,8 +99,11 @@ let urls = args.urls or (if args ? url then [ args.url ] else lib.concatMap (up: [ - "${up}/${urlName}.r${toString revision}.tar.xz" - "${up}/${urlName}.tar.xz" # TODO To be removed for telive 2020 + # Only ~11% of packages in texlive 2019 have revisions, so + # the number of requests is nearly doubled if we lookup + # the name with revision + # "${up}/${urlName}.r${toString revision}.tar.xz" + "${up}/${urlName}.tar.xz" # TODO To be removed for texlive 2020? ]) urlPrefixes); From 9b52f2ff674806ed9eaac70b552d90c5fceed84c Mon Sep 17 00:00:00 2001 From: Rohan Date: Mon, 3 Aug 2020 22:43:52 +1200 Subject: [PATCH 082/520] cups-brother-hl1210w: init at 3.0.1-1 Package Brother HL1210W Cups printer driver. Based on cups-brother-hl1110. Installed PPD can be found at /var/lib/cups/path/lib/cups/filter/brother-HL1210W-cups-en.ppd --- pkgs/misc/cups/drivers/hl1210w/default.nix | 62 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/misc/cups/drivers/hl1210w/default.nix diff --git a/pkgs/misc/cups/drivers/hl1210w/default.nix b/pkgs/misc/cups/drivers/hl1210w/default.nix new file mode 100644 index 00000000000..88947ed3339 --- /dev/null +++ b/pkgs/misc/cups/drivers/hl1210w/default.nix @@ -0,0 +1,62 @@ +{stdenv, pkgsi686Linux, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: + +let + version = "3.0.1-1"; + cupsdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf101546/hl1210wcupswrapper-${version}.i386.deb"; + sha256 = "0395mnw6c7qpjgjch9in5q9p2fjdqvz9bwfwp6q1hzhs08ryk7w0"; + }; + lprdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf101547/hl1210wlpr-${version}.i386.deb"; + sha256 = "1sl3g2cd4a2gygryrr27ax3qaa65cbirz3kzskd8afkwqpmjyv7j"; + }; +in +stdenv.mkDerivation { + name = "cups-brother-hl1210W"; + + srcs = [ lprdeb cupsdeb ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + dontUnpack = true; + + installPhase = '' + # install lpr + dpkg-deb -x ${lprdeb} $out + + substituteInPlace $out/opt/brother/Printers/HL1210W/lpd/filter_HL1210W \ + --replace /opt "$out/opt" + + sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/HL1210W/lpd/psconvert2 + + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/lpd/brprintconflsr3 + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/lpd/rawtobr3 + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/inf/braddprinter + + wrapProgram $out/opt/brother/Printers/HL1210W/lpd/psconvert2 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + wrapProgram $out/opt/brother/Printers/HL1210W/lpd/filter_HL1210W \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + + # install cups + dpkg-deb -x ${cupsdeb} $out + + substituteInPlace $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W --replace /opt "$out/opt" + + mkdir -p $out/lib/cups/filter + ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W $out/lib/cups/filter/brother_lpdwrapper_HL1210W + ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother-HL1210W-cups-en.ppd $out/lib/cups/filter/brother-HL1210W-cups-en.ppd + # cp brcupsconfig4 $out/opt/brother/Printers/HL1110/cupswrapper/ + ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4 + + wrapProgram $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + ''; + + meta = { + homepage = "http://www.brother.com/"; + description = "Brother HL1210W printer driver"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=nz&lang=en&prod=hl1210w_eu_as&os=128"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6d406907ac..f9e1ed8568f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25996,6 +25996,8 @@ in cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; + cups-brother-hl1210w = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1210w { }; + cups-brother-hl3140cw = pkgsi686Linux.callPackage ../misc/cups/drivers/hl3140cw { }; cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { }; From 1d18e350236130f7570d6a8fc67ad0234e82247e Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 6 Jul 2020 23:30:53 +0200 Subject: [PATCH 083/520] mpvScripts.sponsorblock: init at f71e49e (2020-07-05) --- .../video/mpv/scripts/sponsorblock.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/video/mpv/scripts/sponsorblock.nix diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix new file mode 100644 index 00000000000..8213e514d2b --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchFromGitHub, fetchpatch, python3 }: + +# Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` +stdenv.mkDerivation { + pname = "mpv_sponsorblock"; + version = "unstable-2020-07-05"; + + src = fetchFromGitHub { + owner = "po5"; + repo = "mpv_sponsorblock"; + rev = "f71e49e0531350339134502e095721fdc66eac20"; + sha256 = "1fr4cagzs26ygxyk8dxqvjw4n85fzv6is6cb1jhr2qnsjg6pa0p8"; + }; + + dontBuild = true; + + patches = [ + # Use XDG_DATA_HOME and XDG_CACHE_HOME if defined for UID and DB + # Necessary to avoid sponsorblock to write in the nix store at runtime. + # https://github.com/po5/mpv_sponsorblock/pull/17 + (fetchpatch { + url = "https://github.com/po5/mpv_sponsorblock/pull/17/commits/e65b360a7d03a3430b4829e457a6670b2f617b09.patch"; + sha256 = "00wv0pvbz0dz2ibka66zhl2jk0pil4pyv6ipjfz37i81q6szyhs5"; + }) + (fetchpatch { + url = "https://github.com/po5/mpv_sponsorblock/pull/17/commits/3832304d959205e99120a14c0560ed3c37104b08.patch"; + sha256 = "149ffvn714n2m3mqs8mgrbs24bcr74kqfkx7wyql36ndhm88xd2z"; + }) + ]; + + postPatch = '' + substituteInPlace sponsorblock.lua \ + --replace "python3" "${python3}/bin/python3" \ + --replace 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\"" + ''; + + installPhase = '' + mkdir -p $out/share/mpv/scripts + cp -r sponsorblock.lua sponsorblock_shared $out/share/mpv/scripts/ + ''; + + passthru.scriptName = "sponsorblock.lua"; + + meta = with stdenv.lib; { + description = "mpv script to skip sponsored segments of YouTube videos"; + homepage = "https://github.com/po5/mpv_sponsorblock"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ pacien ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94204a91d1c..dbb1c1ca36a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21474,6 +21474,7 @@ in convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; + sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {}; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; From d1a1a7f559e60a71f1c5ba0c571df6a3c94bac79 Mon Sep 17 00:00:00 2001 From: elkowar <5300871+elkowar@users.noreply.github.com> Date: Fri, 7 Aug 2020 18:51:55 +0200 Subject: [PATCH 084/520] maintainer: add elkowar --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f1a62d02227..9a4f428a620 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2448,6 +2448,12 @@ githubId = 97852; name = "Ellis Whitehead"; }; + elkowar = { + email = "thereal.elkowar@gmail.com"; + github = "elkowar"; + githubId = 5300871; + name = "Leon Kowarschick"; + }; elohmeier = { email = "elo-nixos@nerdworks.de"; github = "elohmeier"; From a8a241cd3f0a8baeb70a38d0cac3a2380b1a961d Mon Sep 17 00:00:00 2001 From: afreakk Date: Sat, 8 Aug 2020 18:05:37 +0200 Subject: [PATCH 085/520] sidequest: 0.10.2 -> 0.10.11 --- pkgs/applications/misc/sidequest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index 6c55c3157f5..883b3eec03d 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: let pname = "sidequest"; - version = "0.10.2"; + version = "0.10.11"; desktopItem = makeDesktopItem rec { name = "SideQuest"; @@ -16,7 +16,7 @@ src = fetchurl { url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "1vfxn4gx5b138gj6nk4w3jlp2l56cqpb8hq2kn5mrf4dhjii8n88"; + sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9"; }; buildInputs = [ makeWrapper ]; From c4734905247b5a3771996b83192424ebc3d8db61 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Thu, 23 Jul 2020 06:08:15 -0700 Subject: [PATCH 086/520] osqp: init at 0.6.0 --- .../libraries/science/math/osqp/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/science/math/osqp/default.nix diff --git a/pkgs/development/libraries/science/math/osqp/default.nix b/pkgs/development/libraries/science/math/osqp/default.nix new file mode 100644 index 00000000000..9cd062d21f2 --- /dev/null +++ b/pkgs/development/libraries/science/math/osqp/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "osqp"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "oxfordcontrol"; + repo = "osqp"; + rev = "v${version}"; + sha256 = "1gwk1bqsk0rd85zf7xplbwq822y5pnxjmqc14jj6knqbab9afvrs"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "A quadratic programming solver using operator splitting"; + homepage = "https://osqp.org"; + license = licenses.asl20; + maintainers = with maintainers; [ taktoa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06cafdd17dc..404a142318d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5837,6 +5837,8 @@ in osl = callPackage ../development/compilers/osl { }; + osqp = callPackage ../development/libraries/science/math/osqp { }; + ossec = callPackage ../tools/security/ossec {}; osslsigncode = callPackage ../development/tools/osslsigncode {}; From a52e20c5031322e9cfb5e3d0f5e070b98d89fdc2 Mon Sep 17 00:00:00 2001 From: Piotr Halama Date: Mon, 10 Aug 2020 22:55:28 +0200 Subject: [PATCH 087/520] kanji-stroke-order-font: 4.002 -> 4.003 --- .../fonts/kanji-stroke-order-font/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/pkgs/data/fonts/kanji-stroke-order-font/default.nix index 1c1609b03f1..7b8444c3cde 100644 --- a/pkgs/data/fonts/kanji-stroke-order-font/default.nix +++ b/pkgs/data/fonts/kanji-stroke-order-font/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchurl }: let - version = "4.002"; -in fetchzip { + version = "4.003"; + debianVersion = "dfsg-1"; +in stdenv.mkDerivation { name = "kanji-stroke-order-font-${version}"; - url = "https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v${version}.zip?attredirects=0"; + src = fetchurl { + url = "https://salsa.debian.org/fonts-team/fonts-kanjistrokeorders/-/archive/debian/${version}_${debianVersion}/fonts-kanjistrokeorders-debian-${version}_${debianVersion}.tar.bz2"; + sha256 = "1a8hxzkrfjz0h5gl9h0panzzsn7cldlklxryyzmpam23g32q6bg1"; + }; - postFetch = '' + installPhase = '' mkdir -p $out/share/fonts/kanji-stroke-order $out/share/doc/kanji-stroke-order - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/kanji-stroke-order - unzip -j $downloadedFile \*.txt -d $out/share/doc/kanji-stroke-order + cp *.ttf $out/share/fonts/kanji-stroke-order + cp *.txt $out/share/doc/kanji-stroke-order ''; - sha256 = "194ylkx5p7r1461wnnd3hisv5dz1xl07fyxmg8gv47zcwvdmwkc0"; - meta = with stdenv.lib; { description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters"; homepage = "https://sites.google.com/site/nihilistorguk/"; From c54beb953d00f576ba73565d0476af241af26013 Mon Sep 17 00:00:00 2001 From: Kurt Robert Rudolph Date: Mon, 10 Aug 2020 18:30:29 -0700 Subject: [PATCH 088/520] nixos/xmonad: Fix behavior of config opt Prior to this change, the `config` option (which allows you define the haskell configuration for xmonad in your configuration.nix instead of needing something in the home directory) prevents desktop manager resources from starting. This can be demonstrated by configuring the following: ``` services.xserver = { displayManager.defaultSession = "xfce+xmonad"; displayManager.lightdm.enable = true; desktopManager.xterm.enable = false; desktopManager.xfce.enable = true; desktopManager.xfce.enableXfwm = false; desktopManager.xfce.noDesktop = true; windowManager.xmonad = { enable = true; enableContribAndExtras = true; extraPackages = haskellPackages: [ haskellPackages.xmonad-contrib haskellPackages.xmonad-extras haskellPackages.xmonad ]; config = '' import XMonad import XMonad.Config.Xfce main = xmonad xfceConfig { terminal = "terminator" , modMask = mod4Mask } ''; }; }; ``` and after user log in, search for xfce processes `ps aux | grep xfce`. You will not find xfce processes running until after the xmonad process is killed. The bug prevents utilities included with the desktopManager, (e.g. powerManagement, session logout, etc.) from working as expected. --- nixos/modules/services/x11/window-managers/xmonad.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 30c59b88f82..070758720fe 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -82,12 +82,11 @@ in services.xserver.windowManager = { session = [{ name = "xmonad"; - start = if (cfg.config != null) then '' - ${xmonadBin} - waitPID=$! - '' else '' - systemd-cat -t xmonad ${xmonad}/bin/xmonad & - waitPID=$! + start = let + xmonadCommand = if (cfg.config != null) then xmonadBin else "${xmonad}/bin/xmonad"; + in '' + systemd-cat -t xmonad ${xmonadCommand} & + waitPID=$! ''; }]; }; From eb970b6241d230213d5e30c92916443a2a0f410f Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Mon, 10 Aug 2020 19:52:54 -0700 Subject: [PATCH 089/520] mkDerivation: handle Redox in cmakeFlags --- pkgs/stdenv/generic/make-derivation.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 993ae68e9e8..5b1c380548f 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -247,7 +247,8 @@ in rec { (/**/ if lib.isString cmakeFlags then [cmakeFlags] else if cmakeFlags == null then [] else cmakeFlags) - ++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" [ stdenv.hostPlatform.uname.system ]}" ] + ++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" ( + lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"] ++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}" ++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.release}" ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" From 354642d72b355e00066d04008b6d7298ec899ec2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 07:53:57 +0000 Subject: [PATCH 090/520] mu: 1.4.12 -> 1.4.13 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 250e7a2f7dd..82a22dd947d 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.4.12"; + version = "1.4.13"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "0xc36z5k9c70jg5f2878ya5w45gb2gfxrfljzhs9pafk955j8ir9"; + sha256 = "03cp2ppj07xpb0c43d3cr8m9jps07mfm8clmlk03sjbxg1widsh0"; }; postPatch = stdenv.lib.optionalString (batchSize != null) '' From 423561ddbd518cac69d225af5a90aafae8f06216 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 Aug 2020 08:16:58 +0000 Subject: [PATCH 091/520] navidrome: 0.27.0 -> 0.29.0 --- pkgs/servers/misc/navidrome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 852c0e929fe..a14a5039721 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.27.0"; + version = "0.29.0"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "0givv23dx6hwzg0axwifrha17qafs19ag34vjz29xrj3smsl8zh3"; + sha256 = "0dpv68wvrslgfgh18mb8ficji6k1i9jiid9bfw786andf4rwghyc"; }; nativeBuildInputs = [ makeWrapper ]; From f7fe83afa4202aa197ec98f893bebc25335c5aca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Aug 2020 23:29:13 +0000 Subject: [PATCH 092/520] zimg: 2.9.3 -> 3.0 --- pkgs/development/libraries/zimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index f5913137e1c..0deec273881 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zimg"; - version = "2.9.3"; + version = "3.0"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "1dqyrq3p8bkgvj4ci50ac342hjnhyz6xxvhiwp7wpi3v3nbj7s02"; + sha256 = "157lqfgz4lqa782iij7lkajgjbxv3vqf6y5hpdz36i6dg06paqqa"; }; nativeBuildInputs = [ autoreconfHook ]; From 8011cd73bf4bee59739518d1b41e76fd4397b141 Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 13 Aug 2020 01:04:46 +0200 Subject: [PATCH 093/520] mlterm: enable IME support A core feature of mlterm is its support for a wide range of languages, including those which use non-alphabetic letters. In order to input such letters on an alphabetic keyboard, an IME needs to be used. Mlterm supports most of the popular ones by default, they just need to be visible in the configure phase. These three are the IMEs supported by both NixOS and mlterm. --- pkgs/applications/misc/mlterm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index f58fb13e61f..89f78ee8e99 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -3,6 +3,7 @@ , harfbuzz #substituting glyphs with opentype fonts , fribidi, m17n_lib #bidi and encoding , openssl, libssh2 #build-in ssh +, fcitx, ibus, uim #IME }: stdenv.mkDerivation rec { @@ -18,6 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 gdk-pixbuf.dev cairo libXft gtk3 vte harfbuzz fribidi m17n_lib openssl libssh2 + fcitx ibus uim ]; #bad configure.ac and Makefile.in everywhere From f514b28f55ef40049146b82ab83d4e5c251e0ed8 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 26 Jul 2020 13:20:46 +0200 Subject: [PATCH 094/520] ksquares: init at 20.04.3 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/ksquares.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/kde/ksquares.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 4767ff3c84b..ea2e3722419 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -147,6 +147,7 @@ let kpat = callPackage ./kpat.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; ksmtp = callPackage ./ksmtp {}; + ksquares = callPackage ./ksquares.nix {}; kqtquickcharts = callPackage ./kqtquickcharts.nix {}; kpkpass = callPackage ./kpkpass.nix {}; krdc = callPackage ./krdc.nix {}; diff --git a/pkgs/applications/kde/ksquares.nix b/pkgs/applications/kde/ksquares.nix new file mode 100644 index 00000000000..94a639a0d37 --- /dev/null +++ b/pkgs/applications/kde/ksquares.nix @@ -0,0 +1,22 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, libkdegames, kconfig, kcrash, kxmlgui }: + +mkDerivation { + name = "ksquares"; + meta = with lib; { + homepage = "https://kde.org/applications/en/games/org.kde.ksquares"; + description = "KSquares is a game of Dots and Boxes"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kdoctools + libkdegames + kconfig + kcrash + kxmlgui + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79a8951e8ab..42ccdb7c403 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20947,7 +20947,7 @@ in akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake - kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle; + kpkpass kitinerary kontact korganizer krdc krfb ksquares ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; From bddabe58fe12f7eb233228ed8937cbbe97f72110 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 17 Jul 2020 16:00:33 +0200 Subject: [PATCH 095/520] ocaml: add spacetime support --- pkgs/development/compilers/ocaml/generic.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index f2b61ab700d..1558756e16b 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -10,20 +10,22 @@ let safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips); in -{ stdenv, fetchurl, ncurses, buildEnv +{ stdenv, fetchurl, ncurses, buildEnv, libunwind , libX11, xorgproto, useX11 ? safeX11 stdenv && !stdenv.lib.versionAtLeast version "4.09" , aflSupport ? false , flambdaSupport ? false +, spaceTimeSupport ? false }: assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips; assert aflSupport -> stdenv.lib.versionAtLeast version "4.05"; assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; +assert spaceTimeSupport -> stdenv.lib.versionAtLeast version "4.04"; let useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optional optionals optionalString; - name = "ocaml${optionalString aflSupport "+afl"}${optionalString flambdaSupport "+flambda"}-${version}"; + name = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}-${version}"; in let @@ -53,11 +55,13 @@ stdenv.mkDerivation (args // { [ "-x11lib" x11lib "-x11include" x11inc ]) ++ optional aflSupport (flags "--with-afl" "-afl-instrument") ++ optional flambdaSupport (flags "--enable-flambda" "-flambda") + ++ optional spaceTimeSupport (flags "--enable-spacetime" "-spacetime") ; buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses ++ optionals useX11 [ libX11 xorgproto ]; + propagatedBuildInputs = optional spaceTimeSupport libunwind; installTargets = [ "install" ] ++ optional useNativeCompilers "installopt"; preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) From ca64913facca1aba2c169e83b133f469503156df Mon Sep 17 00:00:00 2001 From: dawidsowa Date: Thu, 13 Aug 2020 19:49:28 +0200 Subject: [PATCH 096/520] rss-bridge: init at 2020-02-26 --- pkgs/servers/web-apps/rss-bridge/default.nix | 33 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/servers/web-apps/rss-bridge/default.nix diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/servers/web-apps/rss-bridge/default.nix new file mode 100644 index 00000000000..432f5956406 --- /dev/null +++ b/pkgs/servers/web-apps/rss-bridge/default.nix @@ -0,0 +1,33 @@ +{ config, lib, pkgs, fetchFromGitHub, stdenv, ... }: + +stdenv.mkDerivation rec { + pname = "rss-bridge"; + version = "2020-02-26"; + + src = fetchFromGitHub { + owner = "RSS-Bridge"; + repo = "rss-bridge"; + rev = "${version}"; + sha256 = "075k4bylx9308d083ry5a9q4629ccnrnndqqdqp1g42rzlqrw79q"; + }; + + patchPhase = '' + substituteInPlace lib/rssbridge.php \ + --replace "define('PATH_CACHE', PATH_ROOT . 'cache/');" "define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/');" \ + --replace "define('FILE_CONFIG', PATH_ROOT . 'config.ini.php');" "define('FILE_CONFIG', getenv('RSSBRIDGE_DATA') . '/config.ini.php');" \ + --replace "define('WHITELIST', PATH_ROOT . 'whitelist.txt');" "define('WHITELIST', getenv('RSSBRIDGE_DATA') . '/whitelist.txt');" + ''; + + installPhase = '' + mkdir $out/ + cp -R ./* $out + ''; + + meta = with lib; { + description = "The RSS feed for websites missing it"; + homepage = "https://github.com/RSS-Bridge/rss-bridge"; + license = licenses.unlicense; + maintainers = with maintainers; [ dawidsowa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a11116c96b2..81acd39e118 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16474,6 +16474,8 @@ in tt-rss-plugin-auth-ldap = callPackage ../servers/tt-rss/plugin-auth-ldap { }; tt-rss-theme-feedly = callPackage ../servers/tt-rss/theme-feedly { }; + rss-bridge = callPackage ../servers/web-apps/rss-bridge { }; + searx = callPackage ../servers/web-apps/searx { }; selfoss = callPackage ../servers/web-apps/selfoss { }; From 9aaf34bdb8d5d77ffee1f3ee2db8caabdd7a8bb6 Mon Sep 17 00:00:00 2001 From: dawidsowa Date: Thu, 13 Aug 2020 19:51:03 +0200 Subject: [PATCH 097/520] nixos/rss-bridge: init --- nixos/modules/module-list.nix | 1 + .../modules/services/web-apps/rss-bridge.nix | 127 ++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 nixos/modules/services/web-apps/rss-bridge.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cf25ae3157e..7b8dfd927fe 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -857,6 +857,7 @@ ./services/web-apps/moinmoin.nix ./services/web-apps/restya-board.nix ./services/web-apps/sogo.nix + ./services/web-apps/rss-bridge.nix ./services/web-apps/tt-rss.nix ./services/web-apps/trac.nix ./services/web-apps/trilium.nix diff --git a/nixos/modules/services/web-apps/rss-bridge.nix b/nixos/modules/services/web-apps/rss-bridge.nix new file mode 100644 index 00000000000..f1d5b7660f3 --- /dev/null +++ b/nixos/modules/services/web-apps/rss-bridge.nix @@ -0,0 +1,127 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.rss-bridge; + + poolName = "rss-bridge"; + + whitelist = pkgs.writeText "rss-bridge_whitelist.txt" + (concatStringsSep "\n" cfg.whitelist); +in +{ + options = { + services.rss-bridge = { + enable = mkEnableOption "rss-bridge"; + + user = mkOption { + type = types.str; + default = "nginx"; + example = "nginx"; + description = '' + User account under which both the service and the web-application run. + ''; + }; + + group = mkOption { + type = types.str; + default = "nginx"; + example = "nginx"; + description = '' + Group under which the web-application run. + ''; + }; + + pool = mkOption { + type = types.str; + default = poolName; + description = '' + Name of existing phpfpm pool that is used to run web-application. + If not specified a pool will be created automatically with + default values. + ''; + }; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/rss-bridge"; + description = '' + Location in which cache directory will be created. + You can put config.ini.php in here. + ''; + }; + + virtualHost = mkOption { + type = types.nullOr types.str; + default = "rss-bridge"; + description = '' + Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost. + ''; + }; + + whitelist = mkOption { + type = types.listOf types.str; + default = []; + example = options.literalExample '' + [ + "Facebook" + "Instagram" + "Twitter" + ] + ''; + description = '' + List of bridges to be whitelisted. + If the list is empty, rss-bridge will use whitelist.default.txt. + Use [ "*" ] to whitelist all. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + services.phpfpm.pools = mkIf (cfg.pool == poolName) { + ${poolName} = { + user = cfg.user; + settings = mapAttrs (name: mkDefault) { + "listen.owner" = cfg.user; + "listen.group" = cfg.user; + "listen.mode" = "0600"; + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 10; + "pm.min_spare_servers" = 5; + "pm.max_spare_servers" = 20; + "pm.max_requests" = 500; + "catch_workers_output" = 1; + }; + }; + }; + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}/cache' 0750 ${cfg.user} ${cfg.group} - -" + (mkIf (cfg.whitelist != []) "L+ ${cfg.dataDir}/whitelist.txt - - - - ${whitelist}") + "z '${cfg.dataDir}/config.ini.php' 0750 ${cfg.user} ${cfg.group} - -" + ]; + + services.nginx = mkIf (cfg.virtualHost != null) { + enable = true; + virtualHosts = { + ${cfg.virtualHost} = { + root = "${pkgs.rss-bridge}"; + + locations."/" = { + tryFiles = "$uri /index.php$is_args$args"; + }; + + locations."~ ^/index.php(/|$)" = { + extraConfig = '' + include ${pkgs.nginx}/conf/fastcgi_params; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket}; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param RSSBRIDGE_DATA ${cfg.dataDir}; + ''; + }; + }; + }; + }; + }; +} From 53cdb95d1074a6b859936f1e1cf311e5f7afcb18 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 12 Aug 2020 18:46:28 -0400 Subject: [PATCH 098/520] crda: fix cross compilation --- pkgs/os-specific/linux/crda/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index 137e88cd6e8..979b7cf1deb 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3, wireless-regdb }: +{ stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3Packages, wireless-regdb }: stdenv.mkDerivation rec { pname = "crda"; @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt libnl ]; nativeBuildInputs = [ pkgconfig - python3 - python3.pkgs.pycrypto + python3Packages.pycrypto ]; postPatch = '' From d7132e41f93d147f77e76fdbfebf484b0646b778 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Aug 2020 02:46:05 +0000 Subject: [PATCH 099/520] tridactyl-native: 1.19.1 -> 1.20.0 --- pkgs/tools/networking/tridactyl-native/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index 7072fb96eda..5dd5f3c153f 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.19.1"; + version = "1.20.0"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "19hldr6ii1z7gghc80h7qsnlz9na586gldm5y33i6lrs93193l82"; + sha256 = "14p6jadw4yij45rrwjbyf1lq3zpsni4sph88c6mlwlf8w830s3q8"; }; sourceRoot = "source/native"; From e0ea8c2275f15d3490554ea2b912123fc1bfc114 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Aug 2020 11:21:16 +0000 Subject: [PATCH 100/520] leftwm: 0.2.2 -> 0.2.4 --- pkgs/applications/window-managers/leftwm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index ade3904b95c..06ebd7e0e92 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.2.2"; + version = "0.2.4"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "0x8cqc7zay19jxy7cshayjjwwjrcblqpmqrxipm2g5hhyjghk6q0"; + sha256 = "0xmkhkdpz1bpczrar9y6assdzhd7qxybnkjqs36h099fk9xqmsav"; }; - cargoSha256 = "1kphv3vnr8ij7raf0niwz3rwly986xi5fgwqg2ya0r46ifqkgvrc"; + cargoSha256 = "06wnx81fhs19pz5qnir6h2v2kmj73y1g354nadcx6650q9pnhdv4"; buildInputs = [ makeWrapper libX11 libXinerama ]; From 83e63e03908c54ed6cf8b1e0f0460ca6cc20159e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 6 Aug 2020 17:25:05 -0300 Subject: [PATCH 101/520] blueberry: init at 1.3.9 --- pkgs/tools/bluetooth/blueberry/default.nix | 96 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 98 insertions(+) create mode 100644 pkgs/tools/bluetooth/blueberry/default.nix diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix new file mode 100644 index 00000000000..4b7692d49d6 --- /dev/null +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -0,0 +1,96 @@ +{ stdenv +, lib +, fetchFromGitHub +, bluez-tools +, cinnamon +, gnome3 +, gobject-introspection +, intltool +, pavucontrol +, python3Packages +, rfkill +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "blueberry"; + version = "1.3.9"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "0llvz1h2dmvhvwkkvl0q4ggi1nmdbllw34ppnravs5lybqkicyw9"; + }; + + nativeBuildInputs = [ + gobject-introspection + python3Packages.wrapPython + wrapGAppsHook + ]; + + buildInputs = [ + bluez-tools + cinnamon.xapps + gnome3.gnome-bluetooth + python3Packages.python + rfkill + ]; + + pythonPath = with python3Packages; [ + dbus-python + pygobject3 + setproctitle + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -a etc usr/* $out + + # Fix paths + substituteInPlace $out/bin/blueberry \ + --replace /usr/lib/blueberry $out/lib/blueberry + substituteInPlace $out/bin/blueberry-tray \ + --replace /usr/lib/blueberry $out/lib/blueberry + substituteInPlace $out/etc/xdg/autostart/blueberry-obex-agent.desktop \ + --replace /usr/lib/blueberry $out/lib/blueberry + substituteInPlace $out/etc/xdg/autostart/blueberry-tray.desktop \ + --replace Exec=blueberry-tray Exec=$out/bin/blueberry-tray + substituteInPlace $out/lib/blueberry/blueberry-obex-agent.py \ + --replace /usr/share $out/share + substituteInPlace $out/lib/blueberry/blueberry-tray.py \ + --replace /usr/share $out/share + substituteInPlace $out/lib/blueberry/blueberry.py \ + --replace '"bt-adapter"' '"${bluez-tools}/bin/bt-adapter"' \ + --replace /usr/bin/pavucontrol ${pavucontrol}/bin/pavucontrol \ + --replace /usr/lib/blueberry $out/lib/blueberry \ + --replace /usr/share $out/share + substituteInPlace $out/lib/blueberry/rfkillMagic.py \ + --replace /usr/bin/rfkill ${rfkill}/bin/rfkill \ + --replace /usr/sbin/rfkill ${rfkill}/bin/rfkill \ + --replace /usr/lib/blueberry $out/lib/blueberry + substituteInPlace $out/share/applications/blueberry.desktop \ + --replace Exec=blueberry Exec=$out/bin/blueberry + + glib-compile-schemas --strict $out/share/glib-2.0/schemas + + runHook postInstall + ''; + + dontWrapGApps = true; + + postFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + wrapPythonProgramsIn $out/lib "$out $pythonPath" + ''; + + meta = with lib; { + description = "Bluetooth configuration tool"; + homepage = "https://github.com/linuxmint/blueberry"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fb087e8b6a..e7c4312f09a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2458,6 +2458,8 @@ in inherit (python27Packages) pillow; }; + blueberry = callPackage ../tools/bluetooth/blueberry { }; + blueman = callPackage ../tools/bluetooth/blueman { }; bmrsa = callPackage ../tools/security/bmrsa/11.nix { }; From 0f1434cb2adb8bec6678b53510750ce7c1814263 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Thu, 13 Aug 2020 20:50:06 +0200 Subject: [PATCH 102/520] neovim: fix build on Darwin libluv path passed to -DLIBLUV_LIBRARY broken by change in libluv, eg: libluv.dylib -> libluv.1.30.0.dylib Signed-off-by: Sirio Balmelli --- pkgs/applications/editors/neovim/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index e56e7d93807..b546aae790a 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -20,6 +20,14 @@ let )); pyEnv = python.withPackages(ps: [ ps.pynvim ps.msgpack ]); + + # FIXME: this is verry messy and strange. + # see https://github.com/NixOS/nixpkgs/pull/80528 + luv = lua.pkgs.luv; + luvpath = with builtins ; if stdenv.isDarwin + then "${luv.libluv}/lib/lua/${lua.luaversion}/libluv.${head (match "([0-9.]+).*" luv.version)}.dylib" + else "${luv}/lib/lua/${lua.luaversion}/luv.so"; + in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; @@ -47,7 +55,7 @@ in libtermkey libuv libvterm-neovim - lua.pkgs.luv.libluv + luv.libluv msgpack ncurses neovimLuaEnv @@ -88,10 +96,8 @@ in cmakeFlags = [ "-DGPERF_PRG=${gperf}/bin/gperf" "-DLUA_PRG=${neovimLuaEnv.interpreter}" + "-DLIBLUV_LIBRARY=${luvpath}" ] - # FIXME: this is verry messy and strange. - ++ optional (!stdenv.isDarwin) "-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so" - ++ optional (stdenv.isDarwin) "-DLIBLUV_LIBRARY=${lua.pkgs.luv.libluv}/lib/lua/${lua.luaversion}/libluv.dylib" ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" ; From 20656b7ba988fdfafa36bbbdfede7f57a4da3311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 15 Aug 2020 07:38:52 +0200 Subject: [PATCH 103/520] rocm-thunk: 3.5.0 -> 3.7.0 --- pkgs/development/libraries/rocm-thunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 42b632d293c..c43f9b04b93 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "3.5.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - sha256 = "0xn1z0xc3phjc9vabwxgph5any4ffhc8wgs5yb15m5wpg87l8x1z"; + sha256 = "05963lxip3175g4b7k45r94yayp9gcwl3fpma9g5mdkbrlbvwlvz"; }; preConfigure = '' From 94ab643fe5ec8b9bfc957f8f3efaccfdb0211ed9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Aug 2020 13:47:52 +0000 Subject: [PATCH 104/520] ocamlPackages.lablgtk3: 3.1.0 -> 3.1.1 --- pkgs/development/ocaml-modules/lablgtk3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 641f16f69b0..8a45e617677 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, pkgconfig, buildDunePackage, gtk3, cairo2 }: buildDunePackage rec { - version = "3.1.0"; + version = "3.1.1"; pname = "lablgtk3"; minimumOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/garrigue/lablgtk/releases/download/${version}/lablgtk3-${version}.tbz"; - sha256 = "1fn04qwgkwc86jndlrnv4vxcmasjsp1mmcgfznahj1ccc7bv47sv"; + sha256 = "1ygc1yh99gh44h958yffw1vxdlfpn799d4x1s36c2jfbi8f0dir2"; }; nativeBuildInputs = [ pkgconfig ]; From f8c1c5ad830763290bc0f550ea8e71aa8bb186de Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Aug 2020 14:10:21 +0000 Subject: [PATCH 105/520] ocamlPackages.ocp-indent: 1.8.1 -> 1.8.2 --- pkgs/development/tools/ocaml/ocp-indent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index 729985f87fd..675f66dcf47 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -1,12 +1,12 @@ { lib, fetchzip, buildDunePackage, cmdliner }: buildDunePackage rec { - version = "1.8.1"; + version = "1.8.2"; pname = "ocp-indent"; src = fetchzip { url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz"; - sha256 = "0h4ysh36q1fxc40inhsdq2swqpfm15lpilqqcafs5ska42pn7s68"; + sha256 = "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3"; }; minimumOCamlVersion = "4.02"; From 612f3324c91890db17c94d42bc257e4178e69c3a Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Thu, 30 Jul 2020 12:43:59 -0400 Subject: [PATCH 106/520] haskell-generic-builder: Use args ? attr for passthru (closes #94246) Comparing to a default value to detect if an argument was provided forces it to at least WHNF, which can cause failure (e.g., if the argument is a string with a quoted path from a broken package). --- .../haskell-modules/generic-builder.nix | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 20fa2c84062..29609e86389 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -21,7 +21,7 @@ in , configureFlags ? [] , buildFlags ? [] , haddockFlags ? [] -, description ? "" +, description ? null , doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version , doBenchmark ? false , doHoogle ? true @@ -50,7 +50,7 @@ in , jailbreak ? false , license , enableParallelBuilding ? true -, maintainers ? [] +, maintainers ? null , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} @@ -59,14 +59,14 @@ in , benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? [] , testTarget ? "" , broken ? false -, preCompileBuildDriver ? "", postCompileBuildDriver ? "" -, preUnpack ? "", postUnpack ? "" -, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" -, preConfigure ? "", postConfigure ? "" -, preBuild ? "", postBuild ? "" -, installPhase ? "", preInstall ? "", postInstall ? "" -, checkPhase ? "", preCheck ? "", postCheck ? "" -, preFixup ? "", postFixup ? "" +, preCompileBuildDriver ? null, postCompileBuildDriver ? null +, preUnpack ? null, postUnpack ? null +, patches ? null, patchPhase ? null, prePatch ? "", postPatch ? "" +, preConfigure ? null, postConfigure ? null +, preBuild ? null, postBuild ? null +, installPhase ? null, preInstall ? null, postInstall ? null +, checkPhase ? null, preCheck ? null, postCheck ? null +, preFixup ? null, postFixup ? null , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false @@ -636,34 +636,34 @@ stdenv.mkDerivation ({ }; meta = { inherit homepage license platforms; } - // optionalAttrs broken { inherit broken; } - // optionalAttrs (description != "") { inherit description; } - // optionalAttrs (maintainers != []) { inherit maintainers; } - // optionalAttrs (hydraPlatforms != null) { inherit hydraPlatforms; } + // optionalAttrs (args ? broken) { inherit broken; } + // optionalAttrs (args ? description) { inherit description; } + // optionalAttrs (args ? maintainers) { inherit maintainers; } + // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; } ; } -// optionalAttrs (preCompileBuildDriver != "") { inherit preCompileBuildDriver; } -// optionalAttrs (postCompileBuildDriver != "") { inherit postCompileBuildDriver; } -// optionalAttrs (preUnpack != "") { inherit preUnpack; } -// optionalAttrs (postUnpack != "") { inherit postUnpack; } -// optionalAttrs (patches != []) { inherit patches; } -// optionalAttrs (patchPhase != "") { inherit patchPhase; } -// optionalAttrs (preConfigure != "") { inherit preConfigure; } -// optionalAttrs (postConfigure != "") { inherit postConfigure; } -// optionalAttrs (preBuild != "") { inherit preBuild; } -// optionalAttrs (postBuild != "") { inherit postBuild; } -// optionalAttrs (doBenchmark) { inherit doBenchmark; } -// optionalAttrs (checkPhase != "") { inherit checkPhase; } -// optionalAttrs (preCheck != "") { inherit preCheck; } -// optionalAttrs (postCheck != "") { inherit postCheck; } -// optionalAttrs (preInstall != "") { inherit preInstall; } -// optionalAttrs (installPhase != "") { inherit installPhase; } -// optionalAttrs (postInstall != "") { inherit postInstall; } -// optionalAttrs (preFixup != "") { inherit preFixup; } -// optionalAttrs (postFixup != "") { inherit postFixup; } -// optionalAttrs (dontStrip) { inherit dontStrip; } -// optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; } +// optionalAttrs (args ? preCompileBuildDriver) { inherit preCompileBuildDriver; } +// optionalAttrs (args ? postCompileBuildDriver) { inherit postCompileBuildDriver; } +// optionalAttrs (args ? preUnpack) { inherit preUnpack; } +// optionalAttrs (args ? postUnpack) { inherit postUnpack; } +// optionalAttrs (args ? patches) { inherit patches; } +// optionalAttrs (args ? patchPhase) { inherit patchPhase; } +// optionalAttrs (args ? preConfigure) { inherit preConfigure; } +// optionalAttrs (args ? postConfigure) { inherit postConfigure; } +// optionalAttrs (args ? preBuild) { inherit preBuild; } +// optionalAttrs (args ? postBuild) { inherit postBuild; } +// optionalAttrs (args ? doBenchmark) { inherit doBenchmark; } +// optionalAttrs (args ? checkPhase) { inherit checkPhase; } +// optionalAttrs (args ? preCheck) { inherit preCheck; } +// optionalAttrs (args ? postCheck) { inherit postCheck; } +// optionalAttrs (args ? preInstall) { inherit preInstall; } +// optionalAttrs (args ? installPhase) { inherit installPhase; } +// optionalAttrs (args ? postInstall) { inherit postInstall; } +// optionalAttrs (args ? preFixup) { inherit preFixup; } +// optionalAttrs (args ? postFixup) { inherit postFixup; } +// optionalAttrs (args ? dontStrip) { inherit dontStrip; } +// optionalAttrs (args ? hardeningDisable) { inherit hardeningDisable; } // optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) ) From eabbf3d88a00cf7a14993de82711ca8c8503b5b3 Mon Sep 17 00:00:00 2001 From: Luke Sandell Date: Fri, 17 Jul 2020 19:46:44 -0500 Subject: [PATCH 107/520] direwolf 1.4 -> 1.5 --- pkgs/applications/misc/direwolf/default.nix | 43 --------------- pkgs/applications/radio/direwolf/default.nix | 57 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 58 insertions(+), 44 deletions(-) delete mode 100644 pkgs/applications/misc/direwolf/default.nix create mode 100644 pkgs/applications/radio/direwolf/default.nix diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix deleted file mode 100644 index 623e6dc0fbe..00000000000 --- a/pkgs/applications/misc/direwolf/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchFromGitHub -, espeak, alsaLib, perl -, python }: - -with stdenv.lib; - -stdenv.mkDerivation rec { - pname = "direwolf"; - version = "1.4"; - - src = fetchFromGitHub { - owner = "wb2osz"; - repo = "direwolf"; - rev = version; - sha256 = "033sffjs2dz48077hc58jr4lxxs8md1fyfh4lig6ib7pyigiv1y0"; - }; - - buildInputs = [ - espeak perl python - ] ++ (optional stdenv.isLinux alsaLib); - - postPatch = '' - for i in Makefile.*; do - substituteInPlace "$i" \ - --replace /usr/share $out/share - done - - substituteInPlace dwespeak.sh \ - --replace espeak ${espeak}/bin/espeak - ''; - - preInstall = '' - mkdir -p $out/bin - ''; - installFlags = [ "INSTALLDIR=$(out)" ]; - - meta = { - description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; - homepage = "https://github.com/wb2osz/direwolf/"; - license = licenses.gpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix new file mode 100644 index 00000000000..aab76574968 --- /dev/null +++ b/pkgs/applications/radio/direwolf/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub +, alsaLib, espeak, glibc, gpsd +, hamlib, perl, python, udev }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + pname = "direwolf"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "wb2osz"; + repo = "direwolf"; + rev = version; + sha256 = "1w55dv9xqgc9mpincsj017838vmvdy972fhis3ddskyfvhhzgcsk"; + }; + + buildInputs = [ + espeak gpsd hamlib perl python + ] ++ (optionals stdenv.isLinux [alsaLib udev]); + + makeFlags = [ "DESTDIR=$(out)" ]; + + postPatch = '' + substituteInPlace symbols.c \ + --replace /usr/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt \ + --replace /opt/local/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt + substituteInPlace decode_aprs.c \ + --replace /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \ + --replace /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt + substituteInPlace dwespeak.sh \ + --replace espeak ${espeak}/bin/espeak + '' + (optionalString stdenv.isLinux '' + substituteInPlace Makefile.linux \ + --replace /usr/include/pthread.h ${stdenv.glibc.dev}/include/pthread.h \ + --replace /usr/include/alsa ${alsaLib.dev}/include/alsa \ + --replace /usr/include/gps.h ${gpsd}/include/gps.h \ + --replace /usr/include/hamlib ${hamlib}/include/hamlib \ + --replace /usr/include/libudev.h ${udev.dev}/include/libudev.h \ + --replace /etc/udev $out/etc/udev \ + --replace 'Exec=xterm -hold -title \"Dire Wolf\" -bg white -e \"$(DESTDIR)/bin/direwolf\"' "Exec=$out/bin/direwolf" \ + --replace '#Terminal=true' 'Terminal=true' \ + --replace 'Path=$(HOME)' '#Path=' + ''); + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = { + description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; + homepage = "https://github.com/wb2osz/direwolf/"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ lasandell ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index edc0c477ba1..10298ba4484 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19421,7 +19421,7 @@ in inherit (pkgs.gnome2) libart_lgpl libgnomeui; }; - direwolf = callPackage ../applications/misc/direwolf { }; + direwolf = callPackage ../applications/radio/direwolf { }; dirt = callPackage ../applications/audio/dirt {}; From ec82ae3c394600f79c2971ffca7b87a4f574cfea Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 12 Aug 2020 21:06:31 -0400 Subject: [PATCH 108/520] nixos/postgresql: run ExecStartPost as an unprivileged user --- nixos/doc/manual/release-notes/rl-2009.xml | 10 +++++++++- nixos/modules/services/databases/postgresql.nix | 13 +++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 85679e48272..71667c854bc 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -666,11 +666,19 @@ services.dokuwiki."mywiki" = { The option is now set to "/var/lib/postgresql/${cfg.package.psqlSchema}" regardless of your - . Users with an existing postgresql install that have a of 17.09 or below + . Users with an existing postgresql install that have a of 17.03 or below should double check what the value of their option is (/var/db/postgresql) and then explicitly set this value to maintain compatibility: services.postgresql.dataDir = "/var/db/postgresql"; + + + + The postgresql module now expects there to be a database super user account called postgres regardless of your . Users + with an existing postgresql install that have a of 17.03 or below should run the following SQL statements as a + database super admin user before upgrading: + +CREATE ROLE postgres LOGIN SUPERUSER; diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 3e16b5907dd..2bb2ba73996 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -225,14 +225,15 @@ in Contents of the recovery.conf file. ''; }; + superUser = mkOption { type = types.str; - default= if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root"; + default = "postgres"; internal = true; + readOnly = true; description = '' - NixOS traditionally used 'root' as superuser, most other distros use 'postgres'. - From 17.09 we also try to follow this standard. Internal since changing this value - would lead to breakage while setting up databases. + PostgreSQL superuser account to use for various operations. Internal since changing + this value would lead to breakage while setting up databases. ''; }; }; @@ -336,7 +337,7 @@ in setupScript = pkgs.writeScript "postgresql-setup" ('' #!${pkgs.runtimeShell} -e - PSQL="${pkgs.utillinux}/bin/runuser -u ${cfg.superUser} -- psql --port=${toString cfg.port}" + PSQL="psql --port=${toString cfg.port}" while ! $PSQL -d postgres -c "" 2> /dev/null; do if ! kill -0 "$MAINPID"; then exit 1; fi @@ -362,7 +363,7 @@ in '') cfg.ensureUsers} ''); in - "+${setupScript}"; + "${setupScript}"; } (mkIf (cfg.dataDir == "/var/lib/postgresql/${cfg.package.psqlSchema}") { StateDirectory = "postgresql postgresql/${cfg.package.psqlSchema}"; From 8e045b42fd90d8934ecf73977befc894b6171b78 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 12 Aug 2020 21:12:24 -0400 Subject: [PATCH 109/520] nixos/postgresql: move ExecStartPost into postStart --- .../modules/services/databases/postgresql.nix | 63 +++++++++---------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 2bb2ba73996..c726a08e34f 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -311,6 +311,35 @@ in ''} ''; + # Wait for PostgreSQL to be ready to accept connections. + postStart = + '' + PSQL="psql --port=${toString cfg.port}" + + while ! $PSQL -d postgres -c "" 2> /dev/null; do + if ! kill -0 "$MAINPID"; then exit 1; fi + sleep 0.1 + done + + if test -e "${cfg.dataDir}/.first_startup"; then + ${optionalString (cfg.initialScript != null) '' + $PSQL -f "${cfg.initialScript}" -d postgres + ''} + rm -f "${cfg.dataDir}/.first_startup" + fi + '' + optionalString (cfg.ensureDatabases != []) '' + ${concatMapStrings (database: '' + $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"' + '') cfg.ensureDatabases} + '' + '' + ${concatMapStrings (user: '' + $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"' + ${concatStringsSep "\n" (mapAttrsToList (database: permission: '' + $PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"' + '') user.ensurePermissions)} + '') cfg.ensureUsers} + ''; + serviceConfig = mkMerge [ { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = "postgres"; @@ -330,40 +359,6 @@ in TimeoutSec = 120; ExecStart = "${postgresql}/bin/postgres"; - - # Wait for PostgreSQL to be ready to accept connections. - ExecStartPost = - let - setupScript = pkgs.writeScript "postgresql-setup" ('' - #!${pkgs.runtimeShell} -e - - PSQL="psql --port=${toString cfg.port}" - - while ! $PSQL -d postgres -c "" 2> /dev/null; do - if ! kill -0 "$MAINPID"; then exit 1; fi - sleep 0.1 - done - - if test -e "${cfg.dataDir}/.first_startup"; then - ${optionalString (cfg.initialScript != null) '' - $PSQL -f "${cfg.initialScript}" -d postgres - ''} - rm -f "${cfg.dataDir}/.first_startup" - fi - '' + optionalString (cfg.ensureDatabases != []) '' - ${concatMapStrings (database: '' - $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"' - '') cfg.ensureDatabases} - '' + '' - ${concatMapStrings (user: '' - $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"' - ${concatStringsSep "\n" (mapAttrsToList (database: permission: '' - $PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"' - '') user.ensurePermissions)} - '') cfg.ensureUsers} - ''); - in - "${setupScript}"; } (mkIf (cfg.dataDir == "/var/lib/postgresql/${cfg.package.psqlSchema}") { StateDirectory = "postgresql postgresql/${cfg.package.psqlSchema}"; From 3ede6200428d534b5ec46a9a979e4dfdaa1fadd7 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 17 Jul 2020 16:01:33 +0200 Subject: [PATCH 110/520] camlp4: fix build with spacetime --- pkgs/development/tools/ocaml/camlp4/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index ea1b3965098..73228655cca 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { dontAddPrefix = true; preConfigure = '' + # increase stack space for spacetime variant of the compiler + # https://github.com/ocaml/ocaml/issues/7435 + # but disallowed by darwin sandbox + ulimit -s unlimited || true + configureFlagsArray=( --bindir=$out/bin --libdir=$out/lib/ocaml/${ocaml.version}/site-lib From bc47c4c270225b07ffdc9db8ae70c48c672f2079 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Aug 2020 02:46:24 +0000 Subject: [PATCH 111/520] psrecord: 1.1 -> 1.2 --- pkgs/tools/misc/psrecord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/psrecord/default.nix b/pkgs/tools/misc/psrecord/default.nix index 7df2b47497f..728314e6e76 100644 --- a/pkgs/tools/misc/psrecord/default.nix +++ b/pkgs/tools/misc/psrecord/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonApplication, fetchPypi, psutil, matplotlib, pytest }: buildPythonApplication rec { pname = "psrecord"; - version = "1.1"; + version = "1.2"; src = fetchPypi { inherit pname version; - sha256 = "151rynca97v5wq1drl2yfrqmqil1km72cizn3159c2ip14626mp6"; + sha256 = "5d48410e543b71e5dc4677705acc2a753db65814d3ccbdfbca8d5d3a09b053b1"; }; propagatedBuildInputs = [ From 5de9260b281879696d90371e9ae05e336f5c5a34 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Aug 2020 05:56:27 +0000 Subject: [PATCH 112/520] postman: 7.26.0 -> 7.30.1 --- pkgs/development/web/postman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 854ca5e04e5..5200cb933ca 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.26.0"; + version = "7.30.1"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "05xs389bf0127n8rdivbfxvgjvlrk9pyr74klswwlksxciv74i3j"; + sha256 = "18bphn5m42z9x0igafd259q7i88qn7wcxvvhdjv9ldnvmhf1k935"; name = "${pname}.tar.gz"; }; From 22abe3202fb76b9640d0308a805e212e8c6eeab8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 15 Aug 2020 21:45:34 +0300 Subject: [PATCH 113/520] nixos/transmission: handle watch-dir as incomplete-dir `watch-dir` was neglected after #92106 - this change makes using this setting work. --- .../modules/services/torrent/transmission.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 92df46083ec..e0d116ff8e4 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -11,6 +11,7 @@ let settingsDir = ".config/transmission-daemon"; downloadsDir = "Downloads"; incompleteDir = ".incomplete"; + watchDir = "watchdir"; # TODO: switch to configGen.json once RFC0042 is implemented settingsFile = pkgs.writeText "settings.json" (builtins.toJSON cfg.settings); in @@ -35,6 +36,8 @@ in download-dir = "${cfg.home}/${downloadsDir}"; incomplete-dir = "${cfg.home}/${incompleteDir}"; incomplete-dir-enabled = true; + watch-dir = "${cfg.home}/${watchDir}"; + watch-dir-enabled = false; message-level = 1; peer-port = 51413; peer-port-random-high = 65535; @@ -161,6 +164,9 @@ in { assertion = types.path.check cfg.settings.incomplete-dir; message = "`services.transmission.settings.incomplete-dir' must be an absolute path."; } + { assertion = types.path.check cfg.settings.watch-dir; + message = "`services.transmission.settings.watch-dir' must be an absolute path."; + } { assertion = cfg.settings.script-torrent-done-filename == "" || types.path.check cfg.settings.script-torrent-done-filename; message = "`services.transmission.settings.script-torrent-done-filename' must be an absolute path."; } @@ -220,7 +226,11 @@ in cfg.settings.download-dir ] ++ optional cfg.settings.incomplete-dir-enabled - cfg.settings.incomplete-dir; + cfg.settings.incomplete-dir + ++ + optional cfg.settings.watch-dir-enabled + cfg.settings.watch-dir + ; BindReadOnlyPaths = [ # No confinement done of /nix/store here like in systemd-confinement.nix, # an AppArmor profile is provided to get a confinement based upon paths and rights. @@ -410,11 +420,17 @@ in ${optionalString cfg.settings.incomplete-dir-enabled '' rw ${cfg.settings.incomplete-dir}/**, ''} + ${optionalString cfg.settings.watch-dir-enabled '' + rw ${cfg.settings.watch-dir}/**, + ''} profile dirs { rw ${cfg.settings.download-dir}/**, ${optionalString cfg.settings.incomplete-dir-enabled '' rw ${cfg.settings.incomplete-dir}/**, ''} + ${optionalString cfg.settings.watch-dir-enabled '' + rw ${cfg.settings.watch-dir}/**, + ''} } ${optionalString (cfg.settings.script-torrent-done-enabled && From 4cfcd2f9be558fe8baddd834628c46b47a6dc64d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 16 Aug 2020 13:13:17 +0200 Subject: [PATCH 114/520] binwalk-full: add matplotlib module This is used for visual entropy graphing (`-E` argument) --- pkgs/development/python-modules/binwalk/default.nix | 5 +++-- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index d31113b9214..0970cc18249 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -12,12 +12,13 @@ , cramfsprogs , cramfsswap , lzma +, matplotlib , nose , pycrypto , pyqtgraph ? null }: let - visualizationSupport = (pyqtgraph != null); + visualizationSupport = (pyqtgraph != null) && (matplotlib != null); version = "2.2.0"; in buildPythonPackage { @@ -32,7 +33,7 @@ buildPythonPackage { }; propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs lzma pycrypto ] - ++ stdenv.lib.optional visualizationSupport pyqtgraph; + ++ stdenv.lib.optionals visualizationSupport [ matplotlib pyqtgraph ]; # setup.py only installs version.py during install, not test postPatch = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ac616e62eb..2ea10df4a6e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2050,10 +2050,12 @@ in { binwalk = callPackage ../development/python-modules/binwalk { pyqtgraph = null; + matplotlib = null; }; binwalk-full = appendToName "full" (self.binwalk.override { pyqtgraph = self.pyqtgraph; + matplotlib = self.matplotlib; }); bitmath = callPackage ../development/python-modules/bitmath { }; From 4d15ee4ada780058e83b2e64d2eb041732952275 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 16 Aug 2020 20:50:44 +0900 Subject: [PATCH 115/520] spago: 0.15.3 -> 0.16.0 --- pkgs/development/haskell-modules/configuration-nix.nix | 6 +++--- pkgs/development/tools/purescript/spago/spago.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 7016192e91a..54737c90aae 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -655,16 +655,16 @@ self: super: builtins.intersectAttrs super { # This defines the version of the purescript-docs-search release we are using. # This is defined in the src/Spago/Prelude.hs file in the spago source. - docsSearchVersion = "v0.0.8"; + docsSearchVersion = "v0.0.10"; docsSearchAppJsFile = pkgs.fetchurl { url = "https://github.com/spacchetti/purescript-docs-search/releases/download/${docsSearchVersion}/docs-search-app.js"; - sha256 = "00pzi7pgjicpa0mg0al80gh2q1q2lqiyb3kjarpydlmn8dfjny7v"; + sha256 = "0m5ah29x290r0zk19hx2wix2djy7bs4plh9kvjz6bs9r45x25pa5"; }; purescriptDocsSearchFile = pkgs.fetchurl { url = "https://github.com/spacchetti/purescript-docs-search/releases/download/${docsSearchVersion}/purescript-docs-search"; - sha256 = "1hsi1hc4p1z2xbw82w2jxmmczw6mravli1r89vrkivb72sqdjya7"; + sha256 = "0wc1zyhli4m2yykc6i0crm048gyizxh7b81n8xc4yb7ibjqwhyj3"; }; spagoFixHpack = overrideCabal spagoWithOverrides (drv: { diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index 20a1f53f675..b36bc26433d 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -11,11 +11,11 @@ }: mkDerivation { pname = "spago"; - version = "0.15.3"; + version = "0.16.0"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "0spc7r531kmh9magaxzy4jls3bzfazwf8sq3qzk6f292d7ky6n8y"; - rev = "da6d91c19b23f06f3ede793f78599a6589c9e7cd"; + sha256 = "0z4s0z14n1v9wajs7mj2b295rrrw24gdca79drzlv6x1y6dj7sxh"; + rev = "71b093cdf5e48ded645303281ab4a3ea5b730f5d"; fetchSubmodules = true; }; isLibrary = true; From af017c431add62ddb6c02d85c1b81560573a0951 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 16 Aug 2020 13:47:49 +0200 Subject: [PATCH 116/520] haskellPackages.haskell-language-server: 0.2.0 -> 0.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While we are at it I: * Disable tests, because I can‘t keep up with the speed hls introduces more tests that cause trouble in nixpkgs. * Fix builds of fourmolu and retrie * Remove the wrapper for hls which is obsolete because of improved package detection in hie-bios. And added a note that this can be removed for ghcide soon, too. --- .../haskell-modules/configuration-common.nix | 51 ++++++------------- .../configuration-hackage2nix.yaml | 3 +- .../haskell-modules/configuration-nix.nix | 4 ++ .../haskell-modules/hackage-packages.nix | 37 ++++++++++++-- .../haskell-modules/with-packages-wrapper.nix | 5 +- .../haskell-language-server/default.nix | 35 ++++++------- .../haskell-language-server/hls-ghcide.nix | 24 ++++----- .../haskell/haskell-language-server/update.sh | 2 +- 8 files changed, 88 insertions(+), 73 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 47eb35627ef..b49a8122c6f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1323,41 +1323,22 @@ self: super: { # https://github.com/ennocramer/monad-dijkstra/issues/4 monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra); - # haskell-language-server uses its own fork of ghcide - # Test disabled: it seems to freeze (is it just that it takes a long time ?) - hls-ghcide = - dontCheck (( - overrideCabal super.hls-ghcide - (old: { - # The integration test run by lsp-test requires the executable to be in the PATH - preCheck = '' - export PATH=$PATH:dist/build/ghcide - ''; - })).override { - # we are faster than stack here - hie-bios = dontCheck self.hie-bios_0_6_2; - lsp-test = dontCheck self.lsp-test_0_11_0_4; - }); - - haskell-language-server = (overrideCabal super.haskell-language-server - (old: { - # The integration test run by lsp-test requires the executable to be in the PATH - preCheck = '' - export PATH=$PATH:dist/build/haskell-language-server - ''; - # The wrapper test does not work for now. - testTarget = "func-test"; - - # test needs the git tool - testToolDepends = old.testToolDepends - ++ [ pkgs.git ]; - })).override { - # use a fork of ghcide - ghcide = self.hls-ghcide; - # we are faster than stack here - hie-bios = dontCheck self.hie-bios_0_6_2; - lsp-test = dontCheck self.lsp-test_0_11_0_4; - }; + fourmolu = super.fourmolu.overrideScope (self: super: { + aeson = dontCheck self.aeson_1_5_2_0; + }); + # Tests disabled because they access /home + haskell-language-server = (dontCheck super.haskell-language-server).overrideScope (self: super: { + # haskell-language-server uses its own fork of ghcide + # Test disabled: it seems to freeze (is it just that it takes a long time ?) + ghcide = dontCheck super.hls-ghcide; + # we are faster than stack here + hie-bios = dontCheck self.hie-bios_0_6_2; + lsp-test = dontCheck self.lsp-test_0_11_0_4; + # fourmolu can‘t compile with an older aeson + aeson = dontCheck super.aeson_1_5_2_0; + # brittany has an aeson upper bound of 1.5 + brittany = doJailbreak super.brittany; + }); # https://github.com/kowainik/policeman/issues/57 policeman = doJailbreak super.policeman; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c76574cccee..6ce37bd138a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2540,6 +2540,7 @@ default-package-overrides: extra-packages: - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier + - aeson == 1.5.2.0 # needed for fourmolu 0.1.0.0, but 1.5.3 is to new for our purpose - aeson-pretty < 0.8 # required by elm compiler - Agda == 2.6.1 # allows the agdaPackage set to be fixed to this version so that it won't break when another agda version is released. - ansi-terminal == 0.10.3 # required by cabal-plan, and policeman in ghc-8.8.x @@ -5074,7 +5075,6 @@ broken-packages: - foscam-filename - foscam-sort - Foster - - fourmolu - fpco-api - fplll - fpnla-examples @@ -9165,7 +9165,6 @@ broken-packages: - rethinkdb-client-driver - rethinkdb-model - rethinkdb-wereHamster - - retrie - retryer - reverse-geocoding - reversi diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 7016192e91a..1da500c123e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -767,4 +767,8 @@ self: super: builtins.intersectAttrs super { postgresql-libpq-notify = dontCheck super.postgresql-libpq-notify; postgresql-pure = dontCheck super.postgresql-pure; + retrie = overrideCabal super.retrie (drv: { + testToolDepends = [ pkgs.git pkgs.mercurial ]; + }); + } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f2953705829..1d6965ffeef 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -23913,6 +23913,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson_1_5_2_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat + , base-compat-batteries, base-orphans, base16-bytestring + , bytestring, containers, deepseq, Diff, directory, dlist, filepath + , generic-deriving, ghc-prim, hashable, hashable-time + , integer-logarithms, primitive, QuickCheck, quickcheck-instances + , scientific, tagged, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-abstraction, these + , time, time-compat, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "aeson"; + version = "1.5.2.0"; + sha256 = "0awk3dss79mmcxpy147mijnd9icvlnm77bq248ibbbzx9y99hdfd"; + libraryHaskellDepends = [ + attoparsec base base-compat-batteries bytestring containers deepseq + dlist ghc-prim hashable primitive scientific tagged + template-haskell text th-abstraction these time time-compat + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans base16-bytestring + bytestring containers Diff directory dlist filepath + generic-deriving ghc-prim hashable hashable-time integer-logarithms + QuickCheck quickcheck-instances scientific tagged tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + these time time-compat unordered-containers uuid-types vector + ]; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson_1_5_3_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat , base-compat-batteries, base-orphans, base16-bytestring @@ -92164,8 +92197,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fpco-api" = callPackage @@ -215815,8 +215846,6 @@ self: { ]; description = "A powerful, easy-to-use codemodding tool for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "retry" = callPackage diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index a34af634e14..dc105c845d7 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -105,8 +105,9 @@ symlinkJoin { --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" fi - # ghcide and haskell-language-server do package discovery without calling our ghc wrapper. - for prg in ghcide haskell-language-server; do + # ghcide 0.2.0 does package discovery without calling our ghc wrapper. + # 2020-08-16 We can most likely remove this workaround as soon as we build ghcide with a newer hie-bios (currently we use 0.5.1 from stack) + for prg in ghcide; do if [[ -x "$out/bin/$prg" ]]; then wrapProgram $out/bin/$prg \ --set "NIX_${ghcCommandCaps}" "$out/bin/${ghcCommand}" \ diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix index 15f944e7133..9373b902dbd 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -1,30 +1,31 @@ { mkDerivation, aeson, base, binary, blaze-markup, brittany , bytestring, containers, data-default, deepseq, Diff, directory -, extra, fetchgit, filepath, floskell, ghc, ghc-paths, ghcide -, gitrev, hashable, haskell-lsp, haskell-lsp-types, hie-bios -, hslogger, hspec, hspec-core, hspec-expectations, lens, lsp-test -, optparse-applicative, optparse-simple, ormolu, process -, regex-tdfa, safe-exceptions, shake, stdenv, stm, stylish-haskell -, tasty, tasty-ant-xml, tasty-expected-failure, tasty-golden -, tasty-hunit, tasty-rerun, temporary, text, time, transformers -, unix, unordered-containers, yaml +, extra, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th +, ghc-paths, ghcide, gitrev, hashable, haskell-lsp +, haskell-lsp-types, hie-bios, hslogger, hspec, hspec-core, lens +, lsp-test, optparse-applicative, optparse-simple, ormolu, process +, regex-tdfa, retrie, safe-exceptions, shake, stdenv, stm +, stylish-haskell, tasty, tasty-ant-xml, tasty-expected-failure +, tasty-golden, tasty-hunit, tasty-rerun, temporary, text, time +, transformers, unix, unordered-containers, yaml }: mkDerivation { pname = "haskell-language-server"; - version = "0.2.2.0"; + version = "0.3.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0g9g2gyb0fidx16l741ky12djxh4cid9akvxa48105iq1gdihd8l"; - rev = "12c0e4423263140e3d16e76681927ec69fe4929f"; + sha256 = "0gh3sgy6a08d8d3q6r2qn5r817ilzka2qkp0g0y6wsx7rjwag0yx"; + rev = "23dda97f583e8ff39993b89c01bbd1ac24187605"; fetchSubmodules = true; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary brittany bytestring containers data-default - deepseq Diff directory extra filepath floskell ghc ghcide gitrev - hashable haskell-lsp hie-bios hslogger lens optparse-simple ormolu - process regex-tdfa shake stylish-haskell temporary text time + deepseq Diff directory extra filepath floskell fourmolu ghc + ghc-boot-th ghcide gitrev hashable haskell-lsp hie-bios hslogger + lens optparse-simple ormolu process regex-tdfa retrie + safe-exceptions shake stylish-haskell temporary text time transformers unix unordered-containers ]; executableHaskellDepends = [ @@ -36,9 +37,9 @@ mkDerivation { testHaskellDepends = [ aeson base blaze-markup bytestring containers data-default directory filepath haskell-lsp haskell-lsp-types hie-bios hslogger - hspec hspec-core hspec-expectations lens lsp-test process stm tasty - tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit - tasty-rerun temporary text transformers unordered-containers yaml + hspec hspec-core lens lsp-test process stm tasty tasty-ant-xml + tasty-expected-failure tasty-golden tasty-hunit tasty-rerun + temporary text transformers unordered-containers yaml ]; testToolDepends = [ ghcide ]; homepage = "https://github.com/haskell/haskell-language-server#readme"; diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix index cafe01946a6..98f1b0c494c 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix @@ -7,7 +7,7 @@ , hie-bios, hslogger, lens, lsp-test, mtl, network-uri , opentelemetry, optparse-applicative, prettyprinter , prettyprinter-ansi-terminal, process, QuickCheck -, quickcheck-instances, regex-tdfa, rope-utf16-splay +, quickcheck-instances, regex-tdfa, rope-utf16-splay, safe , safe-exceptions, shake, sorted-list, stdenv, stm, syb, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck , tasty-rerun, text, time, transformers, unix, unordered-containers @@ -17,9 +17,9 @@ mkDerivation { pname = "ghcide"; version = "0.2.0"; src = fetchgit { - url = "https://github.com/bubba/ghcide"; - sha256 = "1kj2i86mkaxgxlrbmv2d24mch7hywgcy2n61z8paj21chncs1j5w"; - rev = "7e895cfa53260b41996df707baec496a8f2c75dc"; + url = "https://github.com/wz1000/ghcide"; + sha256 = "1zq7ngaak8il91a309rl51dghzasnk4m2sm3av6d93cyqyra1hfc"; + rev = "078e3d3c0d319f83841ccbcdc60ff5f0e243f6be"; fetchSubmodules = true; }; isLibrary = true; @@ -30,23 +30,23 @@ mkDerivation { filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths haddock-library hashable haskell-lsp haskell-lsp-types hie-bios hslogger mtl network-uri opentelemetry prettyprinter - prettyprinter-ansi-terminal regex-tdfa rope-utf16-splay + prettyprinter-ansi-terminal regex-tdfa rope-utf16-splay safe safe-exceptions shake sorted-list stm syb text time transformers unix unordered-containers utf8-string ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios - lsp-test optparse-applicative process safe-exceptions text + lens lsp-test optparse-applicative process safe-exceptions text unordered-containers ]; testHaskellDepends = [ - aeson base bytestring containers directory extra filepath ghc - ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types - lens lsp-test network-uri optparse-applicative process QuickCheck - quickcheck-instances rope-utf16-splay safe-exceptions shake tasty - tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun - text + aeson base binary bytestring containers directory extra filepath + ghc ghc-typelits-knownnat haddock-library haskell-lsp + haskell-lsp-types lens lsp-test network-uri optparse-applicative + process QuickCheck quickcheck-instances rope-utf16-splay safe + safe-exceptions shake tasty tasty-expected-failure tasty-hunit + tasty-quickcheck tasty-rerun text ]; benchmarkHaskellDepends = [ aeson base Chart Chart-diagrams diagrams diagrams-svg directory diff --git a/pkgs/development/tools/haskell/haskell-language-server/update.sh b/pkgs/development/tools/haskell/haskell-language-server/update.sh index 6cf29968338..498859843c4 100755 --- a/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ b/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -29,7 +29,7 @@ ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell echo "Updating haskell-language-server from old version $ghcide_old_version to new version $ghcide_new_version." echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..." -cabal2nix --revision "$ghcide_new_version" "https://github.com/bubba/ghcide" > "$ghcide_derivation_file" +cabal2nix --revision "$ghcide_new_version" "https://github.com/wz1000/ghcide" > "$ghcide_derivation_file" # =========================== From 966c2ed234d5468d322efeedd58e75ffb49104ac Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 16 Aug 2020 15:18:25 +0200 Subject: [PATCH 117/520] xxe-pe: init at 9.4.0 Add a proprietary DocBook editor free for personal use. https://www.xmlmind.com/xmleditor/ --- pkgs/applications/editors/xxe-pe/default.nix | 77 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/applications/editors/xxe-pe/default.nix diff --git a/pkgs/applications/editors/xxe-pe/default.nix b/pkgs/applications/editors/xxe-pe/default.nix new file mode 100644 index 00000000000..e7cfe6284e3 --- /dev/null +++ b/pkgs/applications/editors/xxe-pe/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, fetchurl +, lib +, unzip +, makeWrapper +, openjdk11 +, makeDesktopItem +, icoutils +, config +, acceptLicense ? config.xxe-pe.acceptLicense or false +}: + +let + pkg_path = "$out/lib/xxe"; + + desktopItem = makeDesktopItem { + name = "XMLmind XML Editor Personal Edition"; + exec = "xxe"; + icon = "xxe"; + desktopName = "xxe"; + genericName = "XML Editor"; + categories = "Development;IDE;TextEditor;Java"; + }; +in +stdenv.mkDerivation rec { + pname = "xxe-pe"; + version = "9.4.0"; + + src = + assert !acceptLicense -> throw '' + You must accept the XMLmind XML Editor Personal Edition License at + https://www.xmlmind.com/xmleditor/license_xxe_perso.html + by setting nixpkgs config option `xxe-pe.acceptLicense = true;` + or by using `xxe-pe.override { acceptLicense = true; }` package. + ''; + fetchurl { + url = "https://www.xmlmind.com/xmleditor/_download/xxe-perso-${builtins.replaceStrings [ "." ] [ "_" ] version}.zip"; + sha256 = "FKPdf9cOpgm/WG2i8bFnR6MmEifpiq5ykw2zHA8HnT8="; + }; + + nativeBuildInputs = [ + unzip + makeWrapper + icoutils + ]; + + dontStrip = true; + + installPhase = '' + mkdir -p "${pkg_path}" + mkdir -p "${pkg_path}" "$out/share/applications" + cp -a * "${pkg_path}" + ln -s ${desktopItem}/share/applications/* $out/share/applications + + icotool -x "${pkg_path}/bin/icon/xxe.ico" + ls + for f in xxe_*.png; do + res=$(basename "$f" ".png" | cut -d"_" -f3 | cut -d"x" -f1-2) + mkdir -pv "$out/share/icons/hicolor/$res/apps" + mv "$f" "$out/share/icons/hicolor/$res/apps/xxe.png" + done; + ''; + + postFixup = '' + mkdir -p "$out/bin" + makeWrapper "${pkg_path}/bin/xxe" "$out/bin/xxe" \ + --prefix PATH : ${lib.makeBinPath [ openjdk11 ]} + ''; + + meta = with lib; { + description = "Strictly validating, near WYSIWYG, XML editor with DocBook support"; + homepage = "https://www.xmlmind.com/xmleditor/"; + license = licenses.unfree; + maintainers = [ maintainers.jtojnar ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10227d8ff10..1db04c79ad1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11433,6 +11433,8 @@ in xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { }; + xxe-pe = callPackage ../applications/editors/xxe-pe { }; + xxdiff-tip = xxdiff; yaml2json = callPackage ../development/tools/yaml2json { }; From 6a71fd341dc416abcbec829b2ce0ccff94e2f6ff Mon Sep 17 00:00:00 2001 From: Noah Hendrickson Date: Sat, 15 Aug 2020 00:31:02 -0400 Subject: [PATCH 118/520] jellyfin: 10.5.5 -> 10.6.2 Added jellyfin_10_5 package as well to be used for the module in nixos versions < 20.09 --- pkgs/servers/jellyfin/10.5.x.nix | 61 +++++++++++++++++++++++++++++++ pkgs/servers/jellyfin/default.nix | 9 ++--- pkgs/top-level/all-packages.nix | 2 + 3 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 pkgs/servers/jellyfin/10.5.x.nix diff --git a/pkgs/servers/jellyfin/10.5.x.nix b/pkgs/servers/jellyfin/10.5.x.nix new file mode 100644 index 00000000000..17903871c8d --- /dev/null +++ b/pkgs/servers/jellyfin/10.5.x.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnetCorePackages, ffmpeg, + fontconfig, freetype, nixosTests }: + +let + os = if stdenv.isDarwin then "osx" else "linux"; + arch = + with stdenv.hostPlatform; + if isx86_32 then "x86" + else if isx86_64 then "x64" + else if isAarch32 then "arm" + else if isAarch64 then "arm64" + else lib.warn "Unsupported architecture, some image processing features might be unavailable" "unknown"; + musl = lib.optionalString stdenv.hostPlatform.isMusl + (if (arch != "x64") + then lib.warn "Some image processing features might be unavailable for non x86-64 with Musl" "musl-" + else "musl-"); + runtimeDir = "${os}-${musl}${arch}"; + +in stdenv.mkDerivation rec { + pname = "jellyfin"; + version = "10.5.5"; + + # Impossible to build anything offline with dotnet + src = fetchurl { + url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; + sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27"; + }; + + buildInputs = [ + unzip + makeWrapper + ]; + + propagatedBuildInputs = [ + dotnetCorePackages.aspnetcore_3_1 + sqlite + ]; + + preferLocalBuild = true; + + installPhase = '' + install -dm 755 "$out/opt/jellyfin" + cp -r * "$out/opt/jellyfin" + makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + sqlite fontconfig freetype stdenv.cc.cc.lib + ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \ + --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg" + ''; + + passthru.tests = { + smoke-test = nixosTests.jellyfin; + }; + + meta = with stdenv.lib; { + description = "The Free Software Media System"; + homepage = "https://jellyfin.org/"; + license = licenses.gpl2; + maintainers = with maintainers; [ nyanloutre minijackson ]; + }; +} diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 35476db9215..9194681d63b 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.5.5"; + version = "10.6.2"; # Impossible to build anything offline with dotnet src = fetchurl { - url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27"; + url = "https://repo.jellyfin.org/releases/server/portable/stable/combined/jellyfin_${version}.tar.gz"; + sha256 = "16yib2k9adch784p6p0whgfb6lrjzwiigg1n14cp88dx64hyhxhb"; }; buildInputs = [ @@ -41,7 +41,6 @@ in stdenv.mkDerivation rec { installPhase = '' install -dm 755 "$out/opt/jellyfin" cp -r * "$out/opt/jellyfin" - makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ sqlite fontconfig freetype stdenv.cc.cc.lib @@ -55,7 +54,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Free Software Media System"; - homepage = "https://jellyfin.github.io/"; + homepage = "https://jellyfin.org/"; license = licenses.gpl2; maintainers = with maintainers; [ nyanloutre minijackson ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d17fc299b4..11778dbf6ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2021,6 +2021,8 @@ in jellyfin = callPackage ../servers/jellyfin { }; + jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { }; + jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; jotta-cli = callPackage ../applications/misc/jotta-cli { }; From ce9f0c42f9b0899d6cf80ce9781ab8b3cc8bab01 Mon Sep 17 00:00:00 2001 From: Noah Hendrickson Date: Sun, 16 Aug 2020 11:41:41 -0400 Subject: [PATCH 119/520] nixos/jellyfin: added a package option to the options section, defaults to using the default jellyfin package if nixos version is 20.09 or greater, otherwise will default to using the new jellyfin_10_5 derivation for older systems. --- nixos/modules/services/misc/jellyfin.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix index 6ecdfb57dc3..0493dadea94 100644 --- a/nixos/modules/services/misc/jellyfin.nix +++ b/nixos/modules/services/misc/jellyfin.nix @@ -16,6 +16,14 @@ in description = "User account under which Jellyfin runs."; }; + package = mkOption { + type = types.package; + example = literalExample "pkgs.jellyfin"; + description = '' + Jellyfin package to use. + ''; + }; + group = mkOption { type = types.str; default = "jellyfin"; @@ -35,11 +43,16 @@ in Group = cfg.group; StateDirectory = "jellyfin"; CacheDirectory = "jellyfin"; - ExecStart = "${pkgs.jellyfin}/bin/jellyfin --datadir '/var/lib/${StateDirectory}' --cachedir '/var/cache/${CacheDirectory}'"; + ExecStart = "${cfg.package}/bin/jellyfin --datadir '/var/lib/${StateDirectory}' --cachedir '/var/cache/${CacheDirectory}'"; Restart = "on-failure"; }; }; + services.jellyfin.package = mkDefault ( + if versionAtLeast config.system.stateVersion "20.09" then pkgs.jellyfin + else pkgs.jellyfin_10_5 + ); + users.users = mkIf (cfg.user == "jellyfin") { jellyfin = { group = cfg.group; From 8e95e3f60749e853e68dd6f83b8672df6a21d4c9 Mon Sep 17 00:00:00 2001 From: sonowz Date: Mon, 17 Aug 2020 01:09:38 +0900 Subject: [PATCH 120/520] haskellPackages.ihaskell-*: unbreak --- .../haskell-modules/configuration-hackage2nix.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c76574cccee..53b8f453efb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6702,20 +6702,8 @@ broken-packages: - ignore - igraph - igrf - - ihaskell - - ihaskell-aeson - ihaskell-basic - - ihaskell-blaze - - ihaskell-charts - - ihaskell-diagrams - ihaskell-display - - ihaskell-gnuplot - - ihaskell-graphviz - - ihaskell-hatex - - ihaskell-hvega - - ihaskell-inline-r - - ihaskell-juicypixels - - ihaskell-magic - ihaskell-parsec - ihaskell-plot - ihaskell-rlangqq From c123e2157deb2e05c894e096c31176f4dfaba936 Mon Sep 17 00:00:00 2001 From: Sage Raflik Date: Tue, 28 Jul 2020 12:48:04 -0500 Subject: [PATCH 121/520] xmenu: init at 4.3.1 --- pkgs/applications/misc/xmenu/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/xmenu/default.nix diff --git a/pkgs/applications/misc/xmenu/default.nix b/pkgs/applications/misc/xmenu/default.nix new file mode 100644 index 00000000000..0904d1d048f --- /dev/null +++ b/pkgs/applications/misc/xmenu/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, imlib2, libX11, libXft, libXinerama }: + +stdenv.mkDerivation rec { + pname = "xmenu"; + version = "4.3.1"; + + src = fetchFromGitHub { + owner = "phillbush"; + repo = "xmenu"; + rev = "v${version}"; + sha256 = "0m97w1nwak5drcxxlyisqb73fxkapy2rlph9mg531kbx3k2h30r1"; + }; + + buildInputs = [ imlib2 libX11 libXft libXinerama ]; + + postPatch = "sed -i \"s:/usr/local:$out:\" config.mk"; + + meta = with stdenv.lib; { + description = "XMenu is a menu utility for X"; + homepage = "https://github.com/phillbush/xmenu"; + license = licenses.publicDomain; + maintainers = with maintainers; [ neonfuz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad6caac3e17..5019dbb4ab1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23836,6 +23836,8 @@ in xmacro = callPackage ../tools/X11/xmacro { }; + xmenu = callPackage ../applications/misc/xmenu { }; + xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { }; xmp = callPackage ../applications/audio/xmp { }; From c2923311e4cd0d8e515b0ebe990694f4d4271869 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 16 Aug 2020 20:33:47 +0200 Subject: [PATCH 122/520] haskellPackages.hls-ghcide: Fix hydra-build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rearrange the scope override of the haskell-language-server in a way that intermediate packages don‘t cause build fails on hydra. --- .../haskell-modules/configuration-common.nix | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b49a8122c6f..30053675fca 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1323,23 +1323,6 @@ self: super: { # https://github.com/ennocramer/monad-dijkstra/issues/4 monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra); - fourmolu = super.fourmolu.overrideScope (self: super: { - aeson = dontCheck self.aeson_1_5_2_0; - }); - # Tests disabled because they access /home - haskell-language-server = (dontCheck super.haskell-language-server).overrideScope (self: super: { - # haskell-language-server uses its own fork of ghcide - # Test disabled: it seems to freeze (is it just that it takes a long time ?) - ghcide = dontCheck super.hls-ghcide; - # we are faster than stack here - hie-bios = dontCheck self.hie-bios_0_6_2; - lsp-test = dontCheck self.lsp-test_0_11_0_4; - # fourmolu can‘t compile with an older aeson - aeson = dontCheck super.aeson_1_5_2_0; - # brittany has an aeson upper bound of 1.5 - brittany = doJailbreak super.brittany; - }); - # https://github.com/kowainik/policeman/issues/57 policeman = doJailbreak super.policeman; @@ -1450,4 +1433,24 @@ self: super: { # https://github.com/bos/statistics/issues/170 statistics = dontCheck super.statistics; -} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super + # INSERT NEW OVERRIDES ABOVE THIS LINE + +} // (let + hlsScopeOverride = self: super: { + # haskell-language-server uses its own fork of ghcide + # Test disabled: it seems to freeze (is it just that it takes a long time ?) + ghcide = dontCheck self.hls-ghcide; + # we are faster than stack here + hie-bios = dontCheck self.hie-bios_0_6_2; + lsp-test = dontCheck self.lsp-test_0_11_0_4; + # fourmolu can‘t compile with an older aeson + aeson = dontCheck super.aeson_1_5_2_0; + # brittany has an aeson upper bound of 1.5 + brittany = doJailbreak super.brittany; + }; +in { + haskell-language-server = dontCheck (super.haskell-language-server.overrideScope hlsScopeOverride); + hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride); + fourmolu = super.fourmolu.overrideScope hlsScopeOverride; +} +) // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From f1922cdbdc608b1f1f85a1d80310b54e89d0e9f3 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 16 Aug 2020 20:48:03 +0200 Subject: [PATCH 123/520] smartmontools: fix missing hostname in notifications This properly registers some missing dependencies of smartd_warning.sh. --- nixos/modules/services/monitoring/smartd.nix | 4 ---- pkgs/tools/system/smartmontools/default.nix | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index a3612be3cc2..2cc9f043cf0 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -239,11 +239,7 @@ in systemd.services.smartd = { description = "S.M.A.R.T. Daemon"; - wantedBy = [ "multi-user.target" ]; - - path = [ pkgs.nettools ]; # for hostname and dnsdomanname calls in smartd - serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}"; }; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index f4941df8ebd..5d9196fcc16 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, autoreconfHook +, mailutils, inetutils , IOKit ? null , ApplicationServices ? null }: let @@ -24,6 +25,10 @@ in stdenv.mkDerivation rec { patches = [ ./smartmontools.patch ]; postPatch = "cp -v ${driverdb} drivedb.h"; + configureFlags = [ + "--with-scriptpath=${stdenv.lib.makeBinPath [ mailutils inetutils ]}" + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]; enableParallelBuilding = true; From ea37c9caa1a07d1cc1d4fa915959e14d77594238 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 16 Aug 2020 20:48:42 +0200 Subject: [PATCH 124/520] smartmontools: use standard subject in notification emails This makes the notification script use the subject generated by smartmontools itself both for consistency with other distros and to include the hostname. --- nixos/modules/services/monitoring/smartd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index 2cc9f043cf0..c72b4abfcdc 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -20,7 +20,7 @@ let ${pkgs.coreutils}/bin/cat << EOF From: smartd on ${host} <${nm.sender}> To: undisclosed-recipients:; - Subject: SMART error on $SMARTD_DEVICESTRING: $SMARTD_FAILTYPE + Subject: $SMARTD_SUBJECT $SMARTD_FULLMESSAGE EOF From 66526604cf114b406b2d3e7b78022c71e5fd0158 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Aug 2020 02:30:31 +0200 Subject: [PATCH 125/520] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-13-g52041eb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/843fc8da5b3f7b509fd11e6ced3bb133676f9f91. --- .../haskell-modules/hackage-packages.nix | 484 ++++++++++++++---- 1 file changed, 372 insertions(+), 112 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1d6965ffeef..849ade07d3c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -13056,6 +13056,31 @@ self: { broken = true; }) {}; + "MIP" = callPackage + ({ mkDerivation, base, bytestring, bytestring-encoding + , case-insensitive, containers, data-default-class, extended-reals + , filepath, intern, lattices, megaparsec, mtl, OptDir, process + , scientific, stm, tasty, tasty-hunit, tasty-quickcheck, tasty-th + , temporary, text, xml-conduit, zlib + }: + mkDerivation { + pname = "MIP"; + version = "0.1.0.0"; + sha256 = "0790jcwqjd33i8sqhzxarda8ihhv5iapj0apjmlqjppbipwa6awa"; + libraryHaskellDepends = [ + base bytestring bytestring-encoding case-insensitive containers + data-default-class extended-reals filepath intern lattices + megaparsec mtl OptDir process scientific stm temporary text + xml-conduit zlib + ]; + testHaskellDepends = [ + base containers data-default-class lattices tasty tasty-hunit + tasty-quickcheck tasty-th + ]; + description = "Library for using Mixed Integer Programming (MIP)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "MSQueue" = callPackage ({ mkDerivation, base, ghc-prim, monad-loops, ref-mtl, stm }: mkDerivation { @@ -34871,6 +34896,8 @@ self: { pname = "aura"; version = "3.1.7"; sha256 = "0w7m65bh38gdq186b16pcnq7k2nakiy749m7z092cv4k5w72gal5"; + revision = "1"; + editedCabalFile = "1g8hm1bd4yssmy1qkarnwd8w2wz8c2m02gk1agh3pyv60f9q66s7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38894,8 +38921,8 @@ self: { pname = "bench"; version = "1.0.12"; sha256 = "1sy97qpv6paar2d5syppk6lc06wjx6qyz5aidsmh30jq853nydx6"; - revision = "1"; - editedCabalFile = "0sk6vkjwk7g1diwah67ifj7s69qvwi52ngaijkfx5prn0vz24ldn"; + revision = "2"; + editedCabalFile = "055482m81h7pijiszdkk2k65p208i3c3pxs955pv6h0gwrialcsh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -47877,8 +47904,8 @@ self: { pname = "cabal-flatpak"; version = "0.1.0.2"; sha256 = "1h7yklhqrsgxk841fryxz0sk03zb02p34g1nvwdz6c6mfpwc8y54"; - revision = "1"; - editedCabalFile = "0ba63swfx2xd6aw2iq1nkrl9932hvkn3lf7x74wqimcykm4vbws7"; + revision = "2"; + editedCabalFile = "0mf387hkxshcbss739c66j0hc1143r9lns3p3aw1l76as9lbdlwj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -72039,8 +72066,8 @@ self: { pname = "dhall"; version = "1.34.0"; sha256 = "0rqvzvcqbhs9gvga7api6jjblnypm4a33z8kxi578ps63mhn3g0d"; - revision = "1"; - editedCabalFile = "0d5rqjalz6clvbmnqmpsy4dl9zj1magwmd1gdl2vzkf5qnhp6n7r"; + revision = "2"; + editedCabalFile = "1gvfcizp3blqas5ccgnqmahwq26xwd23kqh1vc9712agq7384z98"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -72150,6 +72177,8 @@ self: { pname = "dhall-docs"; version = "1.0.0"; sha256 = "0kfn3nr0g4x5bpdrkg5lh8qma2536k3gx7bvrsrkn53lyyxnbnvi"; + revision = "1"; + editedCabalFile = "1g4mmf6276rndzq95s41qmj7vfmpabmnnv4v077vgrsravqqyrlb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -72246,8 +72275,8 @@ self: { pname = "dhall-json"; version = "1.7.1"; sha256 = "158c9vhxa124r1xqn365wvwqhby5rngkip08ghy8rnjs5ijcxzgf"; - revision = "2"; - editedCabalFile = "12piijva2szd08c6pgr6qca4kmf48il8934iv0k51jfyfd1m01ic"; + revision = "3"; + editedCabalFile = "1xxc1nsg86y2qzl4ln4jhlqw118bijyakr0mnyz801ap1ffgqfmb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72380,6 +72409,8 @@ self: { pname = "dhall-nixpkgs"; version = "1.0.0"; sha256 = "1bymafh0p0avfsdpcijj76075pgkn81sf6f3y17m7p0lmp8hhh75"; + revision = "1"; + editedCabalFile = "0zg6rcjs96xh060k56p0y2rvwkb17pqd8qa52b2yalx5b7k70gys"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -72482,8 +72513,8 @@ self: { pname = "dhall-yaml"; version = "1.2.1"; sha256 = "18p8a92wiz2zi4q7v5fjvdallxrl21scmwwv706g3mm5dgfgcs5a"; - revision = "1"; - editedCabalFile = "037zg3ick95pwsk2g0znhfdvwphw3yxv5kp8zj5czc6df97id8xj"; + revision = "2"; + editedCabalFile = "0ni3jamaz552nd0lp142ga42cmh956jq0zv34jzqfzfz7d3i5yw6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76102,38 +76133,56 @@ self: { }) {}; "dobutokO-poetry" = callPackage - ({ mkDerivation, base, mmsyn3, mmsyn6ukr, mmsyn7s, vector }: + ({ mkDerivation, base, dobutokO-poetry-general, mmsyn3, mmsyn6ukr + , mmsyn7s, uniqueness-periods, vector + }: mkDerivation { pname = "dobutokO-poetry"; - version = "0.10.0.0"; - sha256 = "1lrdlgn49im8rgvsj61k2n3g2ham2gizbv0r95nv4ga71z54lyhj"; + version = "0.14.0.0"; + sha256 = "14v276raxahkhb0xzjz358lhpwzigylqx70li65cp6zk85sv5949"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base mmsyn3 mmsyn6ukr mmsyn7s vector ]; + libraryHaskellDepends = [ + base dobutokO-poetry-general mmsyn3 mmsyn6ukr mmsyn7s + uniqueness-periods vector + ]; executableHaskellDepends = [ - base mmsyn3 mmsyn6ukr mmsyn7s vector + base dobutokO-poetry-general mmsyn3 mmsyn6ukr mmsyn7s + uniqueness-periods vector ]; description = "Helps to order the 7 or less Ukrainian words to obtain somewhat suitable for poetry or music text"; license = stdenv.lib.licenses.mit; }) {}; + "dobutokO-poetry-general" = callPackage + ({ mkDerivation, base, mmsyn3, mmsyn6ukr, mmsyn7s, vector }: + mkDerivation { + pname = "dobutokO-poetry-general"; + version = "0.1.0.0"; + sha256 = "0gdhihblshxq70av2x8ni7vywdfic750kwq7qsbhagrqr71fvqb1"; + libraryHaskellDepends = [ base mmsyn3 mmsyn6ukr mmsyn7s vector ]; + description = "Helps to order the 7 or less words (first of all the Ukrainian ones) to obtain somewhat suitable for poetry or music text"; + license = stdenv.lib.licenses.mit; + }) {}; + "dobutokO2" = callPackage ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3 - , mmsyn6ukr, mmsyn7l, mmsyn7s, mmsyn7ukr, process, vector + , mmsyn6ukr, mmsyn7l, mmsyn7s, mmsyn7ukr, process + , uniqueness-periods, vector }: mkDerivation { pname = "dobutokO2"; - version = "0.42.0.0"; - sha256 = "12bjaa9kw1ks9f64zl0lg4447hs1bjjy5g3q3yhmabwzp5yyy014"; + version = "0.43.0.0"; + sha256 = "0f17ff77m16p951laijqf5w4pfw4pgc6x2ha13472h62dzg8gm2f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7l mmsyn7s - mmsyn7ukr process vector + mmsyn7ukr process uniqueness-periods vector ]; executableHaskellDepends = [ base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7l mmsyn7s - mmsyn7ukr process vector + mmsyn7ukr process uniqueness-periods vector ]; description = "Helps to create experimental music from a file (or its part) and a Ukrainian text"; license = stdenv.lib.licenses.mit; @@ -76145,8 +76194,8 @@ self: { }: mkDerivation { pname = "dobutokO3"; - version = "0.2.1.0"; - sha256 = "0xh6685v01j1r9fg8r7ldd8vqxlir2fylryb0z71ndpdi4ajvkih"; + version = "0.3.0.0"; + sha256 = "1dbax6j2sdn6cd6crskwr0r90ymxmjk596a9ak8gvlkrwpk1cbdm"; libraryHaskellDepends = [ base bytestring directory dobutokO2 mmsyn2 mmsyn3 mmsyn6ukr mmsyn7l mmsyn7s mmsyn7ukr process vector @@ -76161,8 +76210,8 @@ self: { }: mkDerivation { pname = "dobutokO4"; - version = "0.7.0.0"; - sha256 = "16im8ki3jbc7jgvr8nwnr4mb19is1vf3pz6pdfrj4q9jfmrv82d2"; + version = "0.8.0.0"; + sha256 = "073kjv1m3qcrfyk8j8zs5hrc8x0bkyqnw6pa72afhkxq08dzj9y9"; libraryHaskellDepends = [ base directory dobutokO2 mmsyn3 mmsyn7l process vector vector-doublezip @@ -80179,8 +80228,8 @@ self: { }: mkDerivation { pname = "either-result"; - version = "0.3.0.0"; - sha256 = "1cj6g6b90cpfzfsrkja35bs6qfnqnx9fqxwfrkm5985pp0ii546d"; + version = "0.3.1.0"; + sha256 = "1l4539j0ynn5jl0rh9bhjxlgvr0sn3bf8ws1zrlbfk15524znqhm"; libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base doctest hspec transformers ]; testToolDepends = [ doctest-discover hspec-discover ]; @@ -84350,6 +84399,43 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "eventsourcing" = callPackage + ({ mkDerivation, base, deepseq, free, hashable, hedgehog, mtl + , pipes, psqueues, stm, tasty, tasty-hedgehog, time + , unordered-containers + }: + mkDerivation { + pname = "eventsourcing"; + version = "0.9.0"; + sha256 = "0rg9nd0sbqd132a4jzaq0065c5wjaib7iya305j2ql63gilfnjy3"; + libraryHaskellDepends = [ + base deepseq free hashable mtl pipes psqueues stm time + unordered-containers + ]; + testHaskellDepends = [ + base deepseq hedgehog mtl pipes stm tasty tasty-hedgehog + unordered-containers + ]; + description = "CQRS/ES library"; + license = stdenv.lib.licenses.isc; + }) {}; + + "eventsourcing-postgresql" = callPackage + ({ mkDerivation, base, bytestring, eventsourcing, hashable, mtl + , pipes, postgresql-simple, stm, unordered-containers + }: + mkDerivation { + pname = "eventsourcing-postgresql"; + version = "0.9.0"; + sha256 = "0dxa5lgf3lndhqgsmciyv9a6a6qwmwppq4qriasipnp656rcgyf8"; + libraryHaskellDepends = [ + base bytestring eventsourcing hashable mtl pipes postgresql-simple + stm unordered-containers + ]; + description = "PostgreSQL adaptor for eventsourcing"; + license = stdenv.lib.licenses.isc; + }) {}; + "eventstore" = callPackage ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring , cereal, clock, connection, containers, dns, dotnet-timespan @@ -94267,8 +94353,8 @@ self: { }: mkDerivation { pname = "functor-combinators"; - version = "0.3.3.0"; - sha256 = "1qym0xn4ydj2vx6nhy26k4bwznjjx7spgr0pv33b2i5wpznn972z"; + version = "0.3.5.1"; + sha256 = "07hwsy8nly4sps3fsyfmq54cwfb850j1i1darwsyw24ignbd60j4"; libraryHaskellDepends = [ assoc base bifunctors comonad constraints containers contravariant deriving-compat free invariant kan-extensions mmorph mtl @@ -102310,15 +102396,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "gitlab-haskell_0_2_1" = callPackage + "gitlab-haskell_0_2_2" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, http-conduit , http-types, tasty, tasty-hunit, text, time, transformers , unliftio, unliftio-core }: mkDerivation { pname = "gitlab-haskell"; - version = "0.2.1"; - sha256 = "0s7ar0z2hgkb8qzsyh6j022ks87nxa1fxy99dqrrmcfndcy6by8n"; + version = "0.2.2"; + sha256 = "10c6fv0hd8fnll56l7p4qbhyb0b4imiav910762kywbfrz1z6w18"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring connection http-conduit http-types text time @@ -127510,6 +127596,8 @@ self: { pname = "hnix"; version = "0.9.1"; sha256 = "1vxb55ih0gpaazb8kvms2sw21l78hb36cbz5217vg94i3yvk8zls"; + revision = "2"; + editedCabalFile = "17fxwg4bxnpwhwfwmh42xrwq6ajbk5b707zl8f01z0cyskzabzxy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133165,15 +133253,15 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; - "hslua_1_1_2" = callPackage + "hslua_1_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3 , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "1.1.2"; - sha256 = "1cv4lwr91ckscwm2jksrg29ka1z32974xgkcgmna4ibpyjwkslbl"; + version = "1.2.0"; + sha256 = "0a295zqpbrv8a2hw7msz5p7brlswag16sg08dyz399ij6b7q5x0h"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base bytestring containers exceptions mtl text @@ -133211,6 +133299,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-aeson_1_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec + , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific + , text, unordered-containers, vector + }: + mkDerivation { + pname = "hslua-aeson"; + version = "1.0.3"; + sha256 = "0qqcf9km39bmw29d2s5zw91rxgmmm8nqfnfs5hkhmsgh5kvaal5h"; + libraryHaskellDepends = [ + aeson base hashable hslua scientific text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bytestring hashable hslua hspec HUnit ieee754 QuickCheck + quickcheck-instances scientific text unordered-containers vector + ]; + description = "Allow aeson data types to be used with lua"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hslua-module-doclayout" = callPackage ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit , tasty-lua, text @@ -133243,6 +133353,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-module-system_0_2_2" = callPackage + ({ mkDerivation, base, containers, directory, exceptions, hslua + , tasty, tasty-hunit, tasty-lua, temporary, text + }: + mkDerivation { + pname = "hslua-module-system"; + version = "0.2.2"; + sha256 = "0swl20v40kkh67vn6546a0afjcsq56x3ww854x3pwypxz1p6dyri"; + libraryHaskellDepends = [ + base containers directory exceptions hslua temporary + ]; + testHaskellDepends = [ + base hslua tasty tasty-hunit tasty-lua text + ]; + description = "Lua module wrapper around Haskell's System module"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hslua-module-text" = callPackage ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text }: @@ -133256,6 +133385,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-module-text_0_3_0" = callPackage + ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit + , tasty-lua, text + }: + mkDerivation { + pname = "hslua-module-text"; + version = "0.3.0"; + sha256 = "1y15b38r0xiwcwpzsdr8x8i4y8all2jd3z0j7fvny6lsbna2hf7r"; + libraryHaskellDepends = [ base bytestring hslua text ]; + testHaskellDepends = [ + base hslua tasty tasty-hunit tasty-lua text + ]; + description = "Lua module for text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsluv-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, colour, containers }: mkDerivation { @@ -141398,8 +141544,6 @@ self: { ]; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ihaskell-aeson" = callPackage @@ -141415,8 +141559,6 @@ self: { ]; description = "IHaskell display instances for Aeson"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ihaskell-basic" = callPackage @@ -141441,8 +141583,6 @@ self: { libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ]; description = "IHaskell display instances for blaze-html types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ihaskell-charts" = callPackage @@ -141459,8 +141599,6 @@ self: { ]; description = "IHaskell display instances for charts types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ihaskell-diagrams" = callPackage @@ -141477,8 +141615,6 @@ self: { ]; description = "IHaskell display instances for diagram types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ihaskell-display" = callPackage @@ -141503,8 +141639,6 @@ self: { libraryHaskellDepends = [ base bytestring gnuplot ihaskell ]; description = "IHaskell display instance for Gnuplot (from gnuplot package)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ihaskell-graphviz" = callPackage @@ -141516,8 +141650,6 @@ self: { libraryHaskellDepends = [ base bytestring ihaskell process ]; description = "IHaskell display instance for GraphViz (external binary)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ihaskell-hatex" = callPackage @@ -141529,8 +141661,6 @@ self: { libraryHaskellDepends = [ base HaTeX ihaskell text ]; description = "IHaskell display instances for hatex"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ihaskell-hvega" = callPackage @@ -141542,8 +141672,6 @@ self: { libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ihaskell-inline-r" = callPackage @@ -141561,8 +141689,6 @@ self: { ]; description = "Embed R quasiquotes and plots in IHaskell notebooks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ihaskell-juicypixels" = callPackage @@ -141577,8 +141703,6 @@ self: { ]; description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ihaskell-magic" = callPackage @@ -141595,8 +141719,6 @@ self: { ]; description = "IHaskell display instances for bytestrings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ihaskell-parsec" = callPackage @@ -143881,8 +144003,8 @@ self: { pname = "int-cast"; version = "0.2.0.0"; sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0"; - revision = "2"; - editedCabalFile = "1fhc91170q9q9k628wc3dqzdvxfjs97jzg5x7g0ndaqnh60l8cy5"; + revision = "3"; + editedCabalFile = "1b99lqxwbhg96iykfr2l7qd388cbx9sf8bln728505qgj6kgsvj7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -147945,6 +148067,37 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_8_3_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, concise, containers, cryptonite, hspec, lens, memory + , monad-time, mtl, network-uri, pem, QuickCheck + , quickcheck-instances, safe, tasty, tasty-hspec, tasty-quickcheck + , template-haskell, text, time, unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.8.3.1"; + sha256 = "14cbdah9khw8z876c1fn26asp1xa3azn7hh7a04chznmqagnmbmj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe template-haskell text time + unordered-containers vector x509 + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite hspec lens memory monad-time mtl network-uri + pem QuickCheck quickcheck-instances safe tasty tasty-hspec + tasty-quickcheck template-haskell text time unordered-containers + vector x509 + ]; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, doctest, either, hspec, HUnit @@ -154777,6 +154930,8 @@ self: { pname = "lapack-ffi-tools"; version = "0.1.2.1"; sha256 = "0hk54psm066acgn24mw5dbbhz4a0nqvyks75302cabijbp524gdh"; + revision = "1"; + editedCabalFile = "1h5chlb66ycg96ab56hwqr4qk82l19gq1pg1zfzhfdl5byg24fln"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -168020,8 +168175,8 @@ self: { pname = "mercury-api"; version = "0.1.0.2"; sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg"; - revision = "4"; - editedCabalFile = "1bx3xrafmf82b9wlvhggv87fwqgpgqxjdgkk9r5b323m9ci2gign"; + revision = "5"; + editedCabalFile = "15xgb00cv8srnhfgh7v01b2qijcwapwsbx92jbdss525n3j74d48"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170638,8 +170793,8 @@ self: { pname = "mmark-cli"; version = "0.0.5.0"; sha256 = "15qrp2q1flx9csqvj8zx9w1jqg8pwfi0v7wpia7n7vg09jgydhby"; - revision = "3"; - editedCabalFile = "03n7i551lagr4b6587c34ic6c4d9sn9kmnzkff2x1klqaxgb88ld"; + revision = "4"; + editedCabalFile = "1z2jfbbjimcryb44g990cnx5xvmfipy5dx6z33v2aqgpjgjn2rr5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170744,8 +170899,8 @@ self: { }: mkDerivation { pname = "mmsyn6ukr"; - version = "0.7.3.0"; - sha256 = "078g7npfal2qry5agqrr13252y7c1n75s0bykdn5s0p5wy5812mj"; + version = "0.8.0.0"; + sha256 = "0cs4mi9ia3l3v19hldbaygsywvjcfx66plbyh6311j2qzbrqaq93"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -170765,8 +170920,8 @@ self: { }: mkDerivation { pname = "mmsyn7h"; - version = "0.7.7.0"; - sha256 = "0ayx9mv25f8dvp30bbxm6cnbmxwpdhcpqsh0zgh6xp703vlwrfvc"; + version = "0.8.0.0"; + sha256 = "0mj96p3f96brv7cw3mkigngxnmqcn9r1yfghdx1jplrw5wycy80j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170787,8 +170942,8 @@ self: { }: mkDerivation { pname = "mmsyn7l"; - version = "0.7.0.0"; - sha256 = "0mpc782zgv63ax8mfq7ljrdida4vviqhzhiakl42i368f1zavhqm"; + version = "0.8.0.0"; + sha256 = "0w1k89phzxyq2nwzr0vn313rlp0f7d62vhdvq113pqszbdbjh6gd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170805,8 +170960,8 @@ self: { ({ mkDerivation, base, mmsyn2, mmsyn5, mmsyn6ukr, vector }: mkDerivation { pname = "mmsyn7s"; - version = "0.7.0.0"; - sha256 = "14vbqdhk8f6fa319c6yk57y474bivdmyhj9rmy20cqjjh7bsw229"; + version = "0.8.0.0"; + sha256 = "0brcmmlvdd294y35gby1qnb5b5h5mcn6xgwgvffxfmhif7nyxmc5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ]; @@ -170821,8 +170976,8 @@ self: { }: mkDerivation { pname = "mmsyn7ukr"; - version = "0.16.0.0"; - sha256 = "1dmiisbn9v98rf4qa7zw976w3qj6s67j11vvd82f186n9p2id7px"; + version = "0.17.0.0"; + sha256 = "069pyv8g9gdzzvnmdqmcrqnxf5zglrqbmcn2v6frfxj7ibd4awif"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -171131,13 +171286,13 @@ self: { }) {}; "modular-arithmetic" = callPackage - ({ mkDerivation, base, doctest }: + ({ mkDerivation, base, doctest, typelits-witnesses }: mkDerivation { pname = "modular-arithmetic"; - version = "1.2.1.5"; - sha256 = "0nrnjyqpyy2c5479wjw5ihkwmiingpw60isdladfgi1cis36pq5f"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; + version = "2.0.0.0"; + sha256 = "1mwhjn315vgpvf95ay6rf77hwpb7hjfw9bcginnz4cb30nn8kvl9"; + libraryHaskellDepends = [ base typelits-witnesses ]; + testHaskellDepends = [ base doctest typelits-witnesses ]; description = "A type for integers modulo some constant"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -173730,7 +173885,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "morpheus-graphql_0_13_0" = callPackage + "morpheus-graphql_0_14_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, megaparsec , morpheus-graphql-core, mtl, scientific, tasty, tasty-hunit , template-haskell, text, transformers, unliftio-core @@ -173738,8 +173893,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.13.0"; - sha256 = "0gcrgpdiazridddm9imjhsx05cnqxxb24dhg18d9n6c1qm1d4q30"; + version = "0.14.1"; + sha256 = "1vyb3jqnsmsjyl3zc0rh3c77ma3s5pgcqph4ijafhlm44fk6s82z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers megaparsec morpheus-graphql-core @@ -173779,17 +173934,23 @@ self: { }) {}; "morpheus-graphql-client" = callPackage - ({ mkDerivation, aeson, base, bytestring, morpheus-graphql-core - , mtl, template-haskell, text, transformers, unordered-containers + ({ mkDerivation, aeson, base, bytestring, directory + , morpheus-graphql-core, mtl, tasty, tasty-hunit, template-haskell + , text, transformers, unordered-containers }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.13.0"; - sha256 = "0m1a379csfs3bqysl8ai2k7ybpb2gbm9w1rccgr41p9lk7w2w40k"; + version = "0.14.1"; + sha256 = "0q5cb5db1fdnp685jkmary43m6l4w8bhlqs5zh4h0q1lmkfz13n8"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-core mtl template-haskell text transformers unordered-containers ]; + testHaskellDepends = [ + aeson base bytestring directory morpheus-graphql-core mtl tasty + tasty-hunit template-haskell text transformers unordered-containers + ]; description = "Morpheus GraphQL Client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -173820,7 +173981,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "morpheus-graphql-core_0_13_0" = callPackage + "morpheus-graphql-core_0_14_1" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, hashable , megaparsec, mtl, scientific, tasty, tasty-hunit, template-haskell , text, th-lift-instances, transformers, unordered-containers @@ -173828,8 +173989,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.13.0"; - sha256 = "0ix5n3c1db6qa6zdk74r890klc81wa1f4mdlqln6g039dbh423j7"; + version = "0.14.1"; + sha256 = "0xqam41z0i9f2bsa8z7gh3x2fhvy8qa02a1r4gix7dnymi69bbgj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring hashable megaparsec mtl scientific @@ -182490,8 +182651,8 @@ self: { pname = "normalization-insensitive"; version = "2.0.1"; sha256 = "00nbha984yg4lxnpkyd3q0gbywf7xn5z5ixy3cr9ksn05w6blm1v"; - revision = "3"; - editedCabalFile = "1p1pw5llhw0jp1w8yvwd79w06lk7rz74rryppzvw8vpc5axl99bq"; + revision = "4"; + editedCabalFile = "1p0vxvp44nzjn7big9m3wj8gvffaxz05c46jalm73fwm8cj54iqf"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -185087,6 +185248,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_6_7006_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-locale-compat, transformers, uuid + , void + }: + mkDerivation { + pname = "opaleye"; + version = "0.6.7006.1"; + sha256 = "0qg42qdk6gcziwfvjsjbwyj629grna2ay4pmh8myy3d1rznp6s93"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time time-locale-compat + transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -186933,14 +187123,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-generic_1_4_2" = callPackage + "optparse-generic_1_4_3" = callPackage ({ mkDerivation, base, bytestring, Only, optparse-applicative , system-filepath, text, time, transformers, void }: mkDerivation { pname = "optparse-generic"; - version = "1.4.2"; - sha256 = "00b46pn3mi0kbx8a2xc92hlrykl9b344sq9ljmydv4zmrrhp5yr6"; + version = "1.4.3"; + sha256 = "18ih1r28hlml9wysqrzljmgi6q90s3k6jaaa7a5i48vr9bl3prs8"; libraryHaskellDepends = [ base bytestring Only optparse-applicative system-filepath text time transformers void @@ -187491,8 +187681,8 @@ self: { pname = "ormolu"; version = "0.1.2.0"; sha256 = "14ndqfcbx0y71d3q5i7d0scbvg9nd5qr5pdn7qvylxlkgpbc77qp"; - revision = "1"; - editedCabalFile = "0c20myzc42zvfhy8lwqgjrhsna5dg8xfbha5y2v7hsapa0km3ri4"; + revision = "2"; + editedCabalFile = "07p7342972b2ffi46ll8jgbnlx97g7imzpl819hzc0yd2pjn4jn9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -188950,7 +189140,7 @@ self: { broken = true; }) {}; - "pandoc-plot_0_9_0_0" = callPackage + "pandoc-plot_0_9_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, directory, filepath, githash, hashable, hspec , hspec-expectations, lifted-async, mtl, optparse-applicative @@ -188959,8 +189149,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "0.9.0.0"; - sha256 = "0wamycf3cbblcifs7sppnzg4vbglzgizmjb5idg0dgkhlrk78gcx"; + version = "0.9.1.0"; + sha256 = "0vfcn0h5x9jsf3jjriqd6wfa9cpi7icz4k8pkqmhjz5sgs2yv7i4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200185,8 +200375,8 @@ self: { pname = "postgrest"; version = "7.0.1"; sha256 = "1cn69dinfv3y8ymsa364b9b0ly3dg80and902gamymb9v89jpsgf"; - revision = "1"; - editedCabalFile = "0s8zzv6vjs4mp6m6l6ahfpfrx551zzp3nh13qk5qxk992x3jxb8b"; + revision = "2"; + editedCabalFile = "061lr5hy3xf1nx7yqjpspxqdccmhvvfkyzd3qxzsg5s041hy4krs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203702,8 +203892,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.10.2"; - sha256 = "1yagzlpn6myj46ihcy8v43kxjf8kba42q5vahy22aanpwbp9lij8"; + version = "5.11"; + sha256 = "0jda99g9a818w1yisms40rlzx81dyvv16w2ms8iazs5b9h4fwb3a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210127,8 +210317,8 @@ self: { }: mkDerivation { pname = "reactive-banana-automation"; - version = "0.5.3"; - sha256 = "15jp5rawypxzbbyi9xi6jkds3mns7fpfkvzrzbqd7dvaj4mzzz0g"; + version = "0.5.4"; + sha256 = "1ir2m6d13hg8i4w4vfpnvjv6dvnjmrz2bwl7n6lsac95pm0hbjs3"; libraryHaskellDepends = [ base reactive-banana stm time transformers ]; @@ -218868,16 +219058,20 @@ self: { }) {}; "runhs" = callPackage - ({ mkDerivation, base, bytestring, file-embed, process, yaml }: + ({ mkDerivation, base, bytestring, directory, file-embed, hspec + , process, terminal-size, text, word-wrap, yaml + }: mkDerivation { pname = "runhs"; - version = "1.0.0.4"; - sha256 = "01czfphzp252y62vrx1pys74xga3m7b6q9pbd0f20y3m74q337xi"; + version = "1.0.0.7"; + sha256 = "1j9sg598f92vckb31y1rms4iqnzn6cw7nckcmvjndksxwxhqmk4b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring file-embed process yaml + base bytestring file-embed process terminal-size text word-wrap + yaml ]; + testHaskellDepends = [ base directory hspec process ]; description = "Stack wrapper for single-file Haskell programs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -237794,6 +237988,8 @@ self: { pname = "stache"; version = "2.2.0"; sha256 = "09cfj8hs2249gqf0nrlv9b8vg8gmxabs7ndxasphxdd0rb1y3z3g"; + revision = "1"; + editedCabalFile = "12cjs085pmf52ykh24mn538wc9dvjydam6vn1rjxz03wc6mx2vf5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -247579,6 +247775,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-lua_0_2_3" = callPackage + ({ mkDerivation, base, bytestring, directory, file-embed, filepath + , hslua, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "tasty-lua"; + version = "0.2.3"; + sha256 = "0kpmp51wyqbjv3nsrnybpms7flsl2bznqp8gf27zv2f5kraa77vk"; + libraryHaskellDepends = [ + base bytestring file-embed hslua tasty text + ]; + testHaskellDepends = [ + base directory filepath hslua tasty tasty-hunit + ]; + description = "Write tests in Lua, integrate into tasty"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-mgolden" = callPackage ({ mkDerivation, base, Diff, filepath, hlint, tasty , tasty-expected-failure, tasty-hunit, text, typed-process @@ -258309,7 +258524,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "turtle_1_5_20" = callPackage + "turtle_1_5_21" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , containers, criterion, directory, doctest, exceptions, foldl , hostname, managed, optional-args, optparse-applicative, process @@ -258318,8 +258533,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.20"; - sha256 = "1dk8ddp1p77l7gbg81ryqrkaxhrj3an24mx572b5wmhmjmbjfk9l"; + version = "1.5.21"; + sha256 = "0sb1xnmvqby1lcg3p92v0nkpxnm2qk0gcn41mxxgp3xdm24vkz36"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -261858,6 +262073,28 @@ self: { broken = true; }) {}; + "uniqueness-periods" = callPackage + ({ mkDerivation, base, mmsyn6ukr, vector }: + mkDerivation { + pname = "uniqueness-periods"; + version = "0.1.0.0"; + sha256 = "15lk3hgkf0bxnss0rr8n8zjl3sdf0ylsl525pd9qdaldjw9l8x27"; + libraryHaskellDepends = [ base mmsyn6ukr vector ]; + description = "Can be used to produce the 'uniquenessPeriods' function and related functionality"; + license = stdenv.lib.licenses.mit; + }) {}; + + "uniqueness-periods-general" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "uniqueness-periods-general"; + version = "0.1.0.0"; + sha256 = "15l5c1zwjv6p684fd2cyw4mi8casjhkwbx7237fs5rn35mngfd9q"; + libraryHaskellDepends = [ base vector ]; + description = "Can be used to produce the similar to 'String.Ukrainian.UniquenessPeriods' functions."; + license = stdenv.lib.licenses.mit; + }) {}; + "unit" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -270720,6 +270957,29 @@ self: { broken = true; }) {}; + "webgear-server" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-api-data, http-types + , mtl, QuickCheck, quickcheck-instances, tagged, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, unordered-containers + , wai + }: + mkDerivation { + pname = "webgear-server"; + version = "0.1.0"; + sha256 = "03733kxh1r3yd0hicln64mgfr41zbz7bjvddc1j8h45ppxif8xfm"; + libraryHaskellDepends = [ + aeson base bytestring http-api-data http-types mtl tagged + template-haskell text unordered-containers wai + ]; + testHaskellDepends = [ + aeson base bytestring http-api-data http-types mtl QuickCheck + quickcheck-instances tagged tasty tasty-hunit tasty-quickcheck + template-haskell text unordered-containers wai + ]; + description = "Composable, type-safe library to build HTTP API servers"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "webidl" = callPackage ({ mkDerivation, base, bytestring, HSFFIG, LEXER, parsec, pretty , utf8-env, utf8-string From cea5c7f95f03f236956d59a0fcaa574b3b6a6c41 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 17 Aug 2020 10:36:06 +1000 Subject: [PATCH 126/520] cargo-release: fix darwin build --- pkgs/tools/package-management/cargo-release/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 0b92e5fb9ae..66c5b29f6ac 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, Security, openssl, pkg-config }: +{ stdenv, rustPlatform, fetchFromGitHub, libiconv, Security, openssl, pkg-config }: rustPlatform.buildRustPackage rec { pname = "cargo-release"; @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1a6ac4x51i1rg0bgrxbbdd54gmwldsiv7nn8vi81y20llnshgjk7"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; meta = with stdenv.lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; From cf71eed06efccdfdc6fe9319b5df76621601a98f Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 17 Aug 2020 02:39:06 +0200 Subject: [PATCH 127/520] bgnet: 3.0.21 -> 3.1.2 Also builds from source now, the old tarball was long gone. --- pkgs/data/documentation/bgnet/default.nix | 27 +++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix index f5ac07f1b7f..a69a2d7a64f 100644 --- a/pkgs/data/documentation/bgnet/default.nix +++ b/pkgs/data/documentation/bgnet/default.nix @@ -1,27 +1,30 @@ -{ stdenv, lib, fetchurl, python, zip, fop }: +{ stdenv, lib, fetchFromGitHub, python3, pandoc }: stdenv.mkDerivation { pname = "bgnet"; - version = "3.0.21"; + # to be found in the Makefile + version = "3.1.2"; - src = fetchurl { - url = "https://beej.us/guide/bgnet/bgnet.tgz"; - sha256 = "00ggr5prc5i3w9gaaw2sadfq6haq7lmh0vdilaxx8xz9z5znxvyv"; + src = fetchFromGitHub { + owner = "beejjorgensen"; + repo = "bgnet"; + rev = "782a785a35d43c355951b8151628d7c64e4d0346"; + sha256 = "19w0r3zr71ydd29amqwn8q3npgrpy5kkshyshyji2hw5hky6iy92"; }; - buildInputs = [ python zip fop ]; - - preBuild = '' - sed -i "s/#disable=1/disable=1/" bin/bgvalidate + buildPhase = '' # build scripts need some love - patchShebangs . + patchShebangs bin/preproc + + make -C src bgnet.html ''; installPhase = '' - mkdir -p $out - mv * $out/ + install -Dm644 src/bgnet.html $out/share/doc/bgnet/html/index.html ''; + nativeBuildInputs = [ python3 pandoc ]; + meta = { description = "Beej’s Guide to Network Programming"; homepage = "https://beej.us/guide/bgnet/"; From 39cd8e3b91c4f5d43eeea1167a254947beddf0b1 Mon Sep 17 00:00:00 2001 From: Andrew Valencik Date: Sun, 16 Aug 2020 22:37:08 -0400 Subject: [PATCH 128/520] idris2: 0.2.0 -> 0.2.1 --- pkgs/development/compilers/idris2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index d2a071b61dd..f0785aead84 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -5,13 +5,13 @@ # Uses scheme to bootstrap the build of idris2 stdenv.mkDerivation rec { name = "idris2"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "idris-lang"; repo = "Idris2"; rev = "v${version}"; - sha256 = "153z6zgb90kglw8rspk8ph5gh5nkplhi27mxai6yqbbjs2glx5d4"; + sha256 = "044slgl2pwvj939kz3z92n6l182plc5fzng1n4z4k6bg11msqq14"; }; strictDeps = true; From bd6371a93d815b96dcc343bb34123609f287f997 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 16 Aug 2020 23:20:00 -0500 Subject: [PATCH 129/520] haskellPackages.taskell: unbreak --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e6f75b1b69f..ed35261eaee 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -10157,7 +10157,6 @@ broken-packages: - tart - task - task-distribution - - taskell - TaskMonad - tasty-auto - tasty-bdd From 8d65ad740ce8d1140321883c8c1427cc167bbc0c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 16 Aug 2020 23:21:00 -0500 Subject: [PATCH 130/520] taskell: use haskellPackages --- pkgs/applications/misc/taskell/default.nix | 66 ---------------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 pkgs/applications/misc/taskell/default.nix diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix deleted file mode 100644 index c8974c5c275..00000000000 --- a/pkgs/applications/misc/taskell/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, haskellPackages, fetchFromGitHub }: - -let - version = "1.10.0"; - sha256 = "102iwn6011rypdlx07fzbdll3r5cd204qf96lzwkadvjb7h8clil"; - -in (haskellPackages.mkDerivation { - pname = "taskell"; - inherit version; - - src = fetchFromGitHub { - owner = "smallhadroncollider"; - repo = "taskell"; - rev = version; - inherit sha256; - }; - - postPatch = ''${haskellPackages.hpack}/bin/hpack''; - - # basically justStaticExecutables; TODO: use justStaticExecutables - enableSharedExecutables = false; - enableLibraryProfiling = false; - isExecutable = true; - doHaddock = false; - postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; - - # copied from packages.yaml - libraryHaskellDepends = with haskellPackages; [ - classy-prelude - # base <=5 - aeson - brick - # bytestring - config-ini - # containers - # directory - file-embed - fold-debounce - http-conduit - http-client - http-types - lens - raw-strings-qq - # mtl - # template-haskell - # text - time - vty - tz - ]; - - executableHaskellDepends = []; - - testHaskellDepends = with haskellPackages; [ - tasty - tasty-discover - tasty-expected-failure - tasty-hunit - ]; - - description = "Command-line Kanban board/task manager with support for Trello boards and GitHub projects"; - homepage = "https://taskell.app"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ matthiasbeyer ]; - platforms = [ "x86_64-linux" ]; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f674eb0241..16f805fd7c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22853,7 +22853,7 @@ in teamspeak_client = libsForQt512.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - taskell = callPackage ../applications/misc/taskell { }; + taskell = haskell.lib.justStaticExecutables haskellPackages.taskell; taskjuggler = callPackage ../applications/misc/taskjuggler { }; From 1e7278c7ea4351252d7121a887c68fc477881e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 17 Aug 2020 07:49:47 +0200 Subject: [PATCH 131/520] broot: 0.19.4 -> 0.20.0 Changelog: https://github.com/Canop/broot/releases/tag/v0.20.0 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 7ad6bc2cc69..ccdb8bcd708 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.19.4"; + version = "0.20.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0k5vv7a141ka9qpay5xccqdcy8sj0v9ywhhcdfpgii6z0wrd7mvr"; + sha256 = "0by4cln9ljaphqk5hz56mcavz9kc5s42zlxx33nf3idqrszfcarf"; }; - cargoSha256 = "18b4lh5x25mbhpffva8ygzm5ad00svm1c3r83vfw0l2f61m7vyjh"; + cargoSha256 = "1i5zq310k8gv9877rcrvash3aw1cyf3g0741qnky71d565s3n910"; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 0e725da522e0861c4ad70a63061226d983f2c4b6 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 16 Aug 2020 12:14:37 +0200 Subject: [PATCH 132/520] qosmic: init at 1.6.0 Co-Authored-By: Jan Tojnar --- pkgs/applications/graphics/qosmic/default.nix | 70 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/applications/graphics/qosmic/default.nix diff --git a/pkgs/applications/graphics/qosmic/default.nix b/pkgs/applications/graphics/qosmic/default.nix new file mode 100644 index 00000000000..96823441b6e --- /dev/null +++ b/pkgs/applications/graphics/qosmic/default.nix @@ -0,0 +1,70 @@ +{ mkDerivation +, fetchFromGitHub +, fetchpatch +, qmake +, wrapQtAppsHook +, qtbase +, pkg-config +, lua +, flam3 +, libxml2 +, libpng +, libjpeg +, lib +}: + +mkDerivation rec { + pname = "qosmic"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "bitsed"; + repo = "qosmic"; + rev = "v${version}"; + sha256 = "13nw1mkdib14430r21mj352v62vi546vf184vyhxm7yjjygyra1w"; + }; + + patches = [ + # Allow overriding PREFIX (to install to $out, + # written while creating this derivation) + # https://github.com/bitsed/qosmic/pull/39 + (fetchpatch { + name = "allow-overriding-PREFIX.patch"; + url = "https://github.com/bitsed/qosmic/commit/77fb3a577b0710efae2a1d9ed97c26ae16f3a5ba.patch"; + sha256 = "0v9hj9s78cb6bg8ca0wjkbr3c7ml1n51n8h4a70zpzzgzz7rli5b"; + }) + # Fix QButtonGroup include errors with Qt 5.11: + # Will be part of the next post-1.6.0 release + (fetchpatch { + name = "fix-class-QButtonGroup-include-errors-with-Qt-5.11.patch"; + url = "https://github.com/bitsed/qosmic/commit/3f6e1ea8d384a124dbc2d568171a4da798480752.patch"; + sha256 = "0bp6b759plkqs32nvfpkfvf3qqzc9716k3ycwnjvwabbvpg1xwbl"; + }) + ]; + + nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; + + buildInputs = [ + qtbase + lua + flam3 + libxml2 + libpng + libjpeg + ]; + + qmakeFlags = [ + # Use pkg-config to correctly locate library paths + "-config" "link_pkgconfig" + ]; + + meta = with lib; { + description = "A cosmic recursive flame fractal editor"; + homepage = "https://github.com/bitsed/qosmic"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.raboof ]; + # It might be possible to make it work on OSX, + # but this has not been tested. + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a9abfc0c7c..b79c3579c57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6365,6 +6365,8 @@ in qjoypad = callPackage ../tools/misc/qjoypad { }; + qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; + qownnotes = libsForQt5.callPackage ../applications/office/qownnotes { }; qpdf = callPackage ../development/libraries/qpdf { }; From fafbfd2305f092b3ee2024e7b211bd6b5a5e1328 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 31 Jul 2020 14:58:03 +0200 Subject: [PATCH 133/520] fhs-userenv-bubblewrap: start with build-fhs-userenv Just here to track @illegalprime's actual changes to build-fhs-userenv in the next commits --- .../build-fhs-userenv-bubblewrap/default.nix | 49 +++++ .../build-fhs-userenv-bubblewrap/env.nix | 202 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 255 insertions(+), 1 deletion(-) create mode 100644 pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix create mode 100644 pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix new file mode 100644 index 00000000000..e7db6a75297 --- /dev/null +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -0,0 +1,49 @@ +{ callPackage, runCommandLocal, writeScript, stdenv, coreutils }: + +let buildFHSEnv = callPackage ./env.nix { }; in + +args@{ name, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: + +let + env = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" ]); + + chrootenv = callPackage ./chrootenv {}; + + init = run: writeScript "${name}-init" '' + #! ${stdenv.shell} + for i in ${env}/* /host/*; do + path="/''${i##*/}" + [ -e "$path" ] || ${coreutils}/bin/ln -s "$i" "$path" + done + + [ -d "$1" ] && [ -r "$1" ] && cd "$1" + shift + + source /etc/profile + exec ${run} "$@" + ''; + +in runCommandLocal name { + inherit meta; + + passthru = passthru // { + env = runCommandLocal "${name}-shell-env" { + shellHook = '' + exec ${chrootenv}/bin/chrootenv ${init runScript} "$(pwd)" + ''; + } '' + echo >&2 "" + echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" + echo >&2 "" + exit 1 + ''; + }; +} '' + mkdir -p $out/bin + cat <$out/bin/${name} + #! ${stdenv.shell} + exec ${chrootenv}/bin/chrootenv ${init runScript} "\$(pwd)" "\$@" + EOF + chmod +x $out/bin/${name} + ${extraInstallCommands} +'' diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix new file mode 100644 index 00000000000..083e7617b50 --- /dev/null +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -0,0 +1,202 @@ +{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }: + +{ name, profile ? "" +, targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] +, extraBuildCommands ? "", extraBuildCommandsMulti ? "" +, extraOutputsToInstall ? [] +}: + +# HOWTO: +# All packages (most likely programs) returned from targetPkgs will only be +# installed once--matching the host's architecture (64bit on x86_64 and 32bit on +# x86). +# +# Packages (most likely libraries) returned from multiPkgs are installed +# once on x86 systems and twice on x86_64 systems. +# On x86 they are merged with packages from targetPkgs. +# On x86_64 they are added to targetPkgs and in addition their 32bit +# versions are also installed. The final directory structure looks as +# follows: +# /lib32 will include 32bit libraries from multiPkgs +# /lib64 will include 64bit libraries from multiPkgs and targetPkgs +# /lib will link to /lib32 + +let + is64Bit = stdenv.hostPlatform.parsed.cpu.bits == 64; + isMultiBuild = multiPkgs != null && is64Bit; + isTargetBuild = !isMultiBuild; + + # list of packages (usually programs) which are only be installed for the + # host's architecture + targetPaths = targetPkgs pkgs ++ (if multiPkgs == null then [] else multiPkgs pkgs); + + # list of packages which are installed for both x86 and x86_64 on x86_64 + # systems + multiPaths = multiPkgs pkgsi686Linux; + + # base packages of the chroot + # these match the host's architecture, glibc_multi is used for multilib + # builds. glibcLocales must be before glibc or glibc_multi as otherwiese + # the wrong LOCALE_ARCHIVE will be used where only C.UTF-8 is available. + basePkgs = with pkgs; + [ glibcLocales + (if isMultiBuild then glibc_multi else glibc) + (toString gcc.cc.lib) bashInteractive coreutils less shadow su + gawk diffutils findutils gnused gnugrep + gnutar gzip bzip2 xz + ]; + baseMultiPkgs = with pkgsi686Linux; + [ (toString gcc.cc.lib) + ]; + + etcProfile = writeText "profile" '' + export PS1='${name}-chrootenv:\u@\h:\w\$ ' + export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' + export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" + export TZDIR='/etc/zoneinfo' + + # Force compilers and other tools to look in default search paths + unset NIX_ENFORCE_PURITY + export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 + export NIX_CFLAGS_COMPILE='-idirafter /usr/include' + export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32' + export NIX_LDFLAGS='-L/usr/lib -L/usr/lib32' + export PKG_CONFIG_PATH=/usr/lib/pkgconfig + export ACLOCAL_PATH=/usr/share/aclocal + + ${profile} + ''; + + # Compose /etc for the chroot environment + etcPkg = stdenv.mkDerivation { + name = "${name}-chrootenv-etc"; + buildCommand = '' + mkdir -p $out/etc + cd $out/etc + + # environment variables + ln -s ${etcProfile} profile + + # compatibility with NixOS + ln -s /host/etc/static static + + # symlink some NSS stuff + ln -s /host/etc/passwd passwd + ln -s /host/etc/group group + ln -s /host/etc/shadow shadow + ln -s /host/etc/hosts hosts + ln -s /host/etc/resolv.conf resolv.conf + ln -s /host/etc/nsswitch.conf nsswitch.conf + + # symlink sudo and su stuff + ln -s /host/etc/login.defs login.defs + ln -s /host/etc/sudoers sudoers + ln -s /host/etc/sudoers.d sudoers.d + + # symlink other core stuff + ln -s /host/etc/localtime localtime + ln -s /host/etc/zoneinfo zoneinfo + ln -s /host/etc/machine-id machine-id + ln -s /host/etc/os-release os-release + + # symlink PAM stuff + ln -s /host/etc/pam.d pam.d + + # symlink fonts stuff + ln -s /host/etc/fonts fonts + + # symlink ALSA stuff + ln -s /host/etc/asound.conf asound.conf + + # symlink SSL certs + mkdir -p ssl + ln -s /host/etc/ssl/certs ssl/certs + + # symlink /etc/mtab -> /proc/mounts (compat for old userspace progs) + ln -s /proc/mounts mtab + ''; + }; + + # Composes a /usr-like directory structure + staticUsrProfileTarget = buildEnv { + name = "${name}-usr-target"; + paths = [ etcPkg ] ++ basePkgs ++ targetPaths; + extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall; + ignoreCollisions = true; + }; + + staticUsrProfileMulti = buildEnv { + name = "${name}-usr-multi"; + paths = baseMultiPkgs ++ multiPaths; + extraOutputsToInstall = [ "out" "lib" ] ++ extraOutputsToInstall; + ignoreCollisions = true; + }; + + # setup library paths only for the targeted architecture + setupLibDirs_target = '' + # link content of targetPaths + cp -rsHf ${staticUsrProfileTarget}/lib lib + ln -s lib lib${if is64Bit then "64" else "32"} + ''; + + # setup /lib, /lib32 and /lib64 + setupLibDirs_multi = '' + mkdir -m0755 lib32 + mkdir -m0755 lib64 + ln -s lib64 lib + + # copy glibc stuff + cp -rsHf ${staticUsrProfileTarget}/lib/32/* lib32/ && chmod u+w -R lib32/ + + # copy content of multiPaths (32bit libs) + [ -d ${staticUsrProfileMulti}/lib ] && cp -rsHf ${staticUsrProfileMulti}/lib/* lib32/ && chmod u+w -R lib32/ + + # copy content of targetPaths (64bit libs) + cp -rsHf ${staticUsrProfileTarget}/lib/* lib64/ && chmod u+w -R lib64/ + + # symlink 32-bit ld-linux.so + ln -Ls ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/ + ''; + + setupLibDirs = if isTargetBuild then setupLibDirs_target + else setupLibDirs_multi; + + # the target profile is the actual profile that will be used for the chroot + setupTargetProfile = '' + mkdir -m0755 usr + cd usr + ${setupLibDirs} + for i in bin sbin share include; do + if [ -d "${staticUsrProfileTarget}/$i" ]; then + cp -rsHf "${staticUsrProfileTarget}/$i" "$i" + fi + done + cd .. + + for i in var etc; do + if [ -d "${staticUsrProfileTarget}/$i" ]; then + cp -rsHf "${staticUsrProfileTarget}/$i" "$i" + fi + done + for i in usr/{bin,sbin,lib,lib32,lib64}; do + if [ -d "$i" ]; then + ln -s "$i" + fi + done + ''; + +in stdenv.mkDerivation { + name = "${name}-fhs"; + buildCommand = '' + mkdir -p $out + cd $out + ${setupTargetProfile} + cd $out + ${extraBuildCommands} + cd $out + ${if isMultiBuild then extraBuildCommandsMulti else ""} + ''; + preferLocalBuild = true; + allowSubstitutes = false; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42c87c667d7..f53d231b9c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -153,7 +153,10 @@ in buildEnv = callPackage ../build-support/buildenv { }; # not actually a package - buildFHSUserEnv = callPackage ../build-support/build-fhs-userenv { }; + # TODO: eventually migrate everything to buildFHSUserEnvBubblewrap + buildFHSUserEnv = buildFHSUserEnvChrootenv; + buildFHSUserEnvChrootenv = callPackage ../build-support/build-fhs-userenv { }; + buildFHSUserEnvBubblewrap = callPackage ../build-support/build-fhs-userenv-bubblewrap { }; buildMaven = callPackage ../build-support/build-maven.nix {}; From 2ddb43ec24d82e0d77c5f1402126dbb498ae0440 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Wed, 20 Feb 2019 10:22:17 -0500 Subject: [PATCH 134/520] fhs-userenv-bubblewrap: change to using bubblewrap over chrootenv --- .../build-fhs-userenv-bubblewrap/default.nix | 72 +++++++++++++------ .../build-fhs-userenv-bubblewrap/env.nix | 39 +++++----- 2 files changed, 72 insertions(+), 39 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index e7db6a75297..784aa754df7 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -1,36 +1,70 @@ -{ callPackage, runCommandLocal, writeScript, stdenv, coreutils }: +{ callPackage, runCommandLocal, writeShellScriptBin, stdenv, coreutils, bubblewrap }: let buildFHSEnv = callPackage ./env.nix { }; in -args@{ name, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: +args @ { + name, + runScript ? "bash", + extraInstallCommands ? "", + meta ? {}, + passthru ? {}, + ... +}: +with builtins; let - env = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" ]); + env = buildFHSEnv (removeAttrs args [ + "runScript" "extraInstallCommands" "meta" "passthru" + ]); chrootenv = callPackage ./chrootenv {}; - init = run: writeScript "${name}-init" '' - #! ${stdenv.shell} - for i in ${env}/* /host/*; do - path="/''${i##*/}" - [ -e "$path" ] || ${coreutils}/bin/ln -s "$i" "$path" - done - - [ -d "$1" ] && [ -r "$1" ] && cd "$1" - shift - + init = run: writeShellScriptBin "${name}-init" '' source /etc/profile exec ${run} "$@" ''; + bwrap_cmd = { init_args ? "" }: '' + blacklist="/nix /dev /proc" + ro_mounts="" + for i in ${env}/*; do + path="/''${i##*/}" + ro_mounts="$ro_mounts --ro-bind $i $path" + blacklist="$blacklist $path" + done + + auto_mounts="" + # loop through all directories in the root + for dir in /*; do + # if it is a directory and it is not in the blacklist + if [[ -d "$dir" ]] && grep -v "$dir" <<< "$blacklist" >/dev/null; then + # add it to the mount list + auto_mounts="$auto_mounts --bind $dir $dir" + fi + done + + exec ${bubblewrap}/bin/bwrap \ + --dev /dev \ + --proc /proc \ + --chdir "$(pwd)" \ + --unshare-all \ + --share-net \ + --die-with-parent \ + --ro-bind /nix /nix \ + --ro-bind /etc /host-etc \ + $ro_mounts \ + $auto_mounts \ + ${init runScript}/bin/${name}-init ${init_args} + ''; + + bin = writeShellScriptBin name (bwrap_cmd { init_args = ''"$@"''; }); + in runCommandLocal name { inherit meta; passthru = passthru // { env = runCommandLocal "${name}-shell-env" { - shellHook = '' - exec ${chrootenv}/bin/chrootenv ${init runScript} "$(pwd)" - ''; + shellHook = bwrap_cmd {}; } '' echo >&2 "" echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" @@ -40,10 +74,6 @@ in runCommandLocal name { }; } '' mkdir -p $out/bin - cat <$out/bin/${name} - #! ${stdenv.shell} - exec ${chrootenv}/bin/chrootenv ${init runScript} "\$(pwd)" "\$@" - EOF - chmod +x $out/bin/${name} + ln -s ${bin}/bin/${name} $out/bin/${name} ${extraInstallCommands} '' diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 083e7617b50..5e994abfd21 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -79,39 +79,42 @@ let ln -s ${etcProfile} profile # compatibility with NixOS - ln -s /host/etc/static static + ln -s /host-etc/static static # symlink some NSS stuff - ln -s /host/etc/passwd passwd - ln -s /host/etc/group group - ln -s /host/etc/shadow shadow - ln -s /host/etc/hosts hosts - ln -s /host/etc/resolv.conf resolv.conf - ln -s /host/etc/nsswitch.conf nsswitch.conf + ln -s /host-etc/passwd passwd + ln -s /host-etc/group group + ln -s /host-etc/shadow shadow + ln -s /host-etc/hosts hosts + ln -s /host-etc/resolv.conf resolv.conf + ln -s /host-etc/nsswitch.conf nsswitch.conf # symlink sudo and su stuff - ln -s /host/etc/login.defs login.defs - ln -s /host/etc/sudoers sudoers - ln -s /host/etc/sudoers.d sudoers.d + ln -s /host-etc/login.defs login.defs + ln -s /host-etc/sudoers sudoers + ln -s /host-etc/sudoers.d sudoers.d # symlink other core stuff - ln -s /host/etc/localtime localtime - ln -s /host/etc/zoneinfo zoneinfo - ln -s /host/etc/machine-id machine-id - ln -s /host/etc/os-release os-release + ln -s /host-etc/localtime localtime + ln -s /host-etc/zoneinfo zoneinfo + ln -s /host-etc/machine-id machine-id + ln -s /host-etc/os-release os-release # symlink PAM stuff - ln -s /host/etc/pam.d pam.d + ln -s /host-etc/pam.d pam.d # symlink fonts stuff - ln -s /host/etc/fonts fonts + ln -s /host-etc/fonts fonts # symlink ALSA stuff - ln -s /host/etc/asound.conf asound.conf + ln -s /host-etc/asound.conf asound.conf # symlink SSL certs mkdir -p ssl - ln -s /host/etc/ssl/certs ssl/certs + ln -s /host-etc/ssl/certs ssl/certs + + # Fedora stores certs in another directory + ln -s /host-etc/pki pki # symlink /etc/mtab -> /proc/mounts (compat for old userspace progs) ln -s /proc/mounts mtab From 2da4f24e2259d41419d14565bc371d34a227b599 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Sun, 15 Sep 2019 09:29:53 -0400 Subject: [PATCH 135/520] fhs-userenv-bubblewrap: bind mount parts of host etc directly --- .../build-fhs-userenv-bubblewrap/default.nix | 48 ++++++++++++++++++- .../build-fhs-userenv-bubblewrap/env.nix | 38 --------------- 2 files changed, 46 insertions(+), 40 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 784aa754df7..77958767c97 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -19,20 +19,64 @@ let chrootenv = callPackage ./chrootenv {}; + etcBindFlags = let + files = [ + # NixOS Compatibility + "static" + # Users, Groups, NSS + "passwd" + "group" + "shadow" + "hosts" + "resolv.conf" + "nsswitch.conf" + # Sudo & Su + "login.defs" + "sudoers" + "sudoers.d" + # Time + "localtime" + "zoneinfo" + # Other Core Stuff + "machine-id" + "os-release" + # PAM + "pam.d" + # Fonts + "fonts" + # ALSA + "asound.conf" + # SSL + "ssl/certs" + "pki" + ]; + in concatStringsSep " \\\n " + (map (file: "--ro-bind-try /etc/${file} /etc/${file}") files); + init = run: writeShellScriptBin "${name}-init" '' source /etc/profile exec ${run} "$@" ''; bwrap_cmd = { init_args ? "" }: '' - blacklist="/nix /dev /proc" + blacklist="/nix /dev /proc /etc" ro_mounts="" for i in ${env}/*; do path="/''${i##*/}" + if [[ $path == '/etc' ]]; then + continue + fi ro_mounts="$ro_mounts --ro-bind $i $path" blacklist="$blacklist $path" done + if [[ -d ${env}/etc ]]; then + for i in ${env}/etc/*; do + path="/''${i##*/}" + ro_mounts="$ro_mounts --ro-bind $i /etc$path" + done + fi + auto_mounts="" # loop through all directories in the root for dir in /*; do @@ -51,7 +95,7 @@ let --share-net \ --die-with-parent \ --ro-bind /nix /nix \ - --ro-bind /etc /host-etc \ + ${etcBindFlags} \ $ro_mounts \ $auto_mounts \ ${init runScript}/bin/${name}-init ${init_args} diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 5e994abfd21..08f58471bf0 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -78,44 +78,6 @@ let # environment variables ln -s ${etcProfile} profile - # compatibility with NixOS - ln -s /host-etc/static static - - # symlink some NSS stuff - ln -s /host-etc/passwd passwd - ln -s /host-etc/group group - ln -s /host-etc/shadow shadow - ln -s /host-etc/hosts hosts - ln -s /host-etc/resolv.conf resolv.conf - ln -s /host-etc/nsswitch.conf nsswitch.conf - - # symlink sudo and su stuff - ln -s /host-etc/login.defs login.defs - ln -s /host-etc/sudoers sudoers - ln -s /host-etc/sudoers.d sudoers.d - - # symlink other core stuff - ln -s /host-etc/localtime localtime - ln -s /host-etc/zoneinfo zoneinfo - ln -s /host-etc/machine-id machine-id - ln -s /host-etc/os-release os-release - - # symlink PAM stuff - ln -s /host-etc/pam.d pam.d - - # symlink fonts stuff - ln -s /host-etc/fonts fonts - - # symlink ALSA stuff - ln -s /host-etc/asound.conf asound.conf - - # symlink SSL certs - mkdir -p ssl - ln -s /host-etc/ssl/certs ssl/certs - - # Fedora stores certs in another directory - ln -s /host-etc/pki pki - # symlink /etc/mtab -> /proc/mounts (compat for old userspace progs) ln -s /proc/mounts mtab ''; From 8c91b3c5b76ca54e23ab2af29ae2546381155f7b Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Sun, 15 Sep 2019 15:41:48 -0400 Subject: [PATCH 136/520] fhs-userenv-bubblewrap: bind mount host's devfs Allows us to talk to devices --- pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 77958767c97..267a0865f99 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -88,7 +88,7 @@ let done exec ${bubblewrap}/bin/bwrap \ - --dev /dev \ + --dev-bind /dev /dev \ --proc /proc \ --chdir "$(pwd)" \ --unshare-all \ From b7c09b50ffabd19ba5ffe32d768e382254737a7c Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 31 Jul 2020 14:52:12 +0200 Subject: [PATCH 137/520] steam: use buildFHSUserEnvBubblewrap Fixes #92798 --- pkgs/games/steam/default.nix | 5 +++-- pkgs/games/steam/{chrootenv.nix => fhsenv.nix} | 0 pkgs/top-level/all-packages.nix | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) rename pkgs/games/steam/{chrootenv.nix => fhsenv.nix} (100%) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 5aab54b8322..ff2c6e13288 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,4 +1,4 @@ -{ pkgs, newScope }: +{ pkgs, newScope, buildFHSUserEnv }: let callPackage = newScope self; @@ -12,12 +12,13 @@ let steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { }; steam = callPackage ./steam.nix { }; steam-fonts = callPackage ./fonts.nix { }; - steam-chrootenv = callPackage ./chrootenv.nix { + steam-fhsenv = callPackage ./fhsenv.nix { glxinfo-i686 = pkgs.pkgsi686Linux.glxinfo; steam-runtime-wrapped-i686 = if steamArch == "amd64" then pkgs.pkgsi686Linux.steamPackages.steam-runtime-wrapped else null; + inherit buildFHSUserEnv; }; steamcmd = callPackage ./steamcmd.nix { }; }; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/fhsenv.nix similarity index 100% rename from pkgs/games/steam/chrootenv.nix rename to pkgs/games/steam/fhsenv.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f53d231b9c4..3dfa7f1f34b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24673,9 +24673,11 @@ in stockfish = callPackage ../games/stockfish { }; - steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { }); + steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; + }); - steam = steamPackages.steam-chrootenv; + steam = steamPackages.steam-fhsenv; steam-run = steam.run; steam-run-native = (steam.override { From 46d8f1a8a23a9b6e6cc9b12ff5af1e6bb83d53d1 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 31 Jul 2020 15:14:40 +0200 Subject: [PATCH 138/520] lutris: use buildFHSUserEnvBubblewrap --- pkgs/applications/misc/lutris/{chrootenv.nix => fhsenv.nix} | 0 pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) rename pkgs/applications/misc/lutris/{chrootenv.nix => fhsenv.nix} (100%) diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix similarity index 100% rename from pkgs/applications/misc/lutris/chrootenv.nix rename to pkgs/applications/misc/lutris/fhsenv.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dfa7f1f34b..1b3475ba449 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21222,7 +21222,9 @@ in inherit (gnome3) gnome-desktop libgnome-keyring; wine = wineWowPackages.staging; }; - lutris = callPackage ../applications/misc/lutris/chrootenv.nix { }; + lutris = callPackage ../applications/misc/lutris/fhsenv.nix { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; + }; lutris-free = lutris.override { steamSupport = false; }; From 3f5157f12267e7502d0f5e6c913f18b007993377 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 31 Jul 2020 15:28:57 +0200 Subject: [PATCH 139/520] android-studio: use buildFHSUserEnvBubblewrap --- pkgs/applications/editors/android-studio/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index c699f111e1e..c622a1fcead 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -1,4 +1,4 @@ -{ callPackage, makeFontsConf, gnome2 }: +{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv }: let mkStudio = opts: callPackage (import ./common.nix opts) { @@ -6,6 +6,7 @@ let fontDirectories = []; }; inherit (gnome2) GConf gnome_vfs; + inherit buildFHSUserEnv; }; stableVersion = { version = "4.0.1.0"; # "Android Studio 4.0.1" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b3475ba449..0e23dee4469 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19086,7 +19086,9 @@ in amsn = callPackage ../applications/networking/instant-messengers/amsn { }; androidStudioPackages = recurseIntoAttrs - (callPackage ../applications/editors/android-studio { }); + (callPackage ../applications/editors/android-studio { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; + }); android-studio = androidStudioPackages.stable; animbar = callPackage ../applications/graphics/animbar { }; From ee803f30bab0b7c6183e1da076cfb081c8495e69 Mon Sep 17 00:00:00 2001 From: Andika Demas Riyandi Date: Mon, 17 Aug 2020 15:04:46 +0700 Subject: [PATCH 140/520] nixpkgs-fmt: 0.9.0 -> 1.0.0 --- pkgs/tools/nix/nixpkgs-fmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index 432f13d86f4..44e41857759 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "nixpkgs-fmt"; - version = "0.9.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "1kkw87c63nx5pqsxcwn6iw27k02j9ls21zyhb5dvf0zaqd9sz7ad"; + sha256 = "sha256-rO30/B+mH/ZOEH8IF2fF4uHK7XQqyR4zIDueHnmNMHA="; }; - cargoSha256 = "1wybvm9qckx9cd656gx9zrbszmaj66ihh2kk6qqdb6maixcq5k0x"; + cargoSha256 = "sha256-fP/8yDg+W7hiWGucbRr338y9PEDTb2bdq71JKE6M8OM="; meta = with lib; { description = "Nix code formatter for nixpkgs"; From b1d86d0e51c9eafbb629f3cd782cfe954e687421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 17 Aug 2020 08:49:34 +0100 Subject: [PATCH 141/520] build-fhs-user-env-bubblewrap: consistent camelCase --- .../build-fhs-userenv-bubblewrap/default.nix | 8 ++++---- pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 267a0865f99..c7cfd27d3fa 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -58,7 +58,7 @@ let exec ${run} "$@" ''; - bwrap_cmd = { init_args ? "" }: '' + bwrapCmd = { initArgs ? "" }: '' blacklist="/nix /dev /proc /etc" ro_mounts="" for i in ${env}/*; do @@ -98,17 +98,17 @@ let ${etcBindFlags} \ $ro_mounts \ $auto_mounts \ - ${init runScript}/bin/${name}-init ${init_args} + ${init runScript}/bin/${name}-init ${initArgs} ''; - bin = writeShellScriptBin name (bwrap_cmd { init_args = ''"$@"''; }); + bin = writeShellScriptBin name (bwrapCmd { initArgs = ''"$@"''; }); in runCommandLocal name { inherit meta; passthru = passthru // { env = runCommandLocal "${name}-shell-env" { - shellHook = bwrap_cmd {}; + shellHook = bwrapCmd {}; } '' echo >&2 "" echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 08f58471bf0..8b2d46c4ae9 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -99,14 +99,14 @@ let }; # setup library paths only for the targeted architecture - setupLibDirs_target = '' + setupLibDirsTarget = '' # link content of targetPaths cp -rsHf ${staticUsrProfileTarget}/lib lib ln -s lib lib${if is64Bit then "64" else "32"} ''; # setup /lib, /lib32 and /lib64 - setupLibDirs_multi = '' + setupLibDirsMulti = '' mkdir -m0755 lib32 mkdir -m0755 lib64 ln -s lib64 lib @@ -124,8 +124,8 @@ let ln -Ls ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/ ''; - setupLibDirs = if isTargetBuild then setupLibDirs_target - else setupLibDirs_multi; + setupLibDirs = if isTargetBuild then setupLibDirsTarget + else setupLibDirsMulti; # the target profile is the actual profile that will be used for the chroot setupTargetProfile = '' From d2abb868cc2ceee7f0e4469d854c100526c7b319 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 3 Mar 2020 11:07:20 +0100 Subject: [PATCH 142/520] slurm: 19.05.7.1 -> 20.02.0.1 --- pkgs/servers/computing/slurm/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index d93c1371959..857a20c6db8 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl -, python, munge, perl, pam, zlib, shadow, coreutils +, python3, munge, perl, pam, zlib, shadow, coreutils , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , readline, freeipmi, xorg, lz4, rdma-core, nixosTests , pmix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "19.05.7.1"; + version = "20.02.0.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "115f40k8y7d569nbl6g0mkyshgv925lawlwar7ib5296g30p97f0"; + sha256 = "1prbnxm3y5k81lid9i3jfxida162khnjnvp8mrwmk44g0304cy0y"; }; outputs = [ "out" "dev" ]; @@ -44,9 +44,9 @@ stdenv.mkDerivation rec { # this doesn't fix tests completely at least makes slurmd to launch hardeningDisable = [ "bindnow" ]; - nativeBuildInputs = [ pkgconfig libtool ]; + nativeBuildInputs = [ pkgconfig libtool python3 ]; buildInputs = [ - curl python munge perl pam zlib + curl python3 munge perl pam zlib libmysqlclient ncurses gtk2 lz4 rdma-core lua hwloc numactl readline freeipmi shadow.su pmix From 176353699723b877c31ab562c064603812439d7f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 9 Jul 2020 23:50:41 +0200 Subject: [PATCH 143/520] slurm: 20.02.0.1 -. 20.02.3.1 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 857a20c6db8..8673bfab4b9 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.02.0.1"; + version = "20.02.3.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1prbnxm3y5k81lid9i3jfxida162khnjnvp8mrwmk44g0304cy0y"; + sha256 = "0ydz02kgydn8lgimikksyf3sai33bz0lkxjjx4514b65431mwp3n"; }; outputs = [ "out" "dev" ]; From f01e33e7957329b0f9394370ebed3d42381b28d3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Aug 2020 13:12:21 +0200 Subject: [PATCH 144/520] slurm: 20.02.3.1 -> 20.02.4.1 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 8673bfab4b9..2b06671e4e0 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.02.3.1"; + version = "20.02.4.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "0ydz02kgydn8lgimikksyf3sai33bz0lkxjjx4514b65431mwp3n"; + sha256 = "071lwny7cj4idq0h03mmvkk4f4i6fgl3c5q8cvbh7z8px6k50cfp"; }; outputs = [ "out" "dev" ]; From 2021a4b8703cefe575f4431708b970d219e9983e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 17 Aug 2020 04:20:00 -0500 Subject: [PATCH 145/520] postgresqlPackages.plpgsql_check: init at 1.13.1 --- .../sql/postgresql/ext/plpgsql_check.nix | 29 +++++++++++++++++++ pkgs/servers/sql/postgresql/packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/ext/plpgsql_check.nix diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix new file mode 100644 index 00000000000..b95ef73308d --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + pname = "plpgsql_check"; + version = "1.13.1"; + + src = fetchFromGitHub { + owner = "okbob"; + repo = pname; + rev = "v${version}"; + sha256 = "19vcvfhxh0922qgibahmkyf7czniycqbzccxdw65j1ia7fd8yyc3"; + }; + + buildInputs = [ postgresql ]; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; + + meta = with stdenv.lib; { + description = "Linter tool for language PL/pgSQL"; + homepage = "https://github.com/okbob/plpgsql_check"; + platforms = postgresql.meta.platforms; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 44d8ff9cbb8..44e560a5f83 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -21,6 +21,8 @@ self: super: { pgroonga = super.callPackage ./ext/pgroonga.nix { }; + plpgsql_check = super.callPackage ./ext/plpgsql_check.nix { }; + plv8 = super.callPackage ./ext/plv8.nix { v8 = super.callPackage ../../../development/libraries/v8/plv8_6_x.nix { python = self.python2; From 36a6c0a1a325610b49019e2c89e2a87957287f76 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 17 Aug 2020 04:42:00 -0500 Subject: [PATCH 146/520] tflint: 0.18.0 -> 0.19.0 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 57d1b33f32f..b4e66f507d1 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "0644hzb7cpcqksl7j6v11dcq26la7g5l1svkmgm9c674gbv7argv"; + sha256 = "14pgsx136ibaf1mqkwn8ibnn4g6q5xx0r7xbijj521v12m145i8g"; }; - vendorSha256 = "1khb8rdy5agj904nig6dfhagckvfcx79f028wcvwr625la3pcjfc"; + vendorSha256 = "0bzd58ry5k100mjgvl1mxz7aysm75s4vkilcykrqy1s5sc0h3ng5"; doCheck = false; From 6ea2c0b2262d211a2d1c115f4895b2c858ba6263 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Aug 2020 10:41:09 +0000 Subject: [PATCH 147/520] python37Packages.prawcore: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/prawcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 39e3bb239c6..7be75eae90a 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "prawcore"; - version = "1.4.0"; + version = "1.5.0"; disabled = isPy27; # see https://github.com/praw-dev/prawcore/pull/101 src = fetchPypi { inherit pname version; - sha256 = "cf71388d869becbcbdfd90258b19d2173c197a457f2dd0bef0566b6cfb9b95a1"; + sha256 = "1f1eafc8a65d671f9892354f73142014fbb5d3a9ee621568c662d0a354e0578b"; }; propagatedBuildInputs = [ From 44a8c33ebaad09febf6003807893874d321988a0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 17 Aug 2020 13:11:43 +0200 Subject: [PATCH 148/520] john: ship internal perl modules --- pkgs/tools/security/john/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index f47728b8ba2..2fedec48c70 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -48,20 +48,21 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; postInstall = '' - mkdir -p "$out/bin" "$out/etc/john" "$out/share/john" "$out/share/doc/john" "$out/share/john/rules" + mkdir -p "$out/bin" "$out/etc/john" "$out/share/john" "$out/share/doc/john" "$out/share/john/rules" "$out/${perlPackages.perl.libPrefix}" find -L ../run -mindepth 1 -maxdepth 1 -type f -executable \ -exec cp -d {} "$out/bin" \; cp -vt "$out/etc/john" ../run/*.conf cp -vt "$out/share/john" ../run/*.chr ../run/password.lst cp -vt "$out/share/john/rules" ../run/rules/*.rule cp -vrt "$out/share/doc/john" ../doc/* + cp -vt "$out/${perlPackages.perl.libPrefix}" ../run/lib/* ''; postFixup = '' wrapPythonPrograms for i in $out/bin/*.pl; do - wrapProgram "$i" --prefix PERL5LIB : $PERL5LIB + wrapProgram "$i" --prefix PERL5LIB : "$PERL5LIB:$out/${perlPackages.perl.libPrefix}" done ''; From 1d51b526e4ecf20cb98f443bb95abbf9dc0aa313 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 17 Aug 2020 13:25:46 +0200 Subject: [PATCH 149/520] nixos/fonts/fontconfig-penultimate: remove module --- .../config/fonts/fontconfig-penultimate.nix | 292 ------------------ nixos/modules/config/fonts/fontconfig.nix | 2 +- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + 4 files changed, 2 insertions(+), 294 deletions(-) delete mode 100644 nixos/modules/config/fonts/fontconfig-penultimate.nix diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix deleted file mode 100644 index 7e311a21acf..00000000000 --- a/nixos/modules/config/fonts/fontconfig-penultimate.nix +++ /dev/null @@ -1,292 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.fonts.fontconfig; - - fcBool = x: "" + (boolToString x) + ""; - - # back-supported fontconfig version and package - # version is used for font cache generation - supportVersion = "210"; - supportPkg = pkgs."fontconfig_${supportVersion}"; - - # latest fontconfig version and package - # version is used for configuration folder name, /etc/fonts/VERSION/ - # note: format differs from supportVersion and can not be used with makeCacheConf - latestVersion = pkgs.fontconfig.configVersion; - latestPkg = pkgs.fontconfig; - - # supported version fonts.conf - supportFontsConf = pkgs.makeFontsConf { fontconfig = supportPkg; fontDirectories = config.fonts.fonts; }; - - # configuration file to read fontconfig cache - # version dependent - # priority 0 - cacheConfSupport = makeCacheConf { version = supportVersion; }; - cacheConfLatest = makeCacheConf {}; - - # generate the font cache setting file for a fontconfig version - # use latest when no version is passed - makeCacheConf = { version ? null }: - let - fcPackage = if version == null - then "fontconfig" - else "fontconfig_${version}"; - makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; - cache = makeCache pkgs.${fcPackage}; - cache32 = makeCache pkgs.pkgsi686Linux.${fcPackage}; - in - pkgs.writeText "fc-00-nixos-cache.conf" '' - - - - - ${concatStringsSep "\n" (map (font: "${font}") config.fonts.fonts)} - - ${cache} - ${optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) '' - ${cache32} - ''} - - ''; - - # local configuration file - localConf = pkgs.writeText "fc-local.conf" cfg.localConf; - - # rendering settings configuration files - # priority 10 - hintingConf = pkgs.writeText "fc-10-hinting.conf" '' - - - - - - - - ${fcBool cfg.hinting.enable} - - - ${fcBool cfg.hinting.autohint} - - - hintslight - - - - - ''; - - antialiasConf = pkgs.writeText "fc-10-antialias.conf" '' - - - - - - - - ${fcBool cfg.antialias} - - - - - ''; - - subpixelConf = pkgs.writeText "fc-10-subpixel.conf" '' - - - - - - - - ${cfg.subpixel.rgba} - - - lcd${cfg.subpixel.lcdfilter} - - - - - ''; - - dpiConf = pkgs.writeText "fc-11-dpi.conf" '' - - - - - - - ${toString cfg.dpi} - - - - - ''; - - # default fonts configuration file - # priority 52 - defaultFontsConf = - let genDefault = fonts: name: - optionalString (fonts != []) '' - - ${name} - - ${concatStringsSep "" - (map (font: '' - ${font} - '') fonts)} - - - ''; - in - pkgs.writeText "fc-52-nixos-default-fonts.conf" '' - - - - - - ${genDefault cfg.defaultFonts.sansSerif "sans-serif"} - - ${genDefault cfg.defaultFonts.serif "serif"} - - ${genDefault cfg.defaultFonts.monospace "monospace"} - - - ''; - - # reject Type 1 fonts - # priority 53 - rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" '' - - - - - - - - - Type 1 - - - - - - ''; - - # The configuration to be included in /etc/font/ - penultimateConf = pkgs.runCommand "fontconfig-penultimate-conf" { - preferLocalBuild = true; - } '' - support_folder=$out/etc/fonts/conf.d - latest_folder=$out/etc/fonts/${latestVersion}/conf.d - - mkdir -p $support_folder - mkdir -p $latest_folder - - # fonts.conf - ln -s ${supportFontsConf} $support_folder/../fonts.conf - ln -s ${latestPkg.out}/etc/fonts/fonts.conf \ - $latest_folder/../fonts.conf - - # fontconfig-penultimate various configuration files - ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \ - $support_folder - ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \ - $latest_folder - - ln -s ${cacheConfSupport} $support_folder/00-nixos-cache.conf - ln -s ${cacheConfLatest} $latest_folder/00-nixos-cache.conf - - rm $support_folder/10-antialias.conf $latest_folder/10-antialias.conf - ln -s ${antialiasConf} $support_folder/10-antialias.conf - ln -s ${antialiasConf} $latest_folder/10-antialias.conf - - rm $support_folder/10-hinting.conf $latest_folder/10-hinting.conf - ln -s ${hintingConf} $support_folder/10-hinting.conf - ln -s ${hintingConf} $latest_folder/10-hinting.conf - - ${optionalString cfg.useEmbeddedBitmaps '' - rm $support_folder/10-no-embedded-bitmaps.conf - rm $latest_folder/10-no-embedded-bitmaps.conf - ''} - - rm $support_folder/10-subpixel.conf $latest_folder/10-subpixel.conf - ln -s ${subpixelConf} $support_folder/10-subpixel.conf - ln -s ${subpixelConf} $latest_folder/10-subpixel.conf - - ${optionalString (cfg.dpi != 0) '' - ln -s ${dpiConf} $support_folder/11-dpi.conf - ln -s ${dpiConf} $latest_folder/11-dpi.conf - ''} - - # 50-user.conf - ${optionalString (!cfg.includeUserConf) '' - rm $support_folder/50-user.conf - rm $latest_folder/50-user.conf - ''} - - # 51-local.conf - rm $latest_folder/51-local.conf - substitute \ - ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/51-local.conf \ - $latest_folder/51-local.conf \ - --replace local.conf /etc/fonts/${latestVersion}/local.conf - - # local.conf (indirect priority 51) - ${optionalString (cfg.localConf != "") '' - ln -s ${localConf} $support_folder/../local.conf - ln -s ${localConf} $latest_folder/../local.conf - ''} - - # 52-nixos-default-fonts.conf - ln -s ${defaultFontsConf} $support_folder/52-nixos-default-fonts.conf - ln -s ${defaultFontsConf} $latest_folder/52-nixos-default-fonts.conf - - # 53-no-bitmaps.conf - ${optionalString cfg.allowBitmaps '' - rm $support_folder/53-no-bitmaps.conf - rm $latest_folder/53-no-bitmaps.conf - ''} - - ${optionalString (!cfg.allowType1) '' - # 53-nixos-reject-type1.conf - ln -s ${rejectType1} $support_folder/53-nixos-reject-type1.conf - ln -s ${rejectType1} $latest_folder/53-nixos-reject-type1.conf - ''} - ''; - -in -{ - - options = { - - fonts = { - - fontconfig = { - - penultimate = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable fontconfig-penultimate settings to supplement the - NixOS defaults by providing per-font rendering defaults and - metric aliases. - ''; - }; - }; - - }; - }; - - }; - - config = mkIf (config.fonts.fontconfig.enable && config.fonts.fontconfig.penultimate.enable) { - - fonts.fontconfig.confPackages = [ penultimateConf ]; - - }; - -} diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 84643019471..a695957f71b 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -455,7 +455,7 @@ in environment.systemPackages = [ pkgs.fontconfig ]; environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/"; }) - (mkIf (cfg.enable && !cfg.penultimate.enable) { + (mkIf cfg.enable { fonts.fontconfig.confPackages = [ confPkg ]; }) ]; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 08ed6e63e72..e7b7ad1194c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1,7 +1,6 @@ [ ./config/debug-info.nix ./config/fonts/fontconfig.nix - ./config/fonts/fontconfig-penultimate.nix ./config/fonts/fontdir.nix ./config/fonts/fonts.nix ./config/fonts/ghostscript.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index ef7e3354112..86cd3bf8dcf 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -17,6 +17,7 @@ with lib; (mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ]) # Completely removed modules + (mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.") (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "") From 119401d811dc9a106293bb57671ac1528024c929 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 17 Aug 2020 13:26:05 +0200 Subject: [PATCH 150/520] fontconfig-penultimate: remove package --- .../fonts/fontconfig-penultimate/default.nix | 24 ------------------- pkgs/top-level/aliases.nix | 4 ++++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 pkgs/data/fonts/fontconfig-penultimate/default.nix diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix deleted file mode 100644 index 5216cf0e3d8..00000000000 --- a/pkgs/data/fonts/fontconfig-penultimate/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, fetchzip -, version ? "0.3.5" -, sha256 ? "1gfgl7qimp76q4z0nv55vv57yfs4kscdr329np701k0xnhncwvrk" -}: - -fetchzip { - name = "fontconfig-penultimate-${version}"; - - url = "https://github.com/ttuegel/fontconfig-penultimate/archive/${version}.zip"; - inherit sha256; - - postFetch = '' - mkdir -p $out/etc/fonts/conf.d - unzip -j $downloadedFile \*.conf -d $out/etc/fonts/conf.d - ''; - - meta = with lib; { - homepage = "https://github.com/ttuegel/fontconfig-penultimate"; - description = "Sensible defaults for Fontconfig"; - license = licenses.asl20; - maintainers = [ maintainers.ttuegel ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e3aa478a4f5..5882eadc73b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -140,6 +140,10 @@ mapAliases ({ fontconfig-ultimate has been removed. The repository has been archived upstream and activity has ceased for several years. https://github.com/bohoomil/fontconfig-ultimate/issues/171. ''; + fontconfig-penultimate = throw '' + fontconfig-penultimate has been removed. + It was a fork of the abandoned fontconfig-ultimate. + ''; # 2020-07-21 fontconfig_210 = throw '' fontconfig 2.10.x hasn't had a release in years, is vulnerable to CVE-2016-5384 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f406e01e19..f895fe09266 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12103,8 +12103,6 @@ in fontconfig = callPackage ../development/libraries/fontconfig { }; - fontconfig-penultimate = callPackage ../data/fonts/fontconfig-penultimate {}; - folly = callPackage ../development/libraries/folly { }; folks = callPackage ../development/libraries/folks { }; From f6c3d4f723d9c8f1809308ec91ff2f63f6475b29 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Mon, 17 Aug 2020 14:09:12 +0200 Subject: [PATCH 151/520] transmission: fix BindReadOnlyPaths= --- nixos/modules/services/torrent/transmission.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 92df46083ec..6041a1b182d 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -225,9 +225,7 @@ in # No confinement done of /nix/store here like in systemd-confinement.nix, # an AppArmor profile is provided to get a confinement based upon paths and rights. builtins.storeDir - "-/etc/hosts" - "-/etc/ld-nix.so.preload" - "-/etc/localtime" + "/etc" ] ++ optional (cfg.settings.script-torrent-done-enabled && cfg.settings.script-torrent-done-filename != "") From 5bb0129062e05655d3408ebdc5e3a27141cefd83 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 17 Aug 2020 14:49:42 +0200 Subject: [PATCH 152/520] fcft: enable tests, use release build type --- pkgs/development/libraries/fcft/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 2cb056437cb..0c5d2b334ac 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, pkg-config, meson, ninja, scdoc -,freetype, fontconfig, pixman, tllist }: +,freetype, fontconfig, pixman, tllist, check }: stdenv.mkDerivation rec { pname = "fcft"; @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [ freetype fontconfig pixman tllist ]; + checkInputs = [ check ]; + + mesonFlags = [ "--buildtype=release" ]; + + doCheck = true; meta = with lib; { homepage = "https://codeberg.org/dnkl/fcft"; From 0c6905244fda4d74f515557aeb1eb9c18ae8cd99 Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 17 Aug 2020 21:45:54 +0800 Subject: [PATCH 153/520] rust-analyzer: 2020-08-10 -> 2020-08-17 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 5424d8d2a33..515ff94ac7a 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-08-10"; + rev = "2020-08-17"; version = "unstable-${rev}"; - sha256 = "0hf9gpvgq7whrc5gnfhc0wjqddp3xpi3azvdccb4yql2pcznz3rh"; - cargoSha256 = "1bwch08y2av7aj2l5pvhdxdq24c8favxppz5zcd88rx4brlwn2bq"; + sha256 = "1lkqhaygl6wak3hypmn3zb2h0v4n082xbpaywmzqr53vhw678sp0"; + cargoSha256 = "00a2fxq1kwybng3gp33lkad4c7wrz0gypigxkalqkyy4nbg3qil4"; }; rust-analyzer = callPackage ./wrapper.nix {} { From 9da079c6ff5e2870485ed014fe388a5c67997535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 12 Aug 2020 19:10:14 +0200 Subject: [PATCH 154/520] Re-Revert "linux: Init 5.8" This reverts commit fee8c0ae0739f847241fc1de2b619b4057e818a1. The required systemd update was done in 9f911ab1b5; test works for me: nix build -f nixos/release.nix tests.latestKernel.login.x86_64-linux --- pkgs/os-specific/linux/kernel/linux-5.8.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 ++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-5.8.nix diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix new file mode 100644 index 00000000000..a7b929740d2 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "5.8"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1xgibkwb1yfl6qdlbxyagai0qc1pk5ark7giz1512hh6ma353xz7"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b6baf4af2e..ad12f91d9d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17401,6 +17401,14 @@ in ]; }; + linux_5_8 = callPackage ../os-specific/linux/kernel/linux-5.8.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -17624,7 +17632,7 @@ in # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_7; + linuxPackages_latest = linuxPackages_5_8; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -17639,6 +17647,7 @@ in linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_7); + linuxPackages_5_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_8); # When adding to this list: # - Update linuxPackages_latest to the latest version From b5caca265e97123af8fd850f2347cfd4aad258a4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 14 Aug 2020 19:52:58 +0300 Subject: [PATCH 155/520] screenkey: 0.9 -> 1.2 - Use Python 3. - Switch to gobject-introspection and other more maintained libraries (vs PyGTK). - Use `fetchFromGitLab`. - Replace the non absolute paths fix in `xlib.py` with `substituteInPlace`. --- pkgs/applications/video/screenkey/default.nix | 71 +++++++++++-------- pkgs/applications/video/screenkey/paths.patch | 20 ------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 43 insertions(+), 50 deletions(-) delete mode 100644 pkgs/applications/video/screenkey/paths.patch diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index 7e2bc3a3ec0..00ead0f89a3 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -1,53 +1,66 @@ { lib -, substituteAll -, buildPythonApplication -, fetchFromGitHub -, distutils_extra -, setuptools-git +, fetchFromGitLab +# native , intltool -, pygtk -, libX11 -, libXtst , wrapGAppsHook -, gnome3 +, file +# not native +, xorg +, gobject-introspection +, gtk3 +, python3 }: -buildPythonApplication rec { - pname = "screenkey"; - version = "0.9"; - src = fetchFromGitHub { - owner = "wavexx"; +python3.pkgs.buildPythonApplication rec { + pname = "screenkey"; + version = "1.2"; + + src = fetchFromGitLab { + owner = "screenkey"; repo = "screenkey"; - rev = "screenkey-${version}"; - sha256 = "14g7fiv9n7m03djwz1pp5034pffi87ssvss9bc1q8vq0ksn23vrw"; + rev = "v${version}"; + sha256 = "1x13n57iy2pg3h3r994q3g5nbmh2gwk3qidmmcv0g7qa89n2gwbj"; }; - patches = [ - (substituteAll { - src = ./paths.patch; - inherit libX11 libXtst; - }) - ]; - nativeBuildInputs = [ - distutils_extra - setuptools-git + python3.pkgs.distutils_extra + # Shouldn't be needed once https://gitlab.com/screenkey/screenkey/-/issues/122 is fixed. intltool - + # We are not sure why is this needed, but without it we get "file: command + # not found" errors during build. + file wrapGAppsHook + # for setup hook + gobject-introspection ]; buildInputs = [ - gnome3.adwaita-icon-theme + gtk3 ]; - propagatedBuildInputs = [ - pygtk + propagatedBuildInputs = with python3.pkgs; [ + pycairo + pygobject3 ]; + # Prevent double wrapping because of wrapGAppsHook + dontWrapGApps = true; + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + # screenkey does not have any tests doCheck = false; + # Fix CDLL python calls for non absolute paths of xorg libraries + postPatch = '' + substituteInPlace Screenkey/xlib.py \ + --replace libX11.so.6 ${lib.getLib xorg.libX11}/lib/libX11.so.6 \ + --replace libXtst.so.6 ${lib.getLib xorg.libXtst}/lib/libXtst.so.6 + ''; + meta = with lib; { homepage = "https://www.thregr.org/~wavexx/software/screenkey/"; description = "A screencast tool to display your keys inspired by Screenflick"; diff --git a/pkgs/applications/video/screenkey/paths.patch b/pkgs/applications/video/screenkey/paths.patch deleted file mode 100644 index 7e5ed47fc19..00000000000 --- a/pkgs/applications/video/screenkey/paths.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Screenkey/xlib.py -+++ b/Screenkey/xlib.py -@@ -6,7 +6,7 @@ - from ctypes import * - - ## base X11 --libX11 = CDLL('libX11.so.6') -+libX11 = CDLL('@libX11@/lib/libX11.so.6') - - # types - Atom = c_ulong -@@ -278,7 +278,7 @@ - - - ## record extensions --libXtst = CDLL('libXtst.so.6') -+libXtst = CDLL('@libXtst@/lib/libXtst.so.6') - - # types - XPointer = String \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 933a7544fb7..2d657d83fdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6680,7 +6680,7 @@ in quazip = quazip_qt4; }; - screenkey = python2Packages.callPackage ../applications/video/screenkey { }; + screenkey = callPackage ../applications/video/screenkey { }; quazip_qt4 = libsForQt5.quazip.override { qtbase = qt4; From 496818f702f01dd8a896d702f2d75029d9af924b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Aug 2020 01:19:07 +0000 Subject: [PATCH 156/520] gnome3.mutter: 3.36.4 -> 3.36.5 --- pkgs/desktops/gnome-3/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 071245ae1ea..79cbbb9f5a8 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -42,13 +42,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "3.36.4"; + version = "3.36.5"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0p3jglw6f2h67kwk89qz1rz23y25lip8m2mp2xshf2vrg4a930as"; + sha256 = "1py7sqrpvg2qvswxclshysx7hd9jk65i6cwqsagd6rg6rnjhblp0"; }; patches = [ From 6e34cdadd3d863f65fccce346fa34f6d00aa8b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Mon, 17 Aug 2020 17:30:58 +0200 Subject: [PATCH 157/520] aisleriot: 3.22.9 -> 3.22.11 --- .../gnome-3/games/aisleriot/default.nix | 65 +++++++++++++++---- 1 file changed, 53 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index e4de15c79b2..9ea68b02ea8 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -1,23 +1,64 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 -, wrapGAppsHook, librsvg, libxml2, desktop-file-utils -, guile_2_0, libcanberra-gtk3 }: +{ stdenv +, fetchFromGitLab +, pkg-config +, gnome3 +, itstool +, gtk3 +, wrapGAppsHook +, meson +, librsvg +, libxml2 +, desktop-file-utils +, pysolfc +, guile +, libcanberra-gtk3 +, ninja +, appstream-glib +, yelp-tools +}: stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.9"; + version = "3.22.11"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0yzdh9cw5cjjgvfh75bihl968czlgfmpmn1z0fdk88sgvpjgzwji"; + src = fetchFromGitLab { + owner = "GNOME"; + repo = pname; + domain = "gitlab.gnome.org"; + rev = "${version}"; + sha256 = "1asm0y6485xqsysdg586y3hzz8bhxqwnc82k6vhfnxpxz7l62qa1"; }; - configureFlags = [ - "--with-card-theme-formats=svg" - "--with-platform=gtk-only" # until they remove GConf + nativeBuildInputs = [ + wrapGAppsHook + meson + ninja + appstream-glib + pkg-config + itstool + libxml2 + desktop-file-utils + yelp-tools ]; - nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 desktop-file-utils ]; - buildInputs = [ gtk3 librsvg guile_2_0 libcanberra-gtk3 ]; + buildInputs = [ + gtk3 + librsvg + guile + libcanberra-gtk3 + pysolfc + ]; + + prePatch = '' + patchShebangs cards/meson_svgz.sh + patchShebangs data/meson_desktopfile.py + patchShebangs data/icons/meson_updateiconcache.py + patchShebangs src/lib/meson_compileschemas.py + ''; + + mesonFlags = [ + "-Dtheme_kde=false" + ]; passthru = { updateScript = gnome3.updateScript { From fabd80d93b09bcd9ef569b51b4c52b7d7fd6a2b9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 16 Aug 2020 22:09:02 -0700 Subject: [PATCH 158/520] python3Packages.azure-storage-blob: 2.1.0 -> 12.4.0 --- .../python-modules/azure-storage-blob/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 5ec0dc9f6eb..964ec3c0d13 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -2,23 +2,28 @@ , buildPythonPackage , fetchPypi , azure-common +, azure-core , azure-storage-common +, msrest , isPy3k , futures }: buildPythonPackage rec { pname = "azure-storage-blob"; - version = "2.1.0"; + version = "12.4.0"; src = fetchPypi { inherit pname version; - sha256 = "b90323aad60f207f9f90a0c4cf94c10acc313c20b39403398dfba51f25f7b454"; + extension = "zip"; + sha256 = "1s03daq5mxh9acbv8qpa55c2wmjvdf8jq071cwv65mrly8prp84n"; }; propagatedBuildInputs = [ azure-common + azure-core azure-storage-common + msrest ] ++ lib.optional (!isPy3k) futures; # has no tests From d345b010f422dc72fa95f763c0f8ade6cefddf34 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 17 Aug 2020 18:00:10 +0200 Subject: [PATCH 159/520] gwc: init at 0.22-4 (#88975) --- pkgs/applications/audio/gwc/default.nix | 47 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/audio/gwc/default.nix diff --git a/pkgs/applications/audio/gwc/default.nix b/pkgs/applications/audio/gwc/default.nix new file mode 100644 index 00000000000..d9631ac45e6 --- /dev/null +++ b/pkgs/applications/audio/gwc/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, alsaLib +, libpulseaudio +, gtk2 +, hicolor-icon-theme +, libsndfile +, fftw +}: + +stdenv.mkDerivation rec { + pname = "gwc"; + version = "0.22-04"; + + src = fetchFromGitHub { + owner = "AlisterH"; + repo = pname; + rev = version; + sha256 = "0xvfra32dchnnyf9kj5s5xmqhln8jdrc9f0040hjr2dsb58y206p"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + alsaLib + libpulseaudio + gtk2 + hicolor-icon-theme + libsndfile + fftw + ]; + + enableParallelBuilding = false; # Fails to generate machine.h in time. + + meta = with stdenv.lib; { + description = "GUI application for removing noise (hiss, pops and clicks) from audio files"; + homepage = "https://github.com/AlisterH/gwc/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f406e01e19..4e5fb58fa20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20574,6 +20574,8 @@ in guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; + gwc = callPackage ../applications/audio/gwc { }; + gxmessage = callPackage ../applications/misc/gxmessage { }; gxmatcheq-lv2 = callPackage ../applications/audio/gxmatcheq-lv2 { }; From 47437afc00ba627e140e807fff66ac04bac2c9ca Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 17 Aug 2020 18:01:08 +0200 Subject: [PATCH 160/520] inxi: 3.1.05-4 -> 3.1.06-1 --- pkgs/tools/system/inxi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 3f1e2d9a059..4a59facb27b 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.1.05-4"; + version = "3.1.06-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "10x3rjydc9mlbfysj5mc6z9yfnhp9wllbza2cmjb1fz0x72rfrv7"; + sha256 = "11z90x7rwzm7krkcnmcs9f41i1d284vrj0aqk2xnvl3p79vx25f7"; }; buildInputs = [ perl makeWrapper ]; From 147c1d58cf64dc0655d599ad6fb3ca1ae1cdd9c1 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 17 Aug 2020 18:01:23 +0200 Subject: [PATCH 161/520] bschaffl: init at 0.3 (#91341) --- pkgs/applications/audio/bschaffl/default.nix | 28 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/audio/bschaffl/default.nix diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/applications/audio/bschaffl/default.nix new file mode 100644 index 00000000000..de8e55a9545 --- /dev/null +++ b/pkgs/applications/audio/bschaffl/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkg-config, cairo, libX11, lv2 }: + +stdenv.mkDerivation rec { + pname = "bschaffl"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "sjaehn"; + repo = pname; + rev = version; + sha256 = "1pcch7j1wgsb77mjy58hl3z43p83dv0vcmyh129m9k216b09gy29"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cairo libX11 lv2 ]; + + installFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/sjaehn/BSchaffl"; + description = "Pattern-controlled MIDI amp & time stretch LV2 plugin"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e5fb58fa20..fb2a22e944d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19421,6 +19421,8 @@ in bjumblr = callPackage ../applications/audio/bjumblr { }; + bschaffl = callPackage ../applications/audio/bschaffl { }; + bsequencer = callPackage ../applications/audio/bsequencer { }; bslizr = callPackage ../applications/audio/bslizr { }; From 18aeaaeccd8059d50f2b8fc37085bc755a3cef41 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 15 Aug 2020 01:32:39 +0200 Subject: [PATCH 162/520] foot: init at 1.4.4 --- pkgs/applications/misc/foot/default.nix | 38 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/misc/foot/default.nix diff --git a/pkgs/applications/misc/foot/default.nix b/pkgs/applications/misc/foot/default.nix new file mode 100644 index 00000000000..02909ee1f2f --- /dev/null +++ b/pkgs/applications/misc/foot/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit +, fcft, freetype, pixman, libxkbcommon, fontconfig, wayland +, meson, ninja, ncurses, scdoc, tllist, wayland-protocols, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "foot"; + version = "1.4.4"; + + src = fetchgit { + url = "https://codeberg.org/dnkl/foot.git"; + rev = "${version}"; + sha256 = "1cr4sz075v18clh8nlvgyxlbvfkhbsg0qrqgnclip5rwa24ry1lg"; + }; + + nativeBuildInputs = [ + meson ninja ncurses scdoc tllist wayland-protocols pkg-config + ]; + buildInputs = [ + fontconfig freetype pixman wayland libxkbcommon fcft + ]; + + # recommended build flags for foot as per INSTALL.md + # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#user-content-release-build + preConfigure = '' + export CFLAGS+="-O3 -fno-plt" + ''; + + mesonFlags = [ "--buildtype=release" "-Db_lto=true" ]; + + meta = with stdenv.lib; { + homepage = "https://codeberg.org/dnkl/foot/"; + description = "A fast, lightweight and minimalistic Wayland terminal emulator"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59aaa5f0206..c32c2b60abd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20049,6 +20049,8 @@ in foo-yc20 = callPackage ../applications/audio/foo-yc20 { }; + foot = callPackage ../applications/misc/foot { }; + fossil = callPackage ../applications/version-management/fossil { }; freebayes = callPackage ../applications/science/biology/freebayes { }; From cc858e7434312ac4267931f317f8363ec3de0194 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 12 Jun 2020 15:35:35 +0200 Subject: [PATCH 163/520] bslizr: 1.2.6 -> 1.2.8 --- pkgs/applications/audio/bslizr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix index bae2407ec7b..5a2675187c0 100644 --- a/pkgs/applications/audio/bslizr/default.nix +++ b/pkgs/applications/audio/bslizr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BSlizr"; - version = "1.2.6"; + version = "1.2.8"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "${version}"; - sha256 = "1l0znwvvqd2s24c652q54pkizlh86mvmr8h0qqp9xma0i575fcrh"; + sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0"; }; nativeBuildInputs = [ pkgconfig ]; From 9d3a841143a0498b36c076d240b8faf8e14042d7 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 17 Aug 2020 18:15:14 +0200 Subject: [PATCH 164/520] bchoppr: init at 1.6.4 (#84240) --- pkgs/applications/audio/bchoppr/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/audio/bchoppr/default.nix diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix new file mode 100644 index 00000000000..1b642e1ed69 --- /dev/null +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkg-config, cairo, libX11, lv2 }: + +stdenv.mkDerivation rec { + pname = "bchoppr"; + version = "1.6.4"; + + src = fetchFromGitHub { + owner = "sjaehn"; + repo = pname; + rev = "${version}"; + sha256 = "16b0sg7q2b8l4y4bp5s3yzsj9j6jayjy2mlvqkby6l7hcgjcj493"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ cairo libX11 lv2 ]; + + installFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/sjaehn/BChoppr; + description = "An audio stream chopping LV2 plugin"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc7cfa86bd1..7f42cad11de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19337,6 +19337,8 @@ in bb = callPackage ../applications/misc/bb { }; + bchoppr = callPackage ../applications/audio/bchoppr { }; + berry = callPackage ../applications/window-managers/berry { }; bevelbar = callPackage ../applications/window-managers/bevelbar { }; From c42a38485da19beb36facd2169a8b053121bcbc1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Aug 2020 06:06:22 +0000 Subject: [PATCH 165/520] python27Packages.blis: 0.4.1 -> 0.7.1 --- pkgs/development/python-modules/blis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 596545093a9..596579f8148 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "blis"; - version = "0.4.1"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "d69257d317e86f34a7f230a2fd1f021fd2a1b944137f40d8cdbb23bd334cd0c4"; + sha256 = "014771a0f753a64ef5610c5b3d4a090b263073bdd59b8ad0d872ce1e06e7315a"; }; nativeBuildInputs = [ From 655976a64cefa1a662f1de786c317cc06a1280c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 17 Aug 2020 14:50:54 +0200 Subject: [PATCH 166/520] python3Packages.thinc: relax blis version bound --- pkgs/development/python-modules/thinc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index b32b996ffd6..9272e25a1ba 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -60,6 +60,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ + --replace "blis>=0.4.0,<0.5.0" "blis>=0.4.0,<1.0" \ --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \ --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \ --replace "srsly>=0.0.6,<1.1.0" "srsly>=0.0.6,<3.0" From f41909e3be495f81117970d9d1d896a491a39612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 17 Aug 2020 14:51:15 +0200 Subject: [PATCH 167/520] python3Packages.spacy: relax blis version bound --- pkgs/development/python-modules/spacy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 0e22311a04c..322f10d00ae 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ + --replace "blis>=0.4.0,<0.5.0" "blis>=0.4.0,<1.0" \ --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \ --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \ --replace "srsly>=1.0.2,<1.1.0" "srsly>=1.0.2,<3.0" \ From b3847686f8ba214911fdbfb6a60c040fb43c37db Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Mon, 17 Aug 2020 13:05:00 +0300 Subject: [PATCH 168/520] python3Packages.pylint-django: 2.1.0 -> 2.3.0 --- pkgs/development/python-modules/pylint-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 9a33f10ddee..ba9a684f5d9 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.1.0"; + version = "2.3.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "1gvbh2a480x3ddrq6xzray7kdsz8nb8n16xm2lf03w2nqnsdbkwy"; + sha256 = "1088waraiigi2bnlighn7bvnvqmpx5fbw70c8jd8sh25mj38wgly"; }; propagatedBuildInputs = [ From 8d9f9fda647464b2d645b314c705eaee506348b0 Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Mon, 17 Aug 2020 13:16:14 +0300 Subject: [PATCH 169/520] pythonPackages.pylint-django: checkPhase --- .../python-modules/pylint-django/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index ba9a684f5d9..c5dfbd48fe1 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -6,6 +6,11 @@ # pythonPackages , django , pylint-plugin-utils + +# pythonPackages for checkInputs +, coverage +, factory_boy +, pytest }: buildPythonPackage rec { @@ -25,8 +30,14 @@ buildPythonPackage rec { pylint-plugin-utils ]; - # Testing requires checkout from other repositories - doCheck = false; + checkInputs = [ coverage factory_boy pytest ]; + + # Check command taken from scripts/test.sh + # Skip test external_django_tables2_noerror_meta_class: + # requires an unpackaged django_tables2 + checkPhase = '' + python pylint_django/tests/test_func.py -v -k "not tables2" + ''; meta = with lib; { description = "A Pylint plugin to analyze Django applications"; From 1e3f09feaa5667be4ed6eca96a984b4642420b83 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 17 Aug 2020 18:39:07 +0200 Subject: [PATCH 170/520] gimp: reorder the expression To use more standard layout. --- pkgs/applications/graphics/gimp/default.nix | 30 ++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index aa440f2c47a..6ec15bf02ab 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -131,6 +131,21 @@ in stdenv.mkDerivation rec { gegl ]; + configureFlags = [ + "--without-webkit" # old version is required + "--disable-check-update" + "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" + "--with-icc-directory=/run/current-system/sw/share/color/icc" + # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) + "--libdir=\${exec_prefix}/lib" + ]; + + enableParallelBuilding = true; + + # on Darwin, + # test-eevl.c:64:36: error: initializer element is not a compile-time constant + doCheck = !stdenv.isDarwin; + # Check if librsvg was built with --disable-pixbuf-loader. PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; @@ -155,21 +170,6 @@ in stdenv.mkDerivation rec { gtk = gtk2; }; - configureFlags = [ - "--without-webkit" # old version is required - "--disable-check-update" - "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" - "--with-icc-directory=/run/current-system/sw/share/color/icc" - # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) - "--libdir=\${exec_prefix}/lib" - ]; - - # on Darwin, - # test-eevl.c:64:36: error: initializer element is not a compile-time constant - doCheck = !stdenv.isDarwin; - - enableParallelBuilding = true; - meta = with lib; { description = "The GNU Image Manipulation Program"; homepage = "https://www.gimp.org/"; From 9fb2c88df488086746ecfd1e1bd7fbdec7b987b0 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 17 Aug 2020 19:16:59 +0200 Subject: [PATCH 171/520] source-han-*: reduce closure size by 2x The file name of the installed font was the path returned by fetchurl: `xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-SourceHanSans.ttc` This caused the derivation to reference the downloaded font file, storing the font twice unless you optimise the store (each file is ~150M). --- pkgs/data/fonts/source-han/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/source-han/default.nix b/pkgs/data/fonts/source-han/default.nix index 7b6bef0198d..28ec08f63b6 100644 --- a/pkgs/data/fonts/source-han/default.nix +++ b/pkgs/data/fonts/source-han/default.nix @@ -19,7 +19,8 @@ let version = lib.removeSuffix "R" rev; buildCommand = '' - install -m444 -Dt $out/share/fonts/opentype/source-han-${family} ${ttc} + mkdir -p $out/share/fonts/opentype/source-han-${family} + ln -s ${ttc} $out/share/fonts/opentype/source-han-${family}/SourceHan${Family}.ttc ''; meta = { From 92b4e00ffe12bb8381b4cb1241c8db1fd39d6549 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Mon, 17 Aug 2020 18:25:46 +0100 Subject: [PATCH 172/520] llvm_10: disable failing test on 32-bit ARM --- pkgs/development/compilers/llvm/10/llvm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index 742beb87640..7394d4033d2 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -81,6 +81,7 @@ in stdenv.mkDerivation (rec { rm test/DebugInfo/X86/convert-debugloc.ll rm test/DebugInfo/X86/convert-inlined.ll rm test/DebugInfo/X86/convert-linked.ll + rm test/DebugInfo/X86/debug_addr.ll rm test/tools/dsymutil/X86/op-convert.test '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' # Seems to require certain floating point hardware (NEON?) From 7f31fe9ea6640abbdb34d8c3115047f1b6f5e6b7 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 17 Aug 2020 19:39:32 +0200 Subject: [PATCH 173/520] vampire: 4.4 -> 4.5.1 --- pkgs/applications/science/logic/vampire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index e5941a35fd5..dca03823e9e 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vampire"; - version = "4.4"; + version = "4.5.1"; src = fetchFromGitHub { owner = "vprover"; repo = "vampire"; rev = version; - sha256 = "0v2fdfnk7l5xr5c4y54r25g1nbp4vi85zv29nbklh3r7aws3w9q1"; + sha256 = "0q9gqyq96amdnhxgwjyv0r2sxakikp3jvmizgj2h0spfz643p8db"; }; buildInputs = [ z3 zlib ]; From 01ff24f1b5d7b6b8f0ede14c40f2f6a913ff29ee Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 17 Aug 2020 20:38:54 +0200 Subject: [PATCH 174/520] element-web: 1.7.3 -> 1.7.4 https://github.com/vector-im/element-web/releases/tag/v1.7.4 --- .../networking/instant-messengers/element/element-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 03990f166ae..9c818a8e8b6 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.3"; + version = "1.7.4"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0vlh89kilnpg90kdxlikfak03zdwhwj754xskgb27jal0iaw0r8s"; + sha256 = "0ssyd5b9yrxidivr3rcjsd8ixkmppsmmr7a8k0sv16yk7hjnvz5b"; }; installPhase = '' From 2cb4d19268cfeeb7bc52df1fc3a4f9a1d1a0122f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 17 Aug 2020 20:39:15 +0200 Subject: [PATCH 175/520] element-desktop: 1.7.3 -> 1.7.4 https://github.com/vector-im/element-desktop/releases/tag/v1.7.4 --- .../instant-messengers/element/element-desktop-package.json | 4 ++-- .../networking/instant-messengers/element/element-desktop.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 148e06fa88e..30645793728 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.3", + "version": "1.7.4", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -61,7 +61,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "9.0.5", + "electronVersion": "9.1.2", "files": [ "package.json", { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 7c42f9c1e0c..09fd89b0da7 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "1qr00g2a8dibnkxn4pv9qkv09wwalfbgi2jq4wkq66anbgj9f39g"; + sha256 = "16ilkf5b8mz74x1r9fym5xjb4plxzhg3g5njj1sl4qvsbrkk6r9a"; }; electron = electron_9; From 2efb6ad0f053fbcd15f89821045a6b0daaf4f9c5 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Mon, 17 Aug 2020 18:14:04 +0900 Subject: [PATCH 176/520] cargo-crev: 0.16.1 -> 0.17.0 --- .../tools/rust/cargo-crev/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 1093440ecbf..750b651651c 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -1,19 +1,28 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }: +{ stdenv +, fetchFromGitHub +, rustPlatform +, perl +, pkg-config +, Security +, curl +, libiconv +, openssl +}: rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "16da30zbv8f7w8bxsssmrpzm41a966wby1l6ldyiiszs980qh7c5"; + sha256 = "1s5wb5m0d77qi90pyxld98ap37xnxrz3sz5gazq0pp5i9c9xa124"; }; - cargoSha256 = "0z365pgdd95apk2zz2n0gx85s0gf8ccfbqippxqn1fdsppihib6g"; + cargoSha256 = "10dzvzjqib751h2p1pl0z3dy2d17xwrcp9vyfrfr185yximcw2wx"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; From 5454cf2053aba21470e10402f5200a6eae5a7e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 17 Aug 2020 09:53:05 +0200 Subject: [PATCH 177/520] licenses: add BlueOak-1.0.0 --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 2f9fc04cb7c..5cdb43ded6d 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -85,6 +85,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = ''Beerware License''; }; + blueOak100 = spdx { + spdxId = "BlueOak-1.0.0"; + fullName = "Blue Oak Model License 1.0.0"; + }; + bsd0 = spdx { spdxId = "0BSD"; fullName = "BSD Zero Clause License"; From a470a23a779bb38b10e6334a7205601de2f44c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 17 Aug 2020 10:02:06 +0200 Subject: [PATCH 178/520] python3Packages.finalfusion: init at 0.7.1 --- .../python-modules/finalfusion/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/finalfusion/default.nix diff --git a/pkgs/development/python-modules/finalfusion/default.nix b/pkgs/development/python-modules/finalfusion/default.nix new file mode 100644 index 00000000000..62287487e3b --- /dev/null +++ b/pkgs/development/python-modules/finalfusion/default.nix @@ -0,0 +1,56 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, isPy3k +, cython +, numpy +, toml +, pytest +}: + +buildPythonPackage rec { + pname = "finalfusion"; + version = "0.7.1"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "finalfusion"; + repo = "finalfusion-python"; + rev = version; + sha256 = "0pwzflamxqvpl1wcz0zbhhd6aa4xn18rmza6rggaic3ckidhyrh4"; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + numpy + toml + ]; + + checkInputs = [ + pytest + ]; + + postPatch = '' + patchShebangs tests/integration + ''; + + checkPhase = '' + # Regular unit tests. + pytest + + # Integration tests for command-line utilities. + PATH=$PATH:$out/bin tests/integration/all.sh + ''; + + meta = with lib; { + description = "Python module for using finalfusion, word2vec, and fastText word embeddings"; + homepage = "https://github.com/finalfusion/finalfusion-python/"; + maintainers = with maintainers; [ danieldk ]; + platforms = platforms.all; + license = licenses.blueOak100; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76e5fd9dcd1..5337b3e610a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -764,6 +764,8 @@ in { filemagic = callPackage ../development/python-modules/filemagic { }; + finalfusion = callPackage ../development/python-modules/finalfusion { }; + fints = callPackage ../development/python-modules/fints { }; fire = callPackage ../development/python-modules/fire { }; From ac3de2a6c7f13418b2e67701c360ecbab910b3ba Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sun, 19 Jul 2020 13:46:41 +0200 Subject: [PATCH 179/520] haskellPackages.hcoord: fix build Increase version bounds for a hcoord dependency [0]. Also disable checks, as upstream doesn't include the necessary files in the release tarball [1]. [0] https://github.com/danfran/hcoord/pull/8/ [1] https://github.com/danfran/hcoord/issues/9 --- .../haskell-modules/configuration-common.nix | 12 ++++++++++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 30053675fca..cdcc24d7e62 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1433,6 +1433,18 @@ self: super: { # https://github.com/bos/statistics/issues/170 statistics = dontCheck super.statistics; + hcoord = overrideCabal super.hcoord (drv: { + # Remove when https://github.com/danfran/hcoord/pull/8 is merged. + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/danfran/hcoord/pull/8/commits/762738b9e4284139f5c21f553667a9975bad688e.patch"; + sha256 = "03r4jg9a6xh7w3jz3g4bs7ff35wa4rrmjgcggq51y0jc1sjqvhyz"; + }) + ]; + # Remove when https://github.com/danfran/hcoord/issues/9 is closed. + doCheck = false; + }); + # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e6f75b1b69f..766c4a3690d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5956,7 +5956,6 @@ broken-packages: - hcltest - hcoap - hcom - - hcoord - hcron - hCsound - hcube From 2d72eaf616c601dc842ecf9ebb45a0682608a37a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 17 Aug 2020 20:39:37 +0200 Subject: [PATCH 180/520] python3Packages.canonicaljson: 1.1.4 -> 1.3.0 --- pkgs/development/python-modules/canonicaljson/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 24cccc3aa77..34d75d77a9c 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -1,14 +1,15 @@ { stdenv, buildPythonPackage, fetchPypi -, frozendict, simplejson, six +, frozendict, simplejson, six, isPy27 }: buildPythonPackage rec { pname = "canonicaljson"; - version = "1.1.4"; + version = "1.3.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "45bce530ff5fd0ca93703f71bfb66de740a894a3b5dd6122398c6d8f18539725"; + sha256 = "0v2b72n28fi763xxv9vrf4qc61anl2ys9njy7hlm719fdaq3sxml"; }; propagatedBuildInputs = [ From 53dc9e8103a6388dc252afc676652f6be98720a4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 17 Aug 2020 20:39:48 +0200 Subject: [PATCH 181/520] matrix-synapse: 1.18.0 -> 1.19.0 https://github.com/matrix-org/synapse/releases/tag/v1.19.0 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index ed9c9b801b0..a321f609df8 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.18.0"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "0bqacma2ip0l053rfvxznbixs2rmb2dawqi2jq2zbqk5jqxhpaxi"; + sha256 = "1fl9p0cb442271hx7zjz8vp111xgvdpn4khk8bk3kl8z9hjs2l1p"; }; patches = [ From 93e729297629ce9d8eb07faed44f77e1835c6582 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 Aug 2020 10:23:45 -0700 Subject: [PATCH 182/520] doc/python: add pytestCheckHook section --- doc/languages-frameworks/python.section.md | 95 +++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 7bee48773c2..c68bb843f8e 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -538,6 +538,99 @@ buildPythonPackage rec { ``` Note also the line `doCheck = false;`, we explicitly disabled running the test-suite. +#### Testing Python Packages + +It is highly encouraged to have testing as part of the package build. This +helps to avoid situations where the package was able to build and install, +but is not usable at runtime. Currently, all packages will use the `test` +command provided by the setup.py. However, this is currently deprecated +https://github.com/pypa/setuptools/pull/1878 and your package should provide +it's own checkPhase. + +*NOTE:* The `checkPhase` for python maps to the `installCheckPhase` on a +normal derivation. This is due to many python packages not behaving well +to the pre-installed version of the package. Version info, and natively +compiled extensions generally only exist in the install directory, and +thus can cause issues when a test suite asserts on that behavior. + +*NOTE:* Tests should only be disabled if they don't agree with nix +(e.g. external dependencies, network access, flakey tests), however, +as many tests should be enabled as possible. Failing tests can still be +a good indication that the package is not in a valid state. + +#### Using pytest + +Pytest is the most common test runner for python repositories. A trivial +test run would be: +``` + checkInputs = [ pytest ]; + checkPhase = "pytest"; +``` + +However, many repositories' test suites do not translate well to nix's build +sandbox, and will generally need many tests to be disabled. + +To filter tests using pytest, one can do the following: +``` + checkInputs = [ pytest ]; + # avoid tests which need additional data or touch network + checkPhase = '' + pytest tests/ --ignore=tests/integration -k 'not download and not update' + ''; +``` + +`--ignore` will tell pytest to ignore that file or directory from being +collected as part of a test run. This is useful is a file uses a package +which is not available in nixpkgs, thus skipping that test file is much +easier than having to create a new package. + +`-k` is used to define a predicate for test names. In this example, we are +filtering out tests which contain `download` or `update` in their test case name. +Only one `-k` argument is allows, and thus a long predicate should be concatenated +with "\" and wrapped to the next line. + +*NOTE:* In pytest==6.0.1, the use of "\" to continue a line (e.g. `-k 'not download \'`) has +been removed, in this case, it's recommended to use `pytestCheckHook`. + +#### Using pytestCheckHook + +`pytestCheckHook` is a convenient hook which will substitute the setuptools +`test` command for a checkPhase which runs `pytest`. This is also beneficial +when a package may need many items disabled to run the test suite. + +Using the example above, the analagous pytestCheckHook usage would be: +``` + checkInputs = [ pytestCheckHook ]; + + # requires additional data + pytestFlagsArray = [ "tests/" "--ignore=tests/integration" ]; + + disabledTests = [ + # touches network + "download" + "update" + ]; +``` + +This is expecially useful when tests need to be conditionallydisabled, +for example: + +``` + disabledTests = [ + # touches network + "download" + "update" + ] ++ lib.optionals (pythonAtLeast "3.8") [ + # broken due to python3.8 async changes + "async" + ] ++ lib.optionals stdenv.isDarwin [ + # can fail when building with other packages + "socket" + ]; +``` +Trying to concatenate the related strings to disable tests in a regular checkPhase +would be much harder to read. This also enables us to comment on why specific tests +are disabled. #### Develop local package @@ -1017,7 +1110,7 @@ are used in `buildPythonPackage`. - `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system (e.g. `setuptools` or `flit`) should still be added as `nativeBuildInput`. - `pipInstallHook` to install wheels. -- `pytestCheckHook` to run tests with `pytest`. +- `pytestCheckHook` to run tests with `pytest`. See [example usage](#using-pytestcheckhook). - `pythonCatchConflictsHook` to check whether a Python package is not already existing. - `pythonImportsCheckHook` to check whether importing the listed modules works. - `pythonRemoveBinBytecode` to remove bytecode from the `/bin` folder. From 233dc9c7d1893efb04c974e5d91f3b4a04fad4fe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 17 Aug 2020 13:33:43 -0700 Subject: [PATCH 183/520] doc/python: Add pythonImportsCheck mention --- doc/languages-frameworks/python.section.md | 30 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index c68bb843f8e..f189ce31448 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -543,9 +543,9 @@ Note also the line `doCheck = false;`, we explicitly disabled running the test-s It is highly encouraged to have testing as part of the package build. This helps to avoid situations where the package was able to build and install, but is not usable at runtime. Currently, all packages will use the `test` -command provided by the setup.py. However, this is currently deprecated -https://github.com/pypa/setuptools/pull/1878 and your package should provide -it's own checkPhase. +command provided by the setup.py (i.e. `python setup.py test`). However, +this is currently deprecated https://github.com/pypa/setuptools/pull/1878 +and your package should provide its own checkPhase. *NOTE:* The `checkPhase` for python maps to the `installCheckPhase` on a normal derivation. This is due to many python packages not behaving well @@ -632,7 +632,29 @@ Trying to concatenate the related strings to disable tests in a regular checkPha would be much harder to read. This also enables us to comment on why specific tests are disabled. -#### Develop local package +#### Using pythonImportsCheck + +Although unit tests are highly prefered to valid correctness of a package. Not +all packages have test suites that can be ran easily, and some have none at all. +To help ensure the package still works, `pythonImportsCheck` can attempt to import +the listed modules. + +``` + pythonImportsCheck = [ "requests" "urllib" ]; +``` +roughly translates to: +``` + postCheck = '' + PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + python -c "import requests; import urllib" + ''; +``` +However, this is done in it's own phase, and not dependent on whether `doCheck = true;` + +This can also be useful in verifying that the package doesn't assume commonly +present packages (e.g. `setuptools`) + +### Develop local package As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode) (`python setup.py develop`); instead of installing the package this command From 8425726f86a2f4a38d0022f3d5cb1d2001da6999 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 17 Aug 2020 23:12:57 +0200 Subject: [PATCH 184/520] nixos/fontconfig: fix 50-user.conf handling Apparently, edf2541f02c6b24ea791710d5cadeae36f9b1a3a was missed while rebasing https://github.com/NixOS/nixpkgs/pull/93562. Provide 50-user.conf in fontconfig if includeUserConf is true (the default), and don't try removing the non-existent one if it's disabled Fixes https://github.com/NixOS/nixpkgs/issues/95685 Fixes https://github.com/NixOS/nixpkgs/issues/95712 --- nixos/modules/config/fonts/fontconfig.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 84643019471..2c6a2182876 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -204,8 +204,10 @@ let ln -s ${renderConf} $dst/10-nixos-rendering.conf # 50-user.conf - ${optionalString (!cfg.includeUserConf) '' - rm $dst/50-user.conf + # Since latest fontconfig looks for default files inside the package, + # we had to move this one elsewhere to be able to exclude it here. + ${optionalString cfg.includeUserConf '' + ln -s ${pkg.out}/etc/fonts/conf.d.bak/50-user.conf $dst/50-user.conf ''} # local.conf (indirect priority 51) From 6f4a508a3844e8efcf9afde6a8aec90c0f294f07 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 17 Aug 2020 11:43:27 +0000 Subject: [PATCH 185/520] squashfs-tools-ng: 1.0.0 -> 1.0.1 --- pkgs/tools/filesystems/squashfs-tools-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index e9afa5cf190..0c977799db8 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "1dpx0a200s46s1dxp64hkn765vap0hzmyyvmq7wrmcs81mvlrd0l"; + sha256 = "120x2hlbhpm90bzxz70z764552ffrjpidmp1y6gafx70zp0hrks4"; }; nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]; From 7d9c49f8e6e6a7ce4ad56945d2f3de8007b11428 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:49:07 +1000 Subject: [PATCH 186/520] maintainers: 0x4A6F -> _0x4A6F --- maintainers/maintainer-list.nix | 2 +- nixos/modules/services/networking/xandikos.nix | 2 +- nixos/tests/xandikos.nix | 2 +- pkgs/applications/networking/mailreaders/meli/default.nix | 2 +- pkgs/applications/qubes/qubes-core-vchan-xen/default.nix | 3 +-- pkgs/applications/window-managers/cwm/default.nix | 2 +- pkgs/games/eidolon/default.nix | 2 +- pkgs/os-specific/linux/gobi_loader/default.nix | 2 +- pkgs/servers/monitoring/timescale-prometheus/default.nix | 2 +- pkgs/servers/routinator/default.nix | 2 +- pkgs/servers/tacacsplus/default.nix | 2 +- pkgs/servers/xandikos/default.nix | 3 +-- pkgs/tools/networking/pmacct/default.nix | 2 +- pkgs/tools/networking/tayga/default.nix | 2 +- 14 files changed, 14 insertions(+), 16 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ac62a53258a..160def9c069 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -41,7 +41,7 @@ See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. */ { - "0x4A6F" = { + _0x4A6F = { email = "mail-maintainer@0x4A6F.dev"; name = "Joachim Ernst"; github = "0x4A6F"; diff --git a/nixos/modules/services/networking/xandikos.nix b/nixos/modules/services/networking/xandikos.nix index f1882261656..3c40bb956f5 100644 --- a/nixos/modules/services/networking/xandikos.nix +++ b/nixos/modules/services/networking/xandikos.nix @@ -90,7 +90,7 @@ in config = mkIf cfg.enable ( mkMerge [ { - meta.maintainers = [ lib.maintainers."0x4A6F" ]; + meta.maintainers = with lib.maintainers; [ _0x4A6F ]; systemd.services.xandikos = { description = "A Simple Calendar and Contact Server"; diff --git a/nixos/tests/xandikos.nix b/nixos/tests/xandikos.nix index 886c3e0082f..48c770a3d16 100644 --- a/nixos/tests/xandikos.nix +++ b/nixos/tests/xandikos.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ( { name = "xandikos"; - meta.maintainers = [ lib.maintainers."0x4A6F" ]; + meta.maintainers = with lib.maintainers; [ _0x4A6F ]; nodes = { xandikos_client = {}; diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 2205c155575..1a6ae282a8d 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { description = "Experimental terminal mail client aiming for configurability and extensibility with sane defaults"; homepage = "https://meli.delivery"; license = licenses.gpl3; - maintainers = with maintainers; [ maintainers."0x4A6F" matthiasbeyer erictapen ]; + maintainers = with maintainers; [ _0x4A6F matthiasbeyer erictapen ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix index ecb9403be36..ce9e4b5d881 100644 --- a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix +++ b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix @@ -23,8 +23,7 @@ stdenv.mkDerivation rec { description = "Libraries required for the higher-level Qubes daemons and tools"; homepage = "https://qubes-os.org"; license = licenses.gpl2Plus; - maintainers = [ maintainers."0x4A6F" ]; + maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.linux; }; } - diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index 27aacd78e9f..18baefdbf3e 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight and efficient window manager for X11"; homepage = "https://github.com/leahneukirchen/cwm"; - maintainers = with maintainers; [ maintainers."0x4A6F" mkf ]; + maintainers = with maintainers; [ _0x4A6F mkf ]; license = licenses.isc; platforms = platforms.linux; }; diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix index 5461304d334..e982c95c4d6 100644 --- a/pkgs/games/eidolon/default.nix +++ b/pkgs/games/eidolon/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { description = "A single TUI-based registry for drm-free, wine and steam games on linux, accessed through a rofi launch menu"; homepage = "https://github.com/nicohman/eidolon"; license = licenses.gpl3; - maintainers = [ maintainers."0x4A6F" ]; + maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/gobi_loader/default.nix b/pkgs/os-specific/linux/gobi_loader/default.nix index b79f8af6f8e..b8735354c2c 100644 --- a/pkgs/os-specific/linux/gobi_loader/default.nix +++ b/pkgs/os-specific/linux/gobi_loader/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Firmware loader for Qualcomm Gobi USB chipsets"; homepage = "https://www.codon.org.uk/~mjg59/gobi_loader/"; license = with licenses; [ gpl2 ]; - maintainers = [ maintainers."0x4A6F" ]; + maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/monitoring/timescale-prometheus/default.nix b/pkgs/servers/monitoring/timescale-prometheus/default.nix index 7a50fb3b047..3af28b56dbf 100644 --- a/pkgs/servers/monitoring/timescale-prometheus/default.nix +++ b/pkgs/servers/monitoring/timescale-prometheus/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { homepage = "https://github.com/timescale/timescale-prometheus"; license = licenses.asl20; platforms = platforms.unix; - maintainers = [ maintainers."0x4A6F" ]; + maintainers = with maintainers; [ _0x4A6F ]; }; } diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 1174d0802ae..6e57ebd42da 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { description = "An RPKI Validator written in Rust"; homepage = "https://github.com/NLnetLabs/routinator"; license = licenses.bsd3; - maintainers = [ maintainers."0x4A6F" ]; + maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/tacacsplus/default.nix b/pkgs/servers/tacacsplus/default.nix index 400298d15d5..5010838cbe0 100644 --- a/pkgs/servers/tacacsplus/default.nix +++ b/pkgs/servers/tacacsplus/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "A protocol for authentication, authorization and accounting (AAA) services for routers and network devices"; homepage = "http://www.shrubbery.net/tac_plus/"; license = licenses.free; - maintainers = [ maintainers."0x4A6F" ]; + maintainers = with maintainers; [ _0x4A6F ]; platforms = with platforms; linux; }; } diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index 9bb4ebc8677..6bd3ebc4232 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -28,7 +28,6 @@ python3Packages.buildPythonApplication rec { description = "Lightweight CalDAV/CardDAV server"; homepage = "https://github.com/jelmer/xandikos"; license = licenses.gpl3Plus; - maintainers = [ maintainers."0x4A6F" ]; + maintainers = with maintainers; [ _0x4A6F ]; }; } - diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix index 40199263755..ffecbfcaf42 100644 --- a/pkgs/tools/networking/pmacct/default.nix +++ b/pkgs/tools/networking/pmacct/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.pmacct.net/"; license = licenses.gpl2; - maintainers = [ maintainers."0x4A6F" ]; + maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/tayga/default.nix b/pkgs/tools/networking/tayga/default.nix index 866d680a02d..1cecf2d634d 100644 --- a/pkgs/tools/networking/tayga/default.nix +++ b/pkgs/tools/networking/tayga/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.litech.org/tayga"; license = licenses.gpl2; - maintainers = [ maintainers."0x4A6F" ]; + maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.linux; }; } From 0052523a18965f1e5685badfc5a50ee0f9a6fa30 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:57:20 +1000 Subject: [PATCH 187/520] maintainers: 1000101 -> _1000101 --- maintainers/maintainer-list.nix | 2 +- nixos/modules/services/networking/bitcoind.nix | 2 +- nixos/modules/services/networking/blockbook-frontend.nix | 2 +- nixos/modules/services/networking/trickster.nix | 3 +-- nixos/modules/services/web-apps/dokuwiki.nix | 2 +- nixos/tests/bitcoind.nix | 2 +- nixos/tests/blockbook-frontend.nix | 2 +- nixos/tests/dokuwiki.nix | 2 +- nixos/tests/trezord.nix | 2 +- nixos/tests/trickster.nix | 2 +- pkgs/applications/misc/pdfsam-basic/default.nix | 2 +- pkgs/development/python-modules/shamir-mnemonic/default.nix | 2 +- pkgs/development/python-modules/trezor/default.nix | 2 +- pkgs/development/web/shopify-themekit/default.nix | 2 +- pkgs/games/ninvaders/default.nix | 2 +- pkgs/servers/blockbook/default.nix | 2 +- pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/process-exporter.nix | 2 +- pkgs/servers/trezord/default.nix | 2 +- pkgs/servers/trickster/trickster.nix | 2 +- pkgs/servers/web-apps/dokuwiki/default.nix | 2 +- 21 files changed, 21 insertions(+), 22 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 160def9c069..bcc4a4020ea 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -51,7 +51,7 @@ fingerprint = "F466 A548 AD3F C1F1 8C88 4576 8702 7528 B006 D66D"; }]; }; - "1000101" = { + _1000101 = { email = "b1000101@pm.me"; github = "1000101"; githubId = 791309; diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix index ba9281cf6f0..bc9aa53f49a 100644 --- a/nixos/modules/services/networking/bitcoind.nix +++ b/nixos/modules/services/networking/bitcoind.nix @@ -256,6 +256,6 @@ in }; - meta.maintainers = with maintainers; [ maintainers."1000101" ]; + meta.maintainers = with maintainers; [ _1000101 ]; } diff --git a/nixos/modules/services/networking/blockbook-frontend.nix b/nixos/modules/services/networking/blockbook-frontend.nix index f289683cef0..dde24522756 100644 --- a/nixos/modules/services/networking/blockbook-frontend.nix +++ b/nixos/modules/services/networking/blockbook-frontend.nix @@ -270,6 +270,6 @@ in nameValuePair "${cfg.group}" { })) eachBlockbook; }; - meta.maintainers = with maintainers; [ maintainers."1000101" ]; + meta.maintainers = with maintainers; [ _1000101 ]; } diff --git a/nixos/modules/services/networking/trickster.nix b/nixos/modules/services/networking/trickster.nix index bcf5a04ae5f..49c945adb80 100644 --- a/nixos/modules/services/networking/trickster.nix +++ b/nixos/modules/services/networking/trickster.nix @@ -108,7 +108,6 @@ in }; }; - meta.maintainers = with maintainers; [ maintainers."1000101" ]; + meta.maintainers = with maintainers; [ _1000101 ]; } - diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 7aaa832a602..d9ebb3a9880 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -383,6 +383,6 @@ in }; }; - meta.maintainers = with maintainers; [ maintainers."1000101" ]; + meta.maintainers = with maintainers; [ _1000101 ]; } diff --git a/nixos/tests/bitcoind.nix b/nixos/tests/bitcoind.nix index 95c6a5b91bc..09f3e4a6ec0 100644 --- a/nixos/tests/bitcoind.nix +++ b/nixos/tests/bitcoind.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "bitcoind"; meta = with pkgs.stdenv.lib; { - maintainers = with maintainers; [ maintainers."1000101" ]; + maintainers = with maintainers; [ _1000101 ]; }; machine = { ... }: { diff --git a/nixos/tests/blockbook-frontend.nix b/nixos/tests/blockbook-frontend.nix index 5fbfc6c30c1..742a02999e7 100644 --- a/nixos/tests/blockbook-frontend.nix +++ b/nixos/tests/blockbook-frontend.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "blockbook-frontend"; meta = with pkgs.stdenv.lib; { - maintainers = with maintainers; [ maintainers."1000101" ]; + maintainers = with maintainers; [ _1000101 ]; }; machine = { ... }: { diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 6afb6dcfda3..58069366ca3 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -33,7 +33,7 @@ let in { name = "dokuwiki"; meta = with pkgs.stdenv.lib; { - maintainers = with maintainers; [ maintainers."1000101" ]; + maintainers = with maintainers; [ _1000101 ]; }; machine = { ... }: { services.dokuwiki."site1.local" = { diff --git a/nixos/tests/trezord.nix b/nixos/tests/trezord.nix index 67646496ff9..b7b3dd31942 100644 --- a/nixos/tests/trezord.nix +++ b/nixos/tests/trezord.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "trezord"; meta = with pkgs.stdenv.lib; { - maintainers = with maintainers; [ mmahut maintainers."1000101" ]; + maintainers = with maintainers; [ mmahut _1000101 ]; }; nodes = { machine = { ... }: { diff --git a/nixos/tests/trickster.nix b/nixos/tests/trickster.nix index c65160f81e3..713ac8f0b2f 100644 --- a/nixos/tests/trickster.nix +++ b/nixos/tests/trickster.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "trickster"; meta = with pkgs.stdenv.lib; { - maintainers = with maintainers; [ maintainers."1000101" ]; + maintainers = with maintainers; [ _1000101 ]; }; nodes = { diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 22add00c84d..a6dd86393ff 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; license = licenses.agpl3; platforms = platforms.all; - maintainers = with maintainers; [ maintainers."1000101" ]; + maintainers = with maintainers; [ _1000101 ]; }; } diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index 099c89803ab..2225466658d 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "Reference implementation of SLIP-0039"; homepage = "https://github.com/trezor/python-shamir-mnemonic"; license = licenses.mit; - maintainers = with maintainers; [ maintainers."1000101" ]; + maintainers = with maintainers; [ _1000101 ]; }; } diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 37d1043f215..3d1bb053cd4 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; homepage = "https://github.com/trezor/trezor-firmware/tree/master/python"; license = licenses.gpl3; - maintainers = with maintainers; [ np prusnak mmahut maintainers."1000101" ]; + maintainers = with maintainers; [ np prusnak mmahut _1000101 ]; }; } diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/development/web/shopify-themekit/default.nix index 32f688895b8..a50140c1532 100644 --- a/pkgs/development/web/shopify-themekit/default.nix +++ b/pkgs/development/web/shopify-themekit/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { description = "A command line tool for shopify themes"; homepage = "https://shopify.github.io/themekit/"; license = licenses.mit; - maintainers = with maintainers; [ maintainers."1000101" ]; + maintainers = with maintainers; [ _1000101 ]; }; } diff --git a/pkgs/games/ninvaders/default.nix b/pkgs/games/ninvaders/default.nix index 009cb1e548f..26462c1eef5 100644 --- a/pkgs/games/ninvaders/default.nix +++ b/pkgs/games/ninvaders/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Space Invaders clone based on ncurses"; homepage = "http://ninvaders.sourceforge.net/"; license = licenses.gpl2; - maintainers = with maintainers; [ maintainers."1000101" ]; + maintainers = with maintainers; [ _1000101 ]; platforms = platforms.all; }; } diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 3edb6824a3d..5a411126991 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -58,7 +58,7 @@ buildGoModule rec { description = "Trezor address/account balance backend"; homepage = "https://github.com/trezor/blockbook"; license = licenses.agpl3; - maintainers = with maintainers; [ mmahut maintainers."1000101" ]; + maintainers = with maintainers; [ mmahut _1000101 ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix index d18b5e2e373..33f93cd130d 100644 --- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "Provides a Prometheus exporter for the apcupsd Network Information Server (NIS)"; homepage = "https://github.com/mdlayher/apcupsd_exporter"; license = licenses.mit; - maintainers = with maintainers; [ maintainers."1000101" mdlayher ]; + maintainers = with maintainers; [ _1000101 mdlayher ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/servers/monitoring/prometheus/process-exporter.nix index a29ab649633..b9cbfd8d63e 100644 --- a/pkgs/servers/monitoring/prometheus/process-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/process-exporter.nix @@ -25,7 +25,7 @@ buildGoPackage rec { description = "Prometheus exporter that mines /proc to report on selected processes"; homepage = "https://github.com/ncabatoff/process-exporter"; license = licenses.mit; - maintainers = with maintainers; [ maintainers."1000101" ]; + maintainers = with maintainers; [ _1000101 ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 7bdee09fca3..a59f74873dc 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { description = "TREZOR Communication Daemon aka TREZOR Bridge"; homepage = "https://trezor.io"; license = licenses.lgpl3; - maintainers = with maintainers; [ canndrew jb55 prusnak mmahut maintainers."1000101" ]; + maintainers = with maintainers; [ canndrew jb55 prusnak mmahut _1000101 ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix index 15adcb069e7..cb8c87aa611 100644 --- a/pkgs/servers/trickster/trickster.nix +++ b/pkgs/servers/trickster/trickster.nix @@ -21,6 +21,6 @@ buildGoPackage rec { description = "Reverse proxy cache for the Prometheus HTTP APIv1"; homepage = "https://github.com/Comcast/trickster"; license = licenses.asl20; - maintainers = with maintainers; [ maintainers."1000101" ]; + maintainers = with maintainers; [ _1000101 ]; }; } diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix index 0374b747825..8177e1d2226 100644 --- a/pkgs/servers/web-apps/dokuwiki/default.nix +++ b/pkgs/servers/web-apps/dokuwiki/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = "https://www.dokuwiki.org"; platforms = platforms.all; - maintainers = with maintainers; [ maintainers."1000101" ]; + maintainers = with maintainers; [ _1000101 ]; }; } From 17f765b67bd4e2e5c1c7cd7430236f4d3391bd92 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 17 Aug 2020 22:08:20 +1000 Subject: [PATCH 188/520] maintainers: add note about underscore prefix for handles --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bcc4a4020ea..8c2ab1ad261 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -26,6 +26,13 @@ `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. + If `github` begins with a numeral, `handle` should be prefixed with an underscore. + ```nix + _1example = { + github = "1example"; + }; + ``` + Add PGP/GPG keys only if you actually use them to sign commits and/or mail. To get the required PGP/GPG values for a key run From d5700d626ceef8ba509f822ee6e3b0a41a5da89f Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 18 Aug 2020 00:12:36 +0200 Subject: [PATCH 189/520] lib/modules: Fix nonexistant option error The refactoring in https://github.com/NixOS/nixpkgs/commit/fd75dc876586bde8cdb683a6952a41132e8db166 introduced a mistake in the error message that doesn't show the full context anymore. E.g. with this module: options.foo.bar = lib.mkOption { type = lib.types.submodule { baz = 10; }; default = {}; }; You'd get the error The option `baz' defined in `/home/infinisil/src/nixpkgs/config.nix' does not exist. instead of the previous The option `foo.bar.baz' defined in `/home/infinisil/src/nixpkgs/config.nix' does not exist. This commit undoes this regression --- lib/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 55a53b3909a..9c308d347cf 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -115,8 +115,8 @@ rec { checkUnmatched = if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then - let inherit (head merged.unmatchedDefns) file prefix; - in throw "The option `${showOption prefix}' defined in `${file}' does not exist." + let firstDef = head merged.unmatchedDefns; + in throw "The option `${showOption (prefix ++ firstDef.prefix)}' defined in `${firstDef.file}' does not exist." else null; result = builtins.seq checkUnmatched { From b2ad9bffec010af7799fac85112360db686e4c18 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 18 Aug 2020 00:25:45 +0200 Subject: [PATCH 190/520] kapitonov-plugins-pack: init at 1.2.1 (#85496) --- .../audio/kapitonov-plugins-pack/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/audio/kapitonov-plugins-pack/default.nix diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix new file mode 100644 index 00000000000..53b55332f5d --- /dev/null +++ b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config +, boost, cairo, fftw, gnome3, ladspa-sdk, libxcb, lv2, xcbutilwm +, zita-convolver, zita-resampler + }: + +stdenv.mkDerivation rec { + pname = "kapitonov-plugins-pack"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "olegkapitonov"; + repo = pname; + rev = version; + sha256 = "1mxi7b1vrzg25x85lqk8c77iziqrqyz18mqkfjlz09sxp5wfs9w4"; + }; + + nativeBuildInputs = [ + faust + meson + ninja + pkg-config + ]; + + buildInputs = [ + boost + cairo + fftw + ladspa-sdk + libxcb + lv2 + xcbutilwm + zita-convolver + zita-resampler + ]; + + meta = with stdenv.lib; { + description = "Set of LADSPA and LV2 plugins for guitar sound processing"; + homepage = https://github.com/olegkapitonov/Kapitonov-Plugins-Pack; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6013973e07d..37c4d5ab633 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21000,6 +21000,8 @@ in kanshi = callPackage ../tools/misc/kanshi { }; + kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { }; + kdeApplications = let mkApplications = import ../applications/kde; From 9e3b2a9a593aa41fccfb599acc424dffb7536d18 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 18 Aug 2020 00:26:17 +0200 Subject: [PATCH 191/520] freqtweak: init at unstable-2019-08-03 (#82825) --- pkgs/applications/audio/freqtweak/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/audio/freqtweak/default.nix diff --git a/pkgs/applications/audio/freqtweak/default.nix b/pkgs/applications/audio/freqtweak/default.nix new file mode 100644 index 00000000000..046c8c8aac8 --- /dev/null +++ b/pkgs/applications/audio/freqtweak/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkg-config, fftwFloat, libjack2, libsigcxx, libxml2, wxGTK }: + +stdenv.mkDerivation rec { + pname = "freqtweak"; + version = "unstable-2019-08-03"; + + src = fetchFromGitHub { + owner = "essej"; + repo = pname; + rev = "d4205337558d36657a4ee6b3afb29358aa18c0fd"; + sha256 = "10cq27mdgrrc54a40al9ahi0wqd0p2c1wxbdg518q8pzfxaxs5fi"; + }; + + nativeBuildInputs = [ autoconf automake pkg-config ]; + buildInputs = [ fftwFloat libjack2 libsigcxx libxml2 wxGTK ]; + + preConfigure = '' + sh autogen.sh + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://essej.net/freqtweak/; + description = "Realtime audio frequency spectral manipulation"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37c4d5ab633..8c6d61f7099 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3675,6 +3675,10 @@ in freetds = callPackage ../development/libraries/freetds { }; + freqtweak = callPackage ../applications/audio/freqtweak { + wxGTK = wxGTK31-gtk2; + }; + frescobaldi = python3Packages.callPackage ../misc/frescobaldi {}; frostwire = callPackage ../applications/networking/p2p/frostwire { }; From 14ecb0336c63db60b5b3683c804d1d1f0403d9aa Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 18 Aug 2020 00:56:53 +0200 Subject: [PATCH 192/520] uhhyou.lv2: init at unstable-2020-07-31 (#89171) --- .../applications/audio/uhhyou.lv2/default.nix | 67 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/applications/audio/uhhyou.lv2/default.nix diff --git a/pkgs/applications/audio/uhhyou.lv2/default.nix b/pkgs/applications/audio/uhhyou.lv2/default.nix new file mode 100644 index 00000000000..732e9d8433f --- /dev/null +++ b/pkgs/applications/audio/uhhyou.lv2/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +, python3 +, fftw +, libGL +, libX11 +, libjack2 +, liblo +, lv2 +}: + +stdenv.mkDerivation rec { + # this is what upstream calls the package, see: + # https://github.com/ryukau/LV2Plugins#uhhyou-plugins-lv2 + pname = "uhhyou.lv2"; + version = "unstable-2020-07-31"; + + src = fetchFromGitHub { + owner = "ryukau"; + repo = "LV2Plugins"; + rev = "6189be67acaeb95452f8adab73a731d94a7b6f47"; + fetchSubmodules = true; + sha256 = "049gigx2s89z8vf17gscs00c150lmcdwya311nbrwa18fz4bx242"; + }; + + nativeBuildInputs = [ pkg-config python3 ]; + + buildInputs = [ fftw libGL libX11 libjack2 liblo lv2 ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + prePatch = '' + patchShebangs generate-ttl.sh + cp patch/NanoVG.cpp lib/DPF/dgl/src/NanoVG.cpp + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Audio plugins for Linux"; + longDescription = '' + Plugin List: + - CubicPadSynth + - EnvelopedSine + - EsPhaser + - FDNCymbal + - FoldShaper + - IterativeSinCluster + - L3Reverb + - L4Reverb + - LatticeReverb + - LightPadSynth + - ModuloShaper + - OddPowShaper + - SevenDelay + - SoftClipper + - SyncSawSynth + - TrapezoidSynth + - WaveCymbal + ''; + homepage = "https://github.com/ryukau/LV2Plugins/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c6d61f7099..9d2ad844aa6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23143,6 +23143,8 @@ in ueberzug = with python3Packages; toPythonApplication ueberzug; + uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { }; + umurmur = callPackage ../applications/networking/umurmur { }; udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; From 0dc28e4475ce9d3f42a4dbdef6facfc1d778f068 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 15 Aug 2020 10:46:10 +1000 Subject: [PATCH 193/520] smimesign: 0.0.13 -> 0.1.0 --- pkgs/os-specific/darwin/smimesign/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix index d1b7863eaa4..6b7e3889161 100644 --- a/pkgs/os-specific/darwin/smimesign/default.nix +++ b/pkgs/os-specific/darwin/smimesign/default.nix @@ -2,27 +2,24 @@ buildGoModule rec { pname = "smimesign"; - version = "v0.0.13"; + version = "0.1.0"; src = fetchFromGitHub { - owner = "github"; - repo = "smimesign"; - rev = version; - sha256 = "0higcg2rdz02c0n50vigg7w7bxc7wlmg1x2ygrbh3iwms5lc74vi"; + owner = "github"; + repo = "smimesign"; + rev = "v${version}"; + sha256 = "12f8vprp4v78l9ifrlql0mvpyw5qa8nlrh5ajq5js8wljzpx7wsv"; }; - vendorSha256 = "00000000000000000hlvwysx045nbw0xr5nngh7zj1wcqxhhm206"; + vendorSha256 = "1cldxykm9qj5rvyfafam45y5xj4f19700s2f9w7ndhxgfp9vahvz"; - doCheck = false; - - buildFlagsArray = "-ldflags=-X main.versionString=${version}"; + buildFlagsArray = "-ldflags=-X main.versionString=v${version}"; meta = with lib; { - description = "An S/MIME signing utility for macOS and Windows that is compatible with Git."; - - homepage = "https://github.com/github/smimesign"; - license = licenses.mit; - platforms = platforms.darwin; + description = "An S/MIME signing utility for macOS and Windows that is compatible with Git"; + homepage = "https://github.com/github/smimesign"; + license = licenses.mit; + platforms = platforms.darwin ++ platforms.windows; maintainers = [ maintainers.enorris ]; }; } From 18e7dc19d5c1597dfc5afc4313effd97b84ecb73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Aug 2020 02:30:28 +0200 Subject: [PATCH 194/520] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-13-g52041eb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/b9e13cbd25c52fc8a9474c7603cdda8b1735c811. --- .../haskell-modules/hackage-packages.nix | 390 +++++++++++++----- 1 file changed, 293 insertions(+), 97 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 849ade07d3c..560b177585a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -16981,8 +16981,8 @@ self: { }: mkDerivation { pname = "Rattus"; - version = "0.3"; - sha256 = "1ks05nn9g6gp3l61bzmphxm9d0ajvlkzaws04fzz73rfv4nb97wg"; + version = "0.3.1"; + sha256 = "1sfjnfd3jsr095gkzxldb65ivxpyzsaphw2bv2f6svczhjc5b414"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base containers ghc simple-affine-space @@ -35476,6 +35476,8 @@ self: { pname = "avro-piper"; version = "1.0.3"; sha256 = "1vi0mgpqpr74ankl8418npklyfxacxg001vppps22p2da97s3pk1"; + revision = "1"; + editedCabalFile = "1405kfnndnh6w4hslahg74rdhk8jmh48j64ps7mval3py8cl5qiv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35971,8 +35973,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "3.0.3"; - sha256 = "0dxzdc4ixl33njind48g014rfk6wxyg0pdcwiarn4vgb30h6h4kq"; + version = "3.0.4"; + sha256 = "1rbgi7f1vymh8q6b074z64jlww5gssbzhpam8k8lcgp0zlvm13n1"; libraryHaskellDepends = [ aeson base bytestring case-insensitive http-client http-types path path-io safe-exceptions-checked template-haskell text @@ -46433,6 +46435,22 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "byte-count-reader_0_10_1_1" = callPackage + ({ mkDerivation, base, extra, hspec, parsec, parsec-numbers, text + }: + mkDerivation { + pname = "byte-count-reader"; + version = "0.10.1.1"; + sha256 = "0amzhcy60rmiyfp7cgdg7g1xcf7z5zz43kg18i1bwwj565ipb6p8"; + libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; + testHaskellDepends = [ + base extra hspec parsec parsec-numbers text + ]; + description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "byte-order" = callPackage ({ mkDerivation, base, primitive, primitive-unaligned }: mkDerivation { @@ -47632,8 +47650,8 @@ self: { pname = "cabal-cache"; version = "1.0.1.8"; sha256 = "0yxq73bdw1ai0yv54prcxpm1ygkpa8m0jnznwm975b82qlmplynw"; - revision = "1"; - editedCabalFile = "1rikn1g6v8yga0cs031ckxywfcf9g21ww9s5rkjf6lr4xvfqps2s"; + revision = "2"; + editedCabalFile = "1y4zfnr2a5w8kvwvk1dbzv0ik5b2wdlx8z2p6n9k5mzax952s689"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64342,8 +64360,8 @@ self: { pname = "crypto-enigma"; version = "0.1.1.6"; sha256 = "07qxrpwg9r2w2l0d2nrvn703vzsfhchznly93bnr2pfpbwj4iv2z"; - revision = "3"; - editedCabalFile = "0djn9pyvhlk964mzqdw0fpczwsvzadcp6jkkryhi8vbvkb88i9rn"; + revision = "4"; + editedCabalFile = "0436kl0gsy0hj7dfrqmwz95q3k31af731q484yx2gj9zcma1h1vp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers split text ]; @@ -76165,6 +76183,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dobutokO-poetry-general-languages" = callPackage + ({ mkDerivation, base, dobutokO-poetry-general, mmsyn3, mmsyn6ukr + , uniqueness-periods-general, vector + }: + mkDerivation { + pname = "dobutokO-poetry-general-languages"; + version = "0.1.0.0"; + sha256 = "1am3pwzbqj079phkl14f549f7sf951kvkppc0iqbiswq20gssc87"; + libraryHaskellDepends = [ + base dobutokO-poetry-general mmsyn3 mmsyn6ukr + uniqueness-periods-general vector + ]; + description = "Helps to order the 7 or less words to obtain somewhat suitable for poetry or music text"; + license = stdenv.lib.licenses.mit; + }) {}; + "dobutokO2" = callPackage ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3 , mmsyn6ukr, mmsyn7l, mmsyn7s, mmsyn7ukr, process @@ -81236,8 +81270,8 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.3.1"; - sha256 = "00fm1aixj31djlrmkzvhsk119w00jch6l1alaxmy97gjcg8kk6hd"; + version = "0.3.2"; + sha256 = "0jdphsnyd3fifal54axpngqvz3bpwyfrky2rhs4zwydi5khfwfik"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -81257,8 +81291,8 @@ self: { }: mkDerivation { pname = "elynx-markov"; - version = "0.3.1"; - sha256 = "05wjnlz5x6j74m9dc524yagwhj8w3vmxp3x55hkbfq89j44fb6n1"; + version = "0.3.2"; + sha256 = "0m1yhh9hp254kd9l58qylg07xdvx4nad3x6zr9vz2zqbxsl65w53"; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-seq hmatrix integration math-functions mwc-random parallel primitive statistics @@ -81277,8 +81311,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.3.1"; - sha256 = "0rqhzwfr8zz7nzvc7kkp6n2jxvq4qn3pv9ipk7mfdpxsfcm46550"; + version = "0.3.2"; + sha256 = "0wqsxvsa15cjpx3gwasl1a6yxc34cwpzvs25l6gwz3rw02g0gj0b"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; @@ -81294,8 +81328,8 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.3.1"; - sha256 = "0wvp13kcx0fbhhk45ahs18p24dqn4n7wg1194hfj4v3qxg7pqy7q"; + version = "0.3.2"; + sha256 = "02rw23nkd5i1vmp6p1qgbcrxjzchffcwfq5jq25jsqff3skhks9p"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers matrices mwc-random parallel primitive vector vector-th-unbox word8 @@ -81318,8 +81352,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.3.1"; - sha256 = "1h7vg6dh45mc5snk4c9q0xplb3q68gklxhj295pa20d83jarki0x"; + version = "0.3.2"; + sha256 = "086758j6pwbv2wbdljl72dk2w6mmcpxvkvn84ycc0bx002iag73s"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptohash-sha256 deepseq directory fast-logger hmatrix @@ -81341,8 +81375,8 @@ self: { }: mkDerivation { pname = "elynx-tree"; - version = "0.3.1"; - sha256 = "0ppah6lkzg39z80w30wicz88y4jpfj0z38py9y73srwvqy6a45l3"; + version = "0.3.2"; + sha256 = "0s1rlf30q8cdyl5jickpb2wqlxxcvc2rg7v2djhhjp5wy5h5xz4i"; libraryHaskellDepends = [ aeson attoparsec base bytestring comonad containers deepseq double-conversion elynx-nexus math-functions mwc-random primitive @@ -108716,6 +108750,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groups_0_5" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "groups"; + version = "0.5"; + sha256 = "1ivz03k5bk6d72bibn8jyq4wkivkyakbmvbrp270b33282a4lkpc"; + libraryHaskellDepends = [ base ]; + description = "Groups"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "groups-generic" = callPackage ({ mkDerivation, base, generic-data, groups }: mkDerivation { @@ -119578,6 +119624,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasqly-mysql" = callPackage + ({ mkDerivation, base, binary, bytestring, dlist, mtl + , mysql-haskell, scientific, text, time + }: + mkDerivation { + pname = "hasqly-mysql"; + version = "0.0.1"; + sha256 = "1la1lnwcv20jig72hgpgzy8a2ils95y0clhkf5ajvj1whh099g7p"; + libraryHaskellDepends = [ + base binary bytestring dlist mtl mysql-haskell scientific text time + ]; + description = "composable SQL generation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hastache" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , directory, filepath, HUnit, ieee754, mtl, process, syb, text @@ -121350,7 +121411,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "headroom_0_3_0_0" = callPackage + "headroom_0_3_1_0" = callPackage ({ mkDerivation, aeson, base, data-default-class, doctest, either , file-embed, hspec, microlens, microlens-th, mustache , optparse-applicative, pcre-heavy, pcre-light, QuickCheck, rio @@ -121358,8 +121419,8 @@ self: { }: mkDerivation { pname = "headroom"; - version = "0.3.0.0"; - sha256 = "1d4dcb70vzpn6694d4z52aj12vzicmfyyrbhd6x816ic68db08nc"; + version = "0.3.1.0"; + sha256 = "0md8yzjq92xc9pq9h8a78irgyka23ck7nlhdbdyfnm2f490fx2yw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127873,16 +127934,17 @@ self: { }) {}; "hobbits" = callPackage - ({ mkDerivation, base, deepseq, haskell-src-exts, haskell-src-meta - , mtl, syb, tagged, template-haskell, th-expand-syns, transformers + ({ mkDerivation, base, containers, deepseq, haskell-src-exts + , haskell-src-meta, mtl, syb, tagged, template-haskell + , th-expand-syns, transformers, vector }: mkDerivation { pname = "hobbits"; - version = "1.2.4"; - sha256 = "0hqg29s938hz1hxb7ljv3wnr8iaxwjmi66zjvvy1939g5r6fmdll"; + version = "1.3"; + sha256 = "1w8bz1z747dd7vh110iynmsq5n0a84zw1gk7jcxfwl5lpfrqz97s"; libraryHaskellDepends = [ - base deepseq haskell-src-exts haskell-src-meta mtl syb tagged - template-haskell th-expand-syns transformers + base containers deepseq haskell-src-exts haskell-src-meta mtl syb + tagged template-haskell th-expand-syns transformers vector ]; description = "A library for canonically representing terms with binding"; license = stdenv.lib.licenses.bsd3; @@ -127912,41 +127974,42 @@ self: { }) {ocilib = null;}; "hocker" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, async, base - , bytestring, concurrentoutput, containers, cryptonite, data-fix - , deepseq, directory, exceptions, filepath, foldl, hnix - , http-client, http-types, lens, lens-aeson, lifted-base, memory + ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring + , concurrentoutput, containers, cryptonite, data-fix, deepseq + , directory, exceptions, filepath, foldl, hnix, http-client + , http-types, lens, lens-aeson, lifted-base, megaparsec, memory , mtl, neat-interpolation, network, network-uri, nix-paths , optional-args, optparse-applicative, optparse-generic, pooled-io - , pureMD5, scientific, tar, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, temporary, text, time - , transformers, turtle, unordered-containers, uri-bytestring - , vector, wreq, zlib + , prettyprinter, pureMD5, scientific, tar, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text + , time, transformers, turtle, unordered-containers, uri-bytestring + , vector, word8, wreq, zlib }: mkDerivation { pname = "hocker"; - version = "1.0.5"; - sha256 = "0xv22kiw44y72asrnk027h9gxpfhjzgdm8sbcy70s4ipn8n62hha"; + version = "1.0.6"; + sha256 = "1j6gcb33jf3kcskxyl0s264h5b1rvmcgkrmhrgzw7i3314394xdj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson aeson-pretty ansi-wl-pprint async base bytestring - concurrentoutput containers cryptonite data-fix deepseq directory - exceptions filepath foldl hnix http-client http-types lens - lens-aeson lifted-base memory mtl neat-interpolation network + aeson aeson-pretty async base bytestring concurrentoutput + containers cryptonite data-fix deepseq directory exceptions + filepath foldl hnix http-client http-types lens lens-aeson + lifted-base megaparsec memory mtl neat-interpolation network network-uri nix-paths optparse-applicative optparse-generic - pooled-io pureMD5 scientific tar temporary text time transformers - turtle unordered-containers uri-bytestring vector wreq zlib + pooled-io prettyprinter pureMD5 scientific tar temporary text time + transformers turtle unordered-containers uri-bytestring vector wreq + zlib ]; executableHaskellDepends = [ base bytestring cryptonite data-fix filepath hnix lens mtl network optional-args optparse-applicative optparse-generic temporary text ]; testHaskellDepends = [ - aeson ansi-wl-pprint base bytestring containers cryptonite mtl - network network-uri tasty tasty-golden tasty-hunit tasty-quickcheck - tasty-smallcheck text unordered-containers + aeson base bytestring containers cryptonite mtl network network-uri + prettyprinter tasty tasty-golden tasty-hunit tasty-quickcheck + tasty-smallcheck text unordered-containers word8 ]; description = "Interact with the docker registry and generate nix build instructions"; license = stdenv.lib.licenses.asl20; @@ -138251,6 +138314,8 @@ self: { pname = "hw-balancedparens"; version = "0.4.1.0"; sha256 = "1ddxg00pwjvlrd4zdx9b9y7hm8rgxsxkvzzvwc34p2y75rivp21l"; + revision = "1"; + editedCabalFile = "0mc9lmjc3xrad4jlc9v66078362a791hnrrg9bclg1nq7jicfxgx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138391,8 +138456,8 @@ self: { pname = "hw-dsv"; version = "0.4.1.0"; sha256 = "1wv0yg662c3bq4kpgfqfjks59v17i5h3v3mils1qpxn4c57jr3s8"; - revision = "1"; - editedCabalFile = "1xhdvqmqm44ky8mbwi64fj3bawqswf58ghlbj2bvk136yflvz2c7"; + revision = "2"; + editedCabalFile = "1l7aww6nci05ns7hnk46r20as3xy1j0s5fxsrb5w0x9y2kwvqj61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138432,8 +138497,8 @@ self: { pname = "hw-dump"; version = "0.1.1.0"; sha256 = "14ya18i3xvay5xn8j20b06msqyd49h34w526k1x1fxdp0i2l3rwr"; - revision = "1"; - editedCabalFile = "0v310296cxsv92k2rjrc9zrwh7yb7lkjwivndpbh5hv5p8ll0zm6"; + revision = "2"; + editedCabalFile = "0p6cbijds7vc8bx9rb8s8bwr9dp4qc91idmd64llgz06d9kmvkcs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138467,8 +138532,8 @@ self: { pname = "hw-eliasfano"; version = "0.1.2.0"; sha256 = "1wqpzznmz6bl88wzhrfcbgi49dw7w7i0p92hyc0m58nanqm1zgnj"; - revision = "1"; - editedCabalFile = "0qqshcj482x0yfmb76fj6ng57sf3i0r8daz93kzab8lscarh31j9"; + revision = "2"; + editedCabalFile = "0l7h7pr6gpq0xnp4w003q3dxw7pmv2d6kpx2iqfc3nzzpa562ivv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138620,6 +138685,8 @@ self: { pname = "hw-ip"; version = "2.4.2.0"; sha256 = "1bvh4fkg1ffr3y8wink62rgkynlcgjhmra7a4w01h1dmw1vb2vfx"; + revision = "1"; + editedCabalFile = "19jbgqsmc71apmr6z0n0a2hgfhv9r0bsqa2x55r8grpyr91blpmw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138653,6 +138720,8 @@ self: { pname = "hw-json"; version = "1.3.2.1"; sha256 = "11lf4nxnkk8l25a44g1pkr9j1w03l69gqjgli5yfj6k68lzml7bf"; + revision = "1"; + editedCabalFile = "0l42hlc0icik28isjihqsj4cxzgdj1vzyxwazlyyv4f52liyjk61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138724,6 +138793,8 @@ self: { pname = "hw-json-simd"; version = "0.1.1.0"; sha256 = "0bpfyx2bd7pcr8y8bfahcdm30bznqixfawraq3xzy476vy9ppa9n"; + revision = "1"; + editedCabalFile = "047s5clxvi3l9x80lnf7nrv7myxnvqmh8y7syb2ryv3m549lyv2q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; @@ -138753,8 +138824,8 @@ self: { pname = "hw-json-simple-cursor"; version = "0.1.1.0"; sha256 = "1kwxnqsa2mkw5sa8rc9rixjm6f75lyjdaz7f67yyhwls5v4315bl"; - revision = "2"; - editedCabalFile = "144afi48rm613gcb8gccfyw5ybx9mzsfzsfq1nvsmlyijl8rgc1x"; + revision = "3"; + editedCabalFile = "0zmq1gb9znb84d9igppww6295glnhg5b6xlgadr435cddp5zmhpx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138793,6 +138864,8 @@ self: { pname = "hw-json-standard-cursor"; version = "0.2.3.1"; sha256 = "1mpsspp6ba2zqv38a0rcv93mbwb1rb8snmxklf32g02djj8b4vir"; + revision = "1"; + editedCabalFile = "0gdvwhj2jmd8dm1yi3kzs0lyw5r4bk7c50s21z1600v36bmzpdm1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138929,8 +139002,8 @@ self: { pname = "hw-packed-vector"; version = "0.2.1.0"; sha256 = "13hly2yzx6kx4j56iksgj4i3wmvg7rmxq57d0g87lmybzhha9q38"; - revision = "1"; - editedCabalFile = "070ac32s0azzhnqwrvhnfa18sxn60ayhmlikr6zk4vl1v03y0xbc"; + revision = "2"; + editedCabalFile = "0hlmi9w5z7j9ycqjf5avx3b09yglcbx8krypv274j2qrm5fzypr4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139033,8 +139106,8 @@ self: { pname = "hw-rankselect"; version = "0.13.4.0"; sha256 = "0chk3n4vb55px943w0l3q7pxhgbvqm64vn7lkhi7k0l2dpybycp7"; - revision = "1"; - editedCabalFile = "03p711rvs3qn9x5rfc90yxrbyp5fqsi9i2wbiwrs3vq6if66vc5z"; + revision = "2"; + editedCabalFile = "03lc8cgijr4ysz0i9c4pjhas4cd5ifxs400cr0nbasjvmz27hr3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139194,8 +139267,8 @@ self: { pname = "hw-uri"; version = "0.2.1.0"; sha256 = "1bwdzvms0n86k7gbkhk0jj3m1pcc9vbjk13kgpchqxpxm971srbs"; - revision = "1"; - editedCabalFile = "0bbsv8dj0z6wvgn0ldgvbrhji8mw5514pqwrp4ih8i2mjnfcdh2a"; + revision = "2"; + editedCabalFile = "0i6cw8m5g2hasif3q8gk7kpzavpmmk9fgr7vcqvym202ccbyj3dq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139244,8 +139317,8 @@ self: { pname = "hw-xml"; version = "0.5.1.0"; sha256 = "0g81kknllbc6v5wx7kgzhh78409njfzr3h7lfdx7ip0nkhhnpmw4"; - revision = "2"; - editedCabalFile = "1zi0ma6fmzghlc65dxpznsyiyp4ij7cwz1yw35i0jjm314mhi4va"; + revision = "3"; + editedCabalFile = "0b1lkhc6qf5vqafn69bid01k1hi043k7yrpl7pbxfrn154w8afpm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -145426,8 +145499,8 @@ self: { }: mkDerivation { pname = "ipfs"; - version = "1.1.2"; - sha256 = "13pzj9wx7f0wgzk1hy791a4p2ivfxyb045srfa75l065ca8bjnis"; + version = "1.1.3"; + sha256 = "0ndd4015s5mp2cxwg85zly8xw0wfpx2da9jj6p0hh015whk8p2fm"; libraryHaskellDepends = [ aeson base bytestring envy flow Glob ip lens monad-logger regex-compat rio servant-client servant-server swagger2 text vector @@ -150389,6 +150462,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "katip_0_8_5_0" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , bytestring, containers, criterion, deepseq, directory, either + , filepath, hostname, microlens, microlens-th, monad-control, mtl + , old-locale, quickcheck-instances, regex-tdfa, resourcet + , safe-exceptions, scientific, semigroups, stm, string-conv, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell + , text, time, time-locale-compat, transformers, transformers-base + , transformers-compat, unix, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "katip"; + version = "0.8.5.0"; + sha256 = "1kjzsx4fqbknnv158ypg5jhmw7ww1rk1mf99g3dci09xg97wmgjk"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring containers either hostname + microlens microlens-th monad-control mtl old-locale resourcet + safe-exceptions scientific semigroups stm string-conv + template-haskell text time transformers transformers-base + transformers-compat unix unliftio-core unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory microlens + quickcheck-instances regex-tdfa safe-exceptions stm tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + time time-locale-compat unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson async base blaze-builder criterion deepseq directory filepath + safe-exceptions text time transformers unix + ]; + description = "A structured logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "katip-datadog" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring , conduit, conduit-extra, connection, containers, katip, network @@ -167039,17 +167148,17 @@ self: { }) {}; "mcmc" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , data-default, directory, double-conversion, hspec, hspec-discover - , log-domain, microlens, mwc-random, QuickCheck, statistics, time - , transformers, vector, zlib + ({ mkDerivation, aeson, async, base, bytestring, containers + , criterion, data-default, directory, double-conversion, hspec + , hspec-discover, log-domain, microlens, mwc-random, QuickCheck + , statistics, time, transformers, vector, zlib }: mkDerivation { pname = "mcmc"; - version = "0.2.1"; - sha256 = "1jh88xqi485ha3bqrp012xsv7cljwsaxxc45l5npcr947g22ln11"; + version = "0.2.2"; + sha256 = "14gwarivvrkpf3rqlblas8fgxq5amz4vjqfw714qfml3gkljsr82"; libraryHaskellDepends = [ - aeson base bytestring containers data-default directory + aeson async base bytestring containers data-default directory double-conversion log-domain microlens mwc-random statistics time transformers vector zlib ]; @@ -176699,8 +176808,8 @@ self: { }: mkDerivation { pname = "musicw"; - version = "0.3.5"; - sha256 = "1fkkx6gsfcb138vr7f685wg0wbqhr2sk9h4vqiv8r254hkwzl91h"; + version = "0.3.5.1"; + sha256 = "1fhvkgjhfjvk2df46r9yicmsdqa9790h8dsnmjz6i8a2mqm02vnj"; libraryHaskellDepends = [ array base bytestring containers data-default file-embed ghcjs-base ghcjs-dom ghcjs-prim json monad-loops mtl safe text time @@ -177576,8 +177685,8 @@ self: { }: mkDerivation { pname = "myxine-client"; - version = "0.0.1.0"; - sha256 = "1vd1dxg39vwz9w58zxpp3mk66gk00534h6c846v2d77nqn0yajf0"; + version = "0.0.1.2"; + sha256 = "0399pig7nw6k1hjw16mjg7lh6z1vd0xhq625wbx76ispwk6gqifb"; libraryHaskellDepends = [ aeson async base blaze-html blaze-markup bytestring constraints containers dependent-map file-embed hashable http-client http-types @@ -202041,6 +202150,17 @@ self: { broken = true; }) {}; + "prettyprinter-lucid" = callPackage + ({ mkDerivation, base, lucid, prettyprinter, text }: + mkDerivation { + pname = "prettyprinter-lucid"; + version = "0.1.0.1"; + sha256 = "0m8dbxzs22zbahpr6r1frlfqyw581wyg92vswm3gi2qqpj406djh"; + libraryHaskellDepends = [ base lucid prettyprinter text ]; + description = "A prettyprinter backend for lucid"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prettyprinter-vty" = callPackage ({ mkDerivation, base, prettyprinter, vty }: mkDerivation { @@ -213575,6 +213695,35 @@ self: { broken = true; }) {}; + "registry_0_1_9_3" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph + , MonadRandom, mtl, multimap, protolude, random, resourcet + , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog + , tasty-th, template-haskell, text, transformers-base, universum + }: + mkDerivation { + pname = "registry"; + version = "0.1.9.3"; + sha256 = "1x418lv2nnw5ryrinciq1dg7wgmz0zsvv8v3mfrp38rx5x88hbic"; + libraryHaskellDepends = [ + base containers exceptions hashable mmorph mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base bytestring containers directory exceptions generic-lens + hashable hedgehog io-memoize mmorph MonadRandom mtl multimap + protolude random resourcet semigroupoids semigroups tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers-base universum + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "registry-hedgehog" = callPackage ({ mkDerivation, base, containers, generic-lens, hedgehog, mmorph , multimap, protolude, registry, tasty, tasty-discover @@ -219063,8 +219212,8 @@ self: { }: mkDerivation { pname = "runhs"; - version = "1.0.0.7"; - sha256 = "1j9sg598f92vckb31y1rms4iqnzn6cw7nckcmvjndksxwxhqmk4b"; + version = "1.0.0.8"; + sha256 = "177xak0p91xn827cnpa374l94lmmym2yrrcsxzjd9752hdzyw7k3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -232528,8 +232677,8 @@ self: { }: mkDerivation { pname = "slynx"; - version = "0.3.1"; - sha256 = "0af18y25lix0sy3vyl56d9a8yrvn9riw3vw2azwcq9pzia460qki"; + version = "0.3.2"; + sha256 = "0zxsylwsb4dr8a0lk1qnd2ha16wssxf9i5kfjs13pzls6nvlp57f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244605,6 +244754,38 @@ self: { broken = true; }) {}; + "symantic-atom" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, hashable + , megaparsec, symantic-xml, tasty, tasty-golden, text, time + , transformers, treeseq + }: + mkDerivation { + pname = "symantic-atom"; + version = "0.0.0.20200523"; + sha256 = "05lw93cx4zpwy7mq4ad6ly2wl51japczxcpss64svklwl78awcz2"; + libraryHaskellDepends = [ + base containers megaparsec symantic-xml text time transformers + treeseq + ]; + testHaskellDepends = [ + base bytestring containers deepseq hashable megaparsec symantic-xml + tasty tasty-golden text time transformers treeseq + ]; + description = "Library for reading and writing Atom"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-base" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "symantic-base"; + version = "0.0.0.20200708"; + sha256 = "0ynpx4nima334qrg2hj184w9fnd74rgm6h8n4pxf52cxghmnwdnc"; + libraryHaskellDepends = [ base ]; + description = "Basic symantics for writing Embedded Domain-Specific Languages (EDSL)"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "symantic-cli" = callPackage ({ mkDerivation, base, bytestring, containers, megaparsec , symantic-document, text, transformers @@ -244806,25 +244987,25 @@ self: { }) {}; "symantic-xml" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , deepseq, filepath, hashable, hxt-charproperties, megaparsec, safe - , tasty, tasty-golden, text, transformers, treeseq - , unordered-containers + ({ mkDerivation, base, bytestring, containers, deepseq, hashable + , hxt-charproperties, megaparsec, symantic-base, tasty + , tasty-golden, text, transformers, treeseq, unordered-containers }: mkDerivation { pname = "symantic-xml"; - version = "1.0.0.20190223"; - sha256 = "0mqx0ysp9c4zzljjgl0w68k5r8qgv2h35cfq0mqvijcjq5dgiflp"; + version = "2.0.0.20200523"; + sha256 = "1fz68n63i32rkyvmz99wyg20xhdniqqm1fds0xn320gi2z35092b"; + revision = "1"; + editedCabalFile = "1dvfglys9jza910wr7r7kda1jisbk9gj3d6rfccaip78hyra1z8l"; libraryHaskellDepends = [ - base bytestring containers data-default-class filepath hashable - hxt-charproperties megaparsec safe text transformers treeseq - unordered-containers + base bytestring containers hashable hxt-charproperties megaparsec + symantic-base text transformers treeseq unordered-containers ]; testHaskellDepends = [ - base bytestring containers data-default-class deepseq filepath - hashable megaparsec tasty tasty-golden text transformers treeseq + base bytestring containers deepseq hashable megaparsec + symantic-base tasty tasty-golden text transformers treeseq ]; - description = "Library for reading, validating and writing a subset of the XML format"; + description = "Library for reading, validating and writing XML"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -254632,8 +254813,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.3.1"; - sha256 = "172mbc79r14sccyghnbvcsa95lypas2gvqn1rf80f9yi2rsz9amy"; + version = "0.3.2"; + sha256 = "0yghlzscvf61ziw5wc26h3i9mh92d36r8m4b6f90hp9bd9mqx9rz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -267646,8 +267827,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.4"; - sha256 = "15zy3q8nk2myp6p6nqpi5sabdi4r0d5jb20g8df1x7r3rqr2lfh2"; + version = "3.6.5"; + sha256 = "17r0rn2xs5l5x9vwa5vyc4q11gyw2v29qs7vqicla0qb4hh140fj"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -273227,6 +273408,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wreq-helper" = callPackage + ({ mkDerivation, aeson, aeson-result, base, bytestring, http-client + , lens, text, wreq + }: + mkDerivation { + pname = "wreq-helper"; + version = "0.1.0.0"; + sha256 = "18kmh3swa3bbrkfj1dldi7iy6brdvyhfrbdn8gsz2kcarvhnv5f2"; + libraryHaskellDepends = [ + aeson aeson-result base bytestring http-client lens text wreq + ]; + description = "Wreq response process"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wreq-patchable" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring From 2d101df18c32982c414d1a62db5b4fb4d58201a8 Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Sun, 16 Aug 2020 20:47:04 +0100 Subject: [PATCH 195/520] vimPlugins.vim-smoothie: init at 2019-12-02 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 8e6fc7fc898..2a64214825d 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -6553,6 +6553,18 @@ let meta.homepage = "https://github.com/t9md/vim-smalls/"; }; + vim-smoothie = buildVimPluginFrom2Nix { + pname = "vim-smoothie"; + version = "2019-12-02"; + src = fetchFromGitHub { + owner = "psliwka"; + repo = "vim-smoothie"; + rev = "d3de4fbd7a9331b3eb05fa632611ebd34882cc83"; + sha256 = "1bsqnz02jaydr92mmcrdlva4zxs28zgxwgznr2bwk4wnn26i54p6"; + }; + meta.homepage = "https://github.com/psliwka/vim-smoothie/"; + }; + vim-smt2 = buildVimPluginFrom2Nix { pname = "vim-smt2"; version = "2018-05-20"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index dd6e020d76d..93824696ac1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -420,6 +420,7 @@ powerman/vim-plugin-AnsiEsc PProvost/vim-ps1 preservim/nerdcommenter preservim/nerdtree +psliwka/vim-smoothie ptzz/lf.vim purescript-contrib/purescript-vim python-mode/python-mode From 770acba6dea358e251f5821254795e53b3d613ba Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Sun, 16 Aug 2020 20:48:42 +0100 Subject: [PATCH 196/520] vimPlugins.vim-carbon-now-sh: init at 2019-02-14 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 2a64214825d..749e43b4f85 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4320,6 +4320,18 @@ let meta.homepage = "https://github.com/qpkorr/vim-bufkill/"; }; + vim-carbon-now-sh = buildVimPluginFrom2Nix { + pname = "vim-carbon-now-sh"; + version = "2019-02-14"; + src = fetchFromGitHub { + owner = "kristijanhusak"; + repo = "vim-carbon-now-sh"; + rev = "789b15d17966a1100ed2889d670923dd6d9ff063"; + sha256 = "1vfhdqv8mf8w0s4nv8k2rqzvahvh1lxm4zsd3ks1n334f580w8x4"; + }; + meta.homepage = "https://github.com/kristijanhusak/vim-carbon-now-sh/"; + }; + vim-choosewin = buildVimPluginFrom2Nix { pname = "vim-choosewin"; version = "2019-09-17"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 93824696ac1..5c115f7139f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -233,6 +233,7 @@ konfekt/fastfold kristijanhusak/defx-git kristijanhusak/defx-icons kristijanhusak/deoplete-phpactor +kristijanhusak/vim-carbon-now-sh kristijanhusak/vim-dirvish-git kristijanhusak/vim-hybrid-material kshenoy/vim-signature From eddeae232822dfaa21d3d432ed29092b9669eb6d Mon Sep 17 00:00:00 2001 From: RonanMacF Date: Sun, 16 Aug 2020 20:51:27 +0100 Subject: [PATCH 197/520] vimPlugins.vim-matchup: init at 2020-08-16 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 749e43b4f85..56a49061e33 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5701,6 +5701,18 @@ let meta.homepage = "https://github.com/plasticboy/vim-markdown/"; }; + vim-matchup = buildVimPluginFrom2Nix { + pname = "vim-matchup"; + version = "2020-08-16"; + src = fetchFromGitHub { + owner = "andymass"; + repo = "vim-matchup"; + rev = "b1af5a28242ae58ece98d833a2bf28e030d57230"; + sha256 = "1nnn0cxvpgmgi8xpqmhxr3vi42s3g1d0rn683hyizdn4i0l888k3"; + }; + meta.homepage = "https://github.com/andymass/vim-matchup/"; + }; + vim-mergetool = buildVimPluginFrom2Nix { pname = "vim-mergetool"; version = "2019-06-22"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 5c115f7139f..bbe0bf273db 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -14,6 +14,7 @@ andreshazard/vim-logreview AndrewRadev/splitjoin.vim andsild/peskcolor.vim andviro/flake8-vim +andymass/vim-matchup andys8/vim-elm-syntax antoinemadec/coc-fzf ap/vim-css-color From 162864341d89434fb74e82bd43efa17ca915241b Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Fri, 14 Aug 2020 16:52:20 +0200 Subject: [PATCH 198/520] factorio: update all x86_64 versions to 1.0.0 --- pkgs/games/factorio/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 7aeddb82a53..0226acf1604 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -62,15 +62,15 @@ let binDists = { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { - stable = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; }; - experimental = bdist { sha256 = "0la4590lf4gssdcf29qm73mz901dnp7cii712fcqw382qh9hbl9q"; version = "0.18.36"; withAuth = true; }; + stable = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; }; + experimental = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; }; }; headless = { - stable = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; }; - experimental = bdist { sha256 = "0d64zzvp6zwz6p2izhhj998b6z8wd6r1b5p8mz1sbpz3v91sazj7"; version = "0.18.36"; }; + stable = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; }; + experimental = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; }; }; demo = { - stable = bdist { sha256 = "07qknasaqvzl9vy1fglm7xmdi7ynhmslrb0a209fhbfs0s7qqlgi"; version = "0.17.79"; }; + stable = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; }; }; }; i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in { From 670c094af1a0c0ce83891e2f417658976bd9da35 Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Fri, 14 Aug 2020 21:29:53 +1000 Subject: [PATCH 199/520] pythonPackages.aiojobs: init at 0.2.2 --- .../python-modules/aiojobs/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/aiojobs/default.nix diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix new file mode 100644 index 00000000000..68c34df1afb --- /dev/null +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -0,0 +1,45 @@ +{ buildPythonPackage +, fetchPypi +, isPy27 +, aiohttp +, pytest +, pytest-aiohttp +, pygments +, lib +}: + +buildPythonPackage rec { + pname = "aiojobs"; + version = "0.2.2"; + format = "flit"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "01a0msjh4w58fd7jplmblh0hwgpzwjs5xkgqz3d0p5yv3cykwjwf"; + }; + + nativeBuildInputs = [ + pygments + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest + pytest-aiohttp + ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + homepage = "https://github.com/aio-libs/aiojobs"; + description = "Jobs scheduler for managing background task (asyncio)"; + license = licenses.asl20; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f02e4c04f9d..6b616af06c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -184,6 +184,8 @@ in { aioamqp = callPackage ../development/python-modules/aioamqp { }; + aiojobs = callPackage ../development/python-modules/aiojobs { }; + aioredis = callPackage ../development/python-modules/aioredis { }; aiorun = callPackage ../development/python-modules/aiorun { }; From 8336ba3888820f32ddf4b331091657241a82f834 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 Aug 2020 04:12:12 +0000 Subject: [PATCH 200/520] virt-manager-qt: 0.70.91 -> 0.71.95 --- pkgs/applications/virtualization/virt-manager/qt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 85bc7c428ff..7112a8b33e8 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "virt-manager-qt"; - version = "0.70.91"; + version = "0.71.95"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = version; - sha256 = "1z2kq88lljvr24z1kizvg3h7ckf545h4kjhhrjggkr0w4wjjwr43"; + sha256 = "1s8753bzsjyixpv1c2l9d1xjcn8i47k45qj7pr50prc64ldf5f47"; }; cmakeFlags = [ From 262be88e102b207842087df61de57670d35a677e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 Aug 2020 05:11:14 +0000 Subject: [PATCH 201/520] qt5ct: 1.0 -> 1.1 --- pkgs/tools/misc/qt5ct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index c83ba0afa4e..5b88030849d 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -4,11 +4,11 @@ let inherit (lib) getDev; in mkDerivation rec { pname = "qt5ct"; - version = "1.0"; + version = "1.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "118sjzhb0z4vxfmvz93hpmsyqyav1z9k97m4q4wcx0l1myypnb59"; + sha256 = "1lnx4wqk87lbr6lqc64w5g5ppjjv75kq2r0q0bz9gfpryzdw8xxg"; }; nativeBuildInputs = [ qmake qttools ]; From 83a1f0ac0ae3f3b22b2f946062b7a5538685cf3a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 18 Aug 2020 14:10:51 +1000 Subject: [PATCH 202/520] maintainers: remove unneeded quotes from handles --- maintainers/maintainer-list.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8c2ab1ad261..0eb51e63e07 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1891,7 +1891,7 @@ githubId = 4971975; name = "Janne Heß"; }; - "dasj19" = { + dasj19 = { email = "daniel@serbanescu.dk"; github = "dasj19"; githubId = 7589338; @@ -8199,7 +8199,7 @@ githubId = 8547242; name = "Stefan Rohrbacher"; }; - "thelegy" = { + thelegy = { email = "mail+nixos@0jb.de"; github = "thelegy"; githubId = 3105057; From 7550aab312c6a786d3654d5b81070a9e67532da1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 16 Aug 2020 21:45:17 -0700 Subject: [PATCH 203/520] azure-cli: lessen number of overrides --- pkgs/tools/admin/azure-cli/python-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index df1d31c1864..1ff74369432 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -21,7 +21,10 @@ let }); overrideAzureMgmtPackage = package: version: extension: sha256: - package.overrideAttrs(oldAttrs: rec { + # check to make sure overriding is even necessary + if version == package.version then + package + else package.overrideAttrs(oldAttrs: rec { inherit version; src = py.pkgs.fetchPypi { From dca51dc3fd6c6e49558296375093b62bf7b956e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 18 Aug 2020 07:42:41 +0100 Subject: [PATCH 204/520] buildFHSUserEnvChrootenv: rename to buildFHSUserEnvChroot --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e23dee4469..101679891a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -154,8 +154,8 @@ in buildEnv = callPackage ../build-support/buildenv { }; # not actually a package # TODO: eventually migrate everything to buildFHSUserEnvBubblewrap - buildFHSUserEnv = buildFHSUserEnvChrootenv; - buildFHSUserEnvChrootenv = callPackage ../build-support/build-fhs-userenv { }; + buildFHSUserEnv = buildFHSUserEnvChroot; + buildFHSUserEnvChroot = callPackage ../build-support/build-fhs-userenv { }; buildFHSUserEnvBubblewrap = callPackage ../build-support/build-fhs-userenv-bubblewrap { }; buildMaven = callPackage ../build-support/build-maven.nix {}; From 7e74f610fb0b38d032eea6e0f637a0e37330eaf4 Mon Sep 17 00:00:00 2001 From: Pawel Kruszewski Date: Sat, 4 Jul 2020 18:51:11 +0200 Subject: [PATCH 205/520] timeular: init at 3.4.1 --- pkgs/applications/office/timeular/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/office/timeular/default.nix diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix new file mode 100644 index 00000000000..f0fc5c3738c --- /dev/null +++ b/pkgs/applications/office/timeular/default.nix @@ -0,0 +1,45 @@ +{ + stdenv, + fetchurl, + appimageTools, + libsecret +}: + +let + version = "3.4.1"; + pname = "timeular"; + name = "${pname}-${version}"; + src = fetchurl { + url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; + sha256 = "1s5jjdl1nzq9yd582lqs904yl10mp0s25897zmifmcbw1vz38bar"; + }; + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in appimageTools.wrapType2 rec { + inherit name src; + + extraPkgs = pkgs: with pkgs; [ + libsecret + ]; + + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop + install -m 444 -D ${appimageContents}/timeular.png $out/share/icons/hicolor/512x512/apps/timeular.png + substituteInPlace $out/share/applications/timeular.desktop --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with stdenv.lib; { + description = "Timetracking by flipping 8-sided dice"; + longDescription = '' + The Timeular Tracker is an 8-sided dice that sits on your desk. + Assign an activity to each side and flip to start tracking your time. + The desktop app tell you where every minute of your day is spent. + ''; + homepage = https://timeular.com; + license = licenses.unfree; + maintainers = with maintainers; [ ktor ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3331ff9fadc..15223535ff5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26444,6 +26444,8 @@ in tilt = callPackage ../applications/networking/cluster/tilt {}; + timeular = callPackage ../applications/office/timeular {}; + tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; tewi-font = callPackage ../data/fonts/tewi From 8a9f58a375c401b96da862d969f66429def1d118 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 16 Aug 2020 11:40:51 -0700 Subject: [PATCH 206/520] python3Packages.dask: ignore flaky test --- pkgs/development/python-modules/dask/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 9c03f6d7165..d69ae77e1a6 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -60,6 +60,7 @@ buildPythonPackage rec { "test_argwhere_str" "test_count_nonzero_str" "rolling_methods" # floating percision error ~0.1*10^8 small + "num_workers_config" # flaky ]; meta = { From e0c07bc2e26cb612cad4bfdbd5570ad3137b10ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 18 Aug 2020 11:06:12 +0200 Subject: [PATCH 207/520] gocode-gomod: add vendorSha256 --- pkgs/development/tools/gocode-gomod/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index dc6abaca598..01ee2931c99 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -18,6 +18,8 @@ buildGoModule rec { sha256 = "YAOYrPPKgnjCErq8+iW0Le51clGBv0MJy2Nnn7UVo/s="; }; + vendorSha256 = null; + postInstall = '' mv $out/bin/gocode $out/bin/gocode-gomod ''; From edb74a6b899114d720fd5aab43341d363a51df98 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 18 Aug 2020 04:20:00 -0500 Subject: [PATCH 208/520] scheme-manpages: 2020-05-17 -> 2020-08-14 --- pkgs/data/documentation/scheme-manpages/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index 0d57b8e261c..345fb99b7bb 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "scheme-manpages-unstable"; - version = "2020-05-17"; + version = "2020-08-14"; src = fetchFromGitHub { owner = "schemedoc"; - repo = "scheme-manpages"; - rev = "e97bd240d398e4e5ffc62305e506a2f2428322a4"; - sha256 = "0c0n3mvghm9c2id8rxfd829plb64nf57jkqgmxf83w7x9jczbqqb"; + repo = "manpages"; + rev = "2e99a0aea9c0327e3c2dcfb9b7a2f8f528b4fe43"; + sha256 = "0ykj4i8mx50mgyz9q63glfnc0mw1lf89hwsflpnbizjda5b4s0fp"; }; dontBuild = true; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Manpages for Scheme"; - homepage = "https://github.com/schemedoc/scheme-manpages"; + description = "Unix manual pages for R6RS and R7RS"; + homepage = "https://github.com/schemedoc/manpages"; license = licenses.mit; maintainers = [ maintainers.marsam ]; platforms = platforms.all; From b7e0beb306dbd1de7cebb68323cb447b086d7c99 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 18 Aug 2020 04:20:00 -0500 Subject: [PATCH 209/520] nnn: 3.3 -> 3.4 https://github.com/jarun/nnn/releases/tag/v3.4 --- pkgs/applications/misc/nnn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 293f1d16b1c..9ec5018c4e3 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 { pname = "nnn"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "1dxa5blpdf0s03znhnr23zzpsz8yzqpnwknycz42h1w9g9s9jz1v"; + sha256 = "0lyrpyhzzs2bdgx3ifq1c5dq3s2v30xdiaq0j8zjc64s6bghfxnd"; }; configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf); From 34310d1727d051e49f4c70e8eef0694fab273c31 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 18 Aug 2020 04:20:00 -0500 Subject: [PATCH 210/520] buildpack: 0.7.0 -> 0.13.0 --- pkgs/development/tools/buildpack/default.nix | 21 +++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index c3eace89174..1d8e53ba525 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -1,26 +1,33 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "pack"; - version = "0.7.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "0glfxrw3x35m4nmhr9xwlc14y5g9zni85rcrcn3dvkvgh4m6ipaj"; + sha256 = "0h7lgsg5d74pfa15kx0y3ngnvmz64znqk2k73iyjya9pi9h8hh88"; }; - goPackagePath = "github.com/buildpacks/pack"; + vendorSha256 = "1c38g169kq9kv6x0x1rlg39ywbc1q66fndby0v85b3ri3xb52869"; + + nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/pack" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/buildpacks/pack/cmd.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/buildpacks/pack.Version=${version}" ]; + + postInstall = '' + installShellCompletion --bash --name pack.bash $(PACK_HOME=$PWD $out/bin/pack completion --shell bash) + installShellCompletion --zsh --name _pack $(PACK_HOME=$PWD $out/bin/pack completion --shell zsh) + ''; meta = with lib; { homepage = "https://buildpacks.io/"; changelog = "https://github.com/buildpacks/pack/releases/tag/v${version}"; - description = "Local CLI for building apps using Cloud Native Buildpacks"; + description = "CLI for building apps using Cloud Native Buildpacks"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; From 2fbddb0ccb9ad539f1b4a96ea5bc0247dff6da25 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 18 Aug 2020 12:24:02 +0200 Subject: [PATCH 211/520] nixos/test-instrumentation: properly import `options` for `qemu`-check If `qemu-vm.nix` is imported, the option `virtualisation.qemu.consoles` should be set to make sure that the machine's output isn't rendered on the graphical window of QEMU. This is needed when interactively running a NixOS test or in conjunction with `nixos-build-vms(8)`. The patch 257855753073987160c293fdedc9d95a33cbc0e8 tries to only do this if the option actually exists, however this condition used to be always false since `options` wasn't imported in the module and pointed to `lib.options` due to the `with lib;`-clause. --- nixos/modules/testing/test-instrumentation.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index a6b34e36d20..30ffb12cbad 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -1,22 +1,13 @@ # This module allows the test driver to connect to the virtual machine # via a root shell attached to port 514. -{ config, lib, pkgs, ... }: +{ options, config, lib, pkgs, ... }: with lib; with import ../../lib/qemu-flags.nix { inherit pkgs; }; { - # This option is a dummy that if used in conjunction with - # modules/virtualisation/qemu-vm.nix gets merged with the same option defined - # there and only is declared here because some modules use - # test-instrumentation.nix but not qemu-vm.nix. - # - # One particular example are the boot tests where we want instrumentation - # within the images but not other stuff like setting up 9p filesystems. - options.virtualisation.qemu = { }; - config = { systemd.services.backdoor = From 9ce2c3804ad4017aed312245dc4177735f7ad89a Mon Sep 17 00:00:00 2001 From: wucke13 Date: Tue, 18 Aug 2020 12:29:34 +0200 Subject: [PATCH 212/520] mattermost: 5.25.0 -> 5.25.3 --- pkgs/servers/mattermost/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 520d28715d5..722802a019d 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: let - version = "5.25.0"; + version = "5.25.3"; mattermost-server = buildGoPackage rec { pname = "mattermost-server"; @@ -11,7 +11,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "002mbpgsk988pfjla84ngixq4jmgjgr3gj3h874y1njgz8xq0d92"; + sha256 = "03xcwlbb9ff5whsdn2m3kqskxpwpfciikjjndbhksc8k8963z07j"; }; goPackagePath = "github.com/mattermost/mattermost-server"; @@ -29,7 +29,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "08sp4idms7qyafk59plfzk380r72bphqa3ka648v25wh5h3293pn"; + sha256 = "1p1qxzrd6rj1i43vj18ysknrw2v02s7llx94nrdd5lk10ayzmg63"; }; installPhase = '' From 1cdddfef4b2eeea7430e499fc3f5b1711b73551e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 18 Aug 2020 08:02:25 -0400 Subject: [PATCH 213/520] oh-my-zsh: 2020-08-06 -> 2020-08-17 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f6553cf6342..a7e17df9dee 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-08-06"; + version = "2020-08-17"; pname = "oh-my-zsh"; - rev = "079e7bb5e0a79171f3356d55d3f6302a82645a39"; + rev = "7deda85f8cf7fb3c2f36b771a2e8bd70a28bf0b3"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "10fpq57alk117991wwbprcmv69f27hbpp7a3gb70mzyjmfiflgk3"; + sha256 = "16czqfa01a1ak00ln37334q3gq811f5df2nqbvmj3129agnx28s4"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From bae91fb6c951ae9d703195800eea60a1dc03eae3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 18 Aug 2020 08:02:31 -0400 Subject: [PATCH 214/520] jenkins: 2.235.3 -> 2.235.5 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 5f0807cad87..8723ca2b443 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.235.3"; + version = "2.235.5"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "109rycgy8bg3na173vz5f3bq7w33a6kap8158kx6zhignni451p8"; + sha256 = "02zpnqhdkhg8p8cddkqklgihjpwcbnybkcw5rspipz6kiyqzg1n7"; }; buildCommand = '' From 552c4d84caa5f1a7a806dd6e143889a84b821205 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 18 Aug 2020 09:04:51 -0300 Subject: [PATCH 215/520] patchelfUnstable: 2020-06-03 -> 2020-07-11 --- pkgs/development/tools/misc/patchelf/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 858e8e5a9b8..0d9eeb84bfb 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "patchelf-${version}"; - version = "2020-06-03"; + version = "2020-07-11"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "4aff679d9eaa1a3ec0228901a4e79b57361b4094"; - sha256 = "1i47z2dl6pgv5krl58lwy3xs327jmhy9cni3b8yampab1kh9ad1l"; + rev = "126372b636733b160e693c9913e871f6755c02e"; + sha256 = "07cn40ypys5pyc3jfgxvqj7qk5v6m2rr5brnpmxdsl1557ryx226"; }; # Drop test that fails on musl (?) From 041f70f62f38de7bc77eeea725fda313cfe71fcd Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 10 Aug 2020 15:48:09 -0300 Subject: [PATCH 216/520] p4v: 2017.3.1601999 -> 2020.1.1966006 --- .../version-management/p4v/default.nix | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 148f122f7c8..01ea365b76c 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl_1_0_2, xkeyboard_config, wrapQtAppsHook }: +{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebengine, qtwebkit, openssl, xkeyboard_config, patchelfUnstable, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "p4v"; - version = "2017.3.1601999"; + version = "2020.1.1966006"; src = fetchurl { - url = "https://cdist2.perforce.com/perforce/r17.3/bin.linux26x86_64/p4v.tgz"; - sha256 = "9ded42683141e1808535ec3e87d3149f890315c192d6e97212794fd54862b9a4"; + url = "https://cdist2.perforce.com/perforce/r20.1/bin.linux26x86_64/p4v.tgz"; + sha256 = "0zc70d7jgdrd2jli338n1h05hgb7jmmv8hvq205wh78vvllrlv10"; }; dontBuild = true; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ patchelfUnstable wrapQtAppsHook ]; ldLibraryPath = lib.makeLibraryPath [ stdenv.cc.cc.lib @@ -18,26 +18,33 @@ stdenv.mkDerivation rec { qtmultimedia qtscript qtsensors + qtwebengine qtwebkit - openssl_1_0_2 + openssl ]; dontWrapQtApps = true; installPhase = '' mkdir $out cp -r bin $out - mkdir -p $out/lib/p4v - cp -r lib/p4v/P4VResources $out/lib/p4v + mkdir -p $out/lib + cp -r lib/P4VResources $out/lib for f in $out/bin/*.bin ; do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f - + patchelf --set-rpath $ldLibraryPath --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f + # combining this with above breaks rpath (patchelf bug?) + patchelf --add-needed libstdc++.so $f \ + --clear-symbol-version _ZNSt20bad_array_new_lengthD1Ev \ + --clear-symbol-version _ZTVSt20bad_array_new_length \ + --clear-symbol-version _ZTISt20bad_array_new_length \ + $f wrapQtApp $f \ - --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb done ''; + dontFixup = true; + meta = { description = "Perforce Visual Client"; homepage = "https://www.perforce.com"; From 392ca2ce5a26bf99ce09062d14f7295dda3361a8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 Aug 2020 14:15:33 +0200 Subject: [PATCH 217/520] linuxPackages.rtl8192eu: 4.4.1.20190319 -> 4.4.1.20200620 Fixes #95448 Co-Authored-By: Dmitry Geurkov --- pkgs/os-specific/linux/rtl8192eu/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index 909a972efa3..c6527ac285d 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel }: +{ stdenv, lib, fetchFromGitHub, kernel, bc }: with lib; @@ -6,19 +6,21 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { name = "rtl8192eu-${kernel.version}-${version}"; - version = "4.4.1.20190319"; + version = "4.4.1.20200620"; src = fetchFromGitHub { owner = "Mange"; repo = "rtl8192eu-linux-driver"; - rev = "0a7199b"; - sha256 = "0xxb8z7fd997ny53bgmf95hyqsmwjplbj6fry0rf65k9x9nggx71"; + rev = "925ac2be34dd608a7ca42daebf9713f0c1bcec74"; + sha256 = "159vg0scq47wnn600karpgzx3naaiyl1rg8608c8d28nhm62gvjz"; }; hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; + buildInputs = [ bc ]; + makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; From fc121e28131f772eab197b89b50b29106b6d36ea Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 18 Aug 2020 01:57:31 +0200 Subject: [PATCH 218/520] nixos/dovecot: Improve mailboxes type The previous use of types.either disallowed assigning a list at one point and an attrset an another. --- nixos/modules/services/mail/dovecot.nix | 33 +++++++++++-------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 51cbcbf1cbc..c166ef68f29 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ options, config, lib, pkgs, ... }: with lib; @@ -83,11 +83,11 @@ let ) ( - optionalString (cfg.mailboxes != []) '' + optionalString (cfg.mailboxes != {}) '' protocol imap { namespace inbox { inbox=yes - ${concatStringsSep "\n" (map mailboxConfig cfg.mailboxes)} + ${concatStringsSep "\n" (map mailboxConfig (attrValues cfg.mailboxes))} } } '' @@ -131,12 +131,13 @@ let special_use = \${toString mailbox.specialUse} '' + "}"; - mailboxes = { ... }: { + mailboxes = { name, ... }: { options = { name = mkOption { - type = types.nullOr (types.strMatching ''[^"]+''); + type = types.strMatching ''[^"]+''; example = "Spam"; - default = null; + default = name; + readOnly = true; description = "The name of the mailbox."; }; auto = mkOption { @@ -335,19 +336,11 @@ in }; mailboxes = mkOption { - type = with types; let m = submodule mailboxes; in either (listOf m) (attrsOf m); + type = with types; coercedTo + (listOf unspecified) + (list: listToAttrs (map (entry: { name = entry.name; value = removeAttrs entry ["name"]; }) list)) + (attrsOf (submodule mailboxes)); default = {}; - apply = x: - if isList x then warn "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03!" x - else mapAttrsToList (name: value: - if value.name != null - then throw '' - When specifying dovecot2 mailboxes as attributes, declaring - a `name'-attribute is prohibited! The name ${value.name} should - be the attribute key! - '' - else value // { inherit name; } - ) x; example = literalExample '' { Spam = { specialUse = "Junk"; auto = "create"; }; @@ -471,6 +464,10 @@ in environment.systemPackages = [ dovecotPkg ]; + warnings = mkIf (any isList options.services.dovecot2.mailboxes.definitions) [ + "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03! See the release notes for more info for migration." + ]; + assertions = [ { assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != []; From f85c04ab55879f7bd89546edc6f49a9fe3074452 Mon Sep 17 00:00:00 2001 From: Andika Demas Riyandi Date: Tue, 18 Aug 2020 20:18:59 +0700 Subject: [PATCH 219/520] nixpkgs-fmt: 0.9.0 -> 1.0.0 --- pkgs/tools/nix/nixpkgs-fmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index 44e41857759..40e74fba8a8 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -7,10 +7,10 @@ rustPlatform.buildRustPackage rec { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rO30/B+mH/ZOEH8IF2fF4uHK7XQqyR4zIDueHnmNMHA="; + sha256 = "0w1himwix7iv40rixj9afknwmqg2qmkif23z217gc7x63zyg9vdc"; }; - cargoSha256 = "sha256-fP/8yDg+W7hiWGucbRr338y9PEDTb2bdq71JKE6M8OM="; + cargoSha256 = "1qzhii72hjdxmgfncvyk80ybvk6zywd6v73bb1ibhnry734grzvw"; meta = with lib; { description = "Nix code formatter for nixpkgs"; From fa30c9abed61f30218a211842204705986d486f9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 14 Aug 2020 19:26:18 +0200 Subject: [PATCH 220/520] lib/modules: improve error-message for undeclared options if prefix contains no options An easy-to-make mistake when declaring e.g. a submodule is the accidental confusion of `options` and `config`: types.submodule { config = { foo = mkOption { /* ... */ }; }; } However the error-message The option `[definition 1-entry 1].foo' defined in `' does not exist. is fairly unhelpful because it seems as the options are declared at the first sight. In fact, it took a colleague and me a while to track down such a mistake a few days ago and we both agreed that this should be somehow caught to save the time we spent debugging the module in question. At first I decided to catch this error in the `submodules`-type directly by checking whether `options` is undeclared, however this becomes fairly complicated as soon as a submodule-declaration e.g. depends on existing `config`-values which would've lead to some ugly `builtins.tryExec`-heuristic. This patch now simply checks if the option's prefix has any options defined if a point in evaluation is reached where it's clear that the option in question doesn't exist. This means that this patch doesn't change the logic of the module system, it only provides a more detailed error in certain cases: The option `[definition 1-entry 1].foo' defined in `' does not exist. However it seems as there are no options defined in [definition 1-entry 1]. Are you sure you've declared your options properly? This happens if you e.g. declared your options in `types.submodule' under `config' rather than `options'. --- lib/modules.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 9c308d347cf..2ec34699809 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -115,8 +115,19 @@ rec { checkUnmatched = if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then - let firstDef = head merged.unmatchedDefns; - in throw "The option `${showOption (prefix ++ firstDef.prefix)}' defined in `${firstDef.file}' does not exist." + let + firstDef = head merged.unmatchedDefns; + baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' defined in `${firstDef.file}' does not exist."; + in + if attrNames options == [ "_module" ] + then throw '' + ${baseMsg} + + However there are no options defined in `${showOption prefix}'. Are you sure you've + declared your options properly? This can happen if you e.g. declared your options in `types.submodule' + under `config' rather than `options'. + '' + else throw baseMsg else null; result = builtins.seq checkUnmatched { From f9b57fd66ae59c38225acf2bfe21804ce03d2f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 18 Aug 2020 15:56:34 +0200 Subject: [PATCH 221/520] #95747: fix build of GHC 8.10.2 --- pkgs/development/compilers/ghc/8.10.2.nix | 5 + .../compilers/ghc/issue-18549.patch | 296 ++++++++++++++++++ 2 files changed, 301 insertions(+) create mode 100644 pkgs/development/compilers/ghc/issue-18549.patch diff --git a/pkgs/development/compilers/ghc/8.10.2.nix b/pkgs/development/compilers/ghc/8.10.2.nix index 2eaff53bac1..f3d64ced81e 100644 --- a/pkgs/development/compilers/ghc/8.10.2.nix +++ b/pkgs/development/compilers/ghc/8.10.2.nix @@ -107,6 +107,11 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 + patches = [ + ./issue-18549.patch + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. diff --git a/pkgs/development/compilers/ghc/issue-18549.patch b/pkgs/development/compilers/ghc/issue-18549.patch new file mode 100644 index 00000000000..eb30d9d9dd4 --- /dev/null +++ b/pkgs/development/compilers/ghc/issue-18549.patch @@ -0,0 +1,296 @@ +From fac083e7ac8a37b61a4082bbbca2848e52fd1bb2 Mon Sep 17 00:00:00 2001 +From: Ben Gamari +Date: Sun, 9 Aug 2020 09:15:16 -0400 +Subject: [PATCH] Revert "[linker/rtsSymbols] More linker symbols" + +This reverts commit aa2e5863699306920513b216f337de09e29b5bb8. +--- + rts/RtsSymbols.c | 224 ++++------------------------------------------- + 1 file changed, 17 insertions(+), 207 deletions(-) + +diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c +index d10a6900db..b2f90a892d 100644 +--- a/rts/RtsSymbols.c ++++ b/rts/RtsSymbols.c +@@ -58,6 +58,7 @@ + SymI_HasProto(signal_handlers) \ + SymI_HasProto(stg_sig_install) \ + SymI_HasProto(rtsTimerSignal) \ ++ SymI_HasProto(atexit) \ + SymI_NeedsDataProto(nocldstop) + #endif + +@@ -976,213 +977,29 @@ + RTS_USER_SIGNALS_SYMBOLS \ + RTS_INTCHAR_SYMBOLS + ++ + // 64-bit support functions in libgcc.a +-// See https://gcc.gnu.org/onlinedocs/gccint/Libgcc.html#Libgcc +-#define RTS_LIBGCC_SYMBOLS_32 \ +- SymI_NeedsProto(__fixunsdfdi) \ +- /* 4 The GCC low-level runtime library */\ +- /* 4.1.1 Arithmetic functions */\ +- /* SymI_NeedsProto(__ashlsi3) */\ +- SymI_NeedsProto(__ashldi3) \ +- /* SymI_NeedsProto(__ashlti3) */\ +- /* These functions return the result of shifting a left by b bits. */\ +- /* SymI_NeedsProto(__ashrsi3) */\ +- SymI_NeedsProto(__ashrdi3) \ +- /* SymI_NeedsProto(__ashrti3) */\ +- /* These functions return the result of arithmetically shifting a right by b bits. */\ +- /* SymI_NeedsProto(__divsi3) */\ +- SymI_NeedsProto(__divdi3) \ +- /* SymI_NeedsProto(__divti3) */\ +- /* These functions return the quotient of the signed division of a and b. */\ +- /* SymI_NeedsProto(__lshrsi3) */ \ +- SymI_NeedsProto(__lshrdi3) \ +- /* SymI_NeedsProto(__lshrti3) */ \ +- /* These functions return the result of logically shifting a right by b bits. */\ +- /* SymI_NeedsProto(__modsi3) */ \ +- SymI_NeedsProto(__moddi3) \ +- /* SymI_NeedsProto(__modti3) */ \ +- /* These functions return the remainder of the signed division of a and b. */\ +- /* SymI_NeedsProto(__mulsi3) */ \ +- SymI_NeedsProto(__muldi3) \ +- /* SymI_NeedsProto(__multi3) */ \ +- /* These functions return the product of a and b. */\ +- SymI_NeedsProto(__negdi2) \ +- /* SymI_NeedsProto(__negti2) */ \ +- /* These functions return the negation of a. */\ +- /* SymI_NeedsProto(__udivsi3) */ \ +- SymI_NeedsProto(__udivdi3) \ +- /* SymI_NeedsProto(__udivti3) */ \ +- /* These functions return the quotient of the unsigned division of a and b. */\ +- SymI_NeedsProto(__udivmoddi4) \ +- /* SymI_NeedsProto(__udivmodti4) */ \ +- /* These functions calculate both the quotient and remainder of the unsigned division of a and b. The return value is the quotient, and the remainder is placed in variable pointed to by c. */\ +- /* SymI_NeedsProto(__umodsi3) */ \ +- SymI_NeedsProto(__umoddi3) \ +- /* SymI_NeedsProto(__umodti3) */ \ +- /* These functions return the remainder of the unsigned division of a and b. */\ +- /* 4.1.2 Comparison functions */\ +- /* The following functions implement integral comparisons. These functions implement a low-level compare, upon which the higher level comparison operators (such as less than and greater than or equal to) can be constructed. The returned values lie in the range zero to two, to allow the high-level operators to be implemented by testing the returned result using either signed or unsigned comparison. */\ +- SymI_NeedsProto(__cmpdi2) \ +- /* SymI_NeedsProto(__cmpti2) */ \ +- /* These functions perform a signed comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\ +- SymI_NeedsProto(__ucmpdi2) \ +- /* SymI_NeedsProto(__ucmpti2) */ \ +- /* These functions perform an unsigned comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\ +- /* 4.1.3 Trapping arithmetic functions */\ +- /* The following functions implement trapping arithmetic. These functions call the libc function abort upon signed arithmetic overflow. */\ +- SymI_NeedsProto(__absvsi2) \ +- SymI_NeedsProto(__absvdi2) \ +- /* These functions return the absolute value of a. */\ +- /* SymI_NeedsProto(__addvsi3) */ \ +- SymI_NeedsProto(__addvdi3) \ +- /* These functions return the sum of a and b; that is a + b. */\ +- /* SymI_NeedsProto(__mulvsi3) */ \ +- SymI_NeedsProto(__mulvdi3) \ +- /* The functions return the product of a and b; that is a * b. */\ +- SymI_NeedsProto(__negvsi2) \ +- SymI_NeedsProto(__negvdi2) \ +- /* These functions return the negation of a; that is -a. */\ +- /* SymI_NeedsProto(__subvsi3) */ \ +- SymI_NeedsProto(__subvdi3) \ +- /* These functions return the difference between b and a; that is a - b. */\ +- /* 4.1.4 Bit operations */\ +- SymI_NeedsProto(__clzsi2) \ +- SymI_NeedsProto(__clzdi2) \ +- /* SymI_NeedsProto(__clzti2) */ \ +- /* These functions return the number of leading 0-bits in a, starting at the most significant bit position. If a is zero, the result is undefined. */\ +- SymI_NeedsProto(__ctzsi2) \ +- SymI_NeedsProto(__ctzdi2) \ +- /* SymI_NeedsProto(__ctzti2) */ \ +- /* These functions return the number of trailing 0-bits in a, starting at the least significant bit position. If a is zero, the result is undefined. */\ +- SymI_NeedsProto(__ffsdi2) \ +- /* SymI_NeedsProto(__ffsti2) */ \ +- /* These functions return the index of the least significant 1-bit in a, or the value zero if a is zero. The least significant bit is index one. */\ +- SymI_NeedsProto(__paritysi2) \ +- SymI_NeedsProto(__paritydi2) \ +- /* SymI_NeedsProto(__parityti2) */\ +- /* These functions return the value zero if the number of bits set in a is even, and the value one otherwise. */\ +- SymI_NeedsProto(__popcountsi2) \ +- SymI_NeedsProto(__popcountdi2) \ +- /* SymI_NeedsProto(__popcountti2) */ \ +- /* These functions return the number of bits set in a. */\ +- SymI_NeedsProto(__bswapsi2) \ +- SymI_NeedsProto(__bswapdi2) +-#define RTS_LIBGCC_SYMBOLS_aarch32 \ +- /* armv6l */\ +- /* TODO: should check for __ARM_EABI__ */\ +- SymI_NeedsProto(__aeabi_d2f) \ +- SymI_NeedsProto(__aeabi_d2iz) \ +- SymI_NeedsProto(__aeabi_d2lz) \ +- SymI_NeedsProto(__aeabi_d2uiz) \ +- SymI_NeedsProto(__aeabi_d2ulz) \ +- SymI_NeedsProto(__aeabi_dadd) \ +- SymI_NeedsProto(__aeabi_dcmpeq) \ +- SymI_NeedsProto(__aeabi_dcmpge) \ +- SymI_NeedsProto(__aeabi_dcmpgt) \ +- SymI_NeedsProto(__aeabi_dcmple) \ +- SymI_NeedsProto(__aeabi_dcmplt) \ +- SymI_NeedsProto(__aeabi_dcmpun) \ +- SymI_NeedsProto(__aeabi_ddiv) \ +- SymI_NeedsProto(__aeabi_dmul) \ +- SymI_NeedsProto(__aeabi_dneg) \ +- SymI_NeedsProto(__aeabi_dsub) \ +- SymI_NeedsProto(__aeabi_f2d) \ +- SymI_NeedsProto(__aeabi_f2iz) \ +- SymI_NeedsProto(__aeabi_f2lz) \ +- SymI_NeedsProto(__aeabi_f2uiz) \ +- SymI_NeedsProto(__aeabi_f2ulz) \ +- SymI_NeedsProto(__aeabi_fadd) \ +- SymI_NeedsProto(__aeabi_fcmpeq) \ +- SymI_NeedsProto(__aeabi_fcmpge) \ +- SymI_NeedsProto(__aeabi_fcmpgt) \ +- SymI_NeedsProto(__aeabi_fcmple) \ +- SymI_NeedsProto(__aeabi_fcmplt) \ +- SymI_NeedsProto(__aeabi_fcmpun) \ +- SymI_NeedsProto(__aeabi_fdiv) \ +- SymI_NeedsProto(__aeabi_fmul) \ +- SymI_NeedsProto(__aeabi_fneg) \ +- SymI_NeedsProto(__aeabi_fsub) \ +- SymI_NeedsProto(__aeabi_i2d) \ +- SymI_NeedsProto(__aeabi_i2f) \ +- SymI_NeedsProto(__aeabi_idiv) \ +- SymI_NeedsProto(__aeabi_idivmod) \ +- SymI_NeedsProto(__aeabi_l2d) \ +- SymI_NeedsProto(__aeabi_l2f) \ +- SymI_NeedsProto(__aeabi_lasr) \ +- SymI_NeedsProto(__aeabi_lcmp) \ +- SymI_NeedsProto(__aeabi_ldivmod) \ +- SymI_NeedsProto(__aeabi_llsl) \ +- SymI_NeedsProto(__aeabi_llsr) \ +- SymI_NeedsProto(__aeabi_lmul) \ +- SymI_NeedsProto(__aeabi_ui2d) \ +- SymI_NeedsProto(__aeabi_ui2f) \ +- SymI_NeedsProto(__aeabi_uidiv) \ +- SymI_NeedsProto(__aeabi_uidivmod) \ +- SymI_NeedsProto(__aeabi_ul2d) \ +- SymI_NeedsProto(__aeabi_ul2f) \ +- SymI_NeedsProto(__aeabi_ulcmp) \ +- SymI_NeedsProto(__aeabi_uldivmod) +-#define RTS_LIBGCC_SYMBOLS_64 \ ++#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32) ++#define RTS_LIBGCC_SYMBOLS \ ++ SymI_NeedsProto(__divdi3) \ ++ SymI_NeedsProto(__udivdi3) \ ++ SymI_NeedsProto(__moddi3) \ ++ SymI_NeedsProto(__umoddi3) \ ++ SymI_NeedsProto(__muldi3) \ ++ SymI_NeedsProto(__ashldi3) \ ++ SymI_NeedsProto(__ashrdi3) \ ++ SymI_NeedsProto(__lshrdi3) \ ++ SymI_NeedsProto(__fixunsdfdi) ++#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 ++#define RTS_LIBGCC_SYMBOLS \ + SymI_NeedsProto(__udivti3) \ + SymI_NeedsProto(__umodti3) +- +-/* for aarch64 */ +-#define RTS_LIBGCC_SYMBOLS_aarch64 \ +- SymI_NeedsProto(__netf2) \ +- SymI_NeedsProto(__addtf3) \ +- SymI_NeedsProto(__subtf3) \ +- SymI_NeedsProto(__multf3) \ +- SymI_NeedsProto(__extenddftf2) \ +- SymI_NeedsProto(__fixtfsi) \ +- SymI_NeedsProto(__fixunstfsi) \ +- SymI_NeedsProto(__floatsitf) \ +- SymI_NeedsProto(__floatunsitf) +- +-#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && defined(arm_HOST_OS) +-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32 RTS_LIBGCC_SYMBOLS_aarch32 +-#elif defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32) +-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32 +-#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 && defined(aarch64_HOST_OS) +-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64 RTS_LIBGCC_SYMBOLS_aarch64 +-#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 +-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64 + #else + #define RTS_LIBGCC_SYMBOLS + #endif + +-#if !defined(mingw32_HOST_OS) && !defined(DYNAMIC) && (defined(_FORTIFY_SOURCE) || defined(__SSP__)) +-#define RTS_SSP_SYMBOLS \ +- SymI_NeedsProto(__stack_chk_guard) \ +- SymI_NeedsProto(__stack_chk_fail) +-#else +-#define RTS_SSP_SYMBOLS +-#endif +-#if !defined(DYNAMIC) && defined(linux_HOST_OS) +-// we need these for static musl builds. However when +-// linking shared objects (DLLs) this will fail, hence +-// we do not include them when building with -DDYNAMIC +-#define RTS_LINKER_SYMBOLS \ +- SymI_NeedsProto(__fini_array_start) \ +- SymI_NeedsProto(__fini_array_end) +-#else +-#define RTS_LINKER_SYMBOLS +-#endif +- +-#if defined(darwin_HOST_OS) && defined(powerpc_HOST_ARCH) +- // Symbols that don't have a leading underscore +- // on Mac OS X. They have to receive special treatment, +- // see machoInitSymbolsWithoutUnderscore() +-#define RTS_MACHO_NOUNDERLINE_SYMBOLS \ +- SymI_NeedsProto(saveFP) \ +- SymI_NeedsProto(restFP) +-#endif +- + /* entirely bogus claims about types of these symbols */ +-/* to prevent a bit of define expansion, SymI_NeedsProto is a variadic +- * macro. And we'll concat vvv with the __VA_ARGS__. This prevents +- * vvv from getting macro expanded. +- */ +-#define SymI_NeedsProto(vvv,...) extern void vvv ## __VA_ARGS__ (void); ++#define SymI_NeedsProto(vvv) extern void vvv(void); + #define SymI_NeedsDataProto(vvv) extern StgWord vvv[]; + #if defined(COMPILING_WINDOWS_DLL) + #define SymE_HasProto(vvv) SymE_HasProto(vvv); +@@ -1209,8 +1026,6 @@ RTS_DARWIN_ONLY_SYMBOLS + RTS_OPENBSD_ONLY_SYMBOLS + RTS_LIBGCC_SYMBOLS + RTS_LIBFFI_SYMBOLS +-RTS_SSP_SYMBOLS +-RTS_LINKER_SYMBOLS + #undef SymI_NeedsProto + #undef SymI_NeedsDataProto + #undef SymI_HasProto +@@ -1230,7 +1045,7 @@ RTS_LINKER_SYMBOLS + #define SymE_HasDataProto(vvv) \ + SymE_HasProto(vvv) + +-#define SymI_NeedsProto(vvv,...) SymI_HasProto(vvv ## __VA_ARGS__) ++#define SymI_NeedsProto(vvv) SymI_HasProto(vvv) + #define SymI_NeedsDataProto(vvv) SymI_HasDataProto(vvv) + #define SymE_NeedsProto(vvv) SymE_HasProto(vvv) + #define SymE_NeedsDataProto(vvv) SymE_HasDataProto(vvv) +@@ -1251,8 +1066,6 @@ RTS_LINKER_SYMBOLS + #define SymI_HasProto_deprecated(vvv) \ + { #vvv, (void*)0xBAADF00D, true }, + +-void *RTS_DYNAMIC = NULL; +- + RtsSymbolVal rtsSyms[] = { + RTS_SYMBOLS + RTS_RET_SYMBOLS +@@ -1264,14 +1077,11 @@ RtsSymbolVal rtsSyms[] = { + RTS_LIBGCC_SYMBOLS + RTS_LIBFFI_SYMBOLS + SymI_HasDataProto(nonmoving_write_barrier_enabled) +- RTS_SSP_SYMBOLS +- RTS_LINKER_SYMBOLS + #if defined(darwin_HOST_OS) && defined(i386_HOST_ARCH) + // dyld stub code contains references to this, + // but it should never be called because we treat + // lazy pointers as nonlazy. + { "dyld_stub_binding_helper", (void*)0xDEADBEEF, false }, + #endif +- { "_DYNAMIC", (void*)(&RTS_DYNAMIC), false }, + { 0, 0, false } /* sentinel */ + }; +-- +2.25.4 + From 0a84375ddb9c41fb5ffa9bf9785debcec84b0614 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 18 Aug 2020 10:00:27 -0400 Subject: [PATCH 222/520] linux: 5.8-rc7 -> 5.9-rc1 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index a2163ba323a..6cd63e0be6b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,15 +3,15 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8-rc7"; - extraMeta.branch = "5.8"; + version = "5.9-rc1"; + extraMeta.branch = "5.9"; # modDirVersion needs to be x.y.z, will always add .0 modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1v6ch9lwbckmv66w6ysj24ap41pfxq55ssrfkg0qyz2pv0mc1rxc"; + sha256 = "08x6s4wydbrr4rqq3zfxq6qmnha4ikn7m9rmdqd42hmxl2ynqxla"; }; # Should the testing kernels ever be built on Hydra? From 927bd3e66553ffd1dfb19b11c464ff7664dfd0d5 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 17 Aug 2020 09:40:06 -0400 Subject: [PATCH 223/520] zabbix.server: fix broken build --- pkgs/servers/monitoring/zabbix/server.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index fdf3fd476df..9d0e1c199d3 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, curl, libevent, libiconv, libxml2, openssl, pcre, zlib +{ stdenv, fetchurl, autoreconfHook, pkgconfig, curl, libevent, libiconv, libxml2, openssl, pcre, zlib , jabberSupport ? true, iksemel , ldapSupport ? true, openldap , odbcSupport ? true, unixODBC @@ -25,7 +25,7 @@ in inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ curl libevent @@ -65,6 +65,13 @@ in find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} + ''; + preAutoreconf = '' + for i in $(find . -type f -name "*.m4"); do + substituteInPlace $i \ + --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' + done + ''; + postInstall = '' mkdir -p $out/share/zabbix/database/ cp -r include $out/ From 5e630bf5d391d4b61db6914991f1488f7ee20aff Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 17 Aug 2020 10:07:53 -0400 Subject: [PATCH 224/520] zabbix: 4.4.8 -> 5.0.2 --- nixos/doc/manual/release-notes/rl-2009.xml | 34 +++++++++++++++++++++ pkgs/servers/monitoring/zabbix/versions.nix | 6 ++-- pkgs/servers/monitoring/zabbix/web.nix | 2 +- pkgs/top-level/aliases.nix | 3 ++ pkgs/top-level/all-packages.nix | 4 +-- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 7a06c06fed1..0ba0ec8f89a 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -156,6 +156,40 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; Support for built-in LCDs in various pieces of Logitech hardware (keyboards and USB speakers). hardware.logitech.lcd.enable enables support for all hardware supported by the g15daemon project. + + + Zabbix now defaults to 5.0, updated from 4.4. Please carefully read through + the upgrade guide + and apply any changes required. Be sure to take special note of the section on + enabling extended range of numeric (float) values + as you will need to apply this database migration manually. + + + If you are using Zabbix Server with a MySQL or MariaDB database you should note that using a character set of utf8 and a collate of utf8_bin has become mandatory with + this release. See the upstream issue for further discussion. Before upgrading you should check the character set and collation used by + your database and ensure they are correct: + + SELECT + default_character_set_name, + default_collation_name + FROM + information_schema.schemata + WHERE + schema_name = 'zabbix'; + + If these values are not correct you should take a backup of your database and convert the character set and collation as required. Here is an + example of how to do so, taken from + the Zabbix forums: + + ALTER DATABASE `zabbix` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + + -- the following will produce a list of SQL commands you should subsequently execute + SELECT CONCAT("ALTER TABLE ", TABLE_NAME," CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;") AS ExecuteTheString + FROM information_schema.`COLUMNS` + WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ci"; + + + diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index c75df46cf04..f867c819d07 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { - v44 = generic { - version = "4.4.8"; - sha256 = "0l9n4l5179lf90krv1kb0lraipj7q4hyba6r48n6rj2zqx2j4mn0"; + v50 = generic { + version = "5.0.2"; + sha256 = "1cnns7ixqi7ank3cbvcs7d8rb5zh9qiqbmgivazr83jnz81qg46w"; }; v40 = generic { diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index a75deff3db2..f677fe5c0af 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -18,7 +18,7 @@ import ./versions.nix ({ version, sha256 }: installPhase = '' mkdir -p $out/share/zabbix/ - cp -a frontends/php/. $out/share/zabbix/ + cp -a ${if stdenv.lib.versionAtLeast version "5.0.0" then "ui/." else "frontends/php/."} $out/share/zabbix/ cp ${phpConfig} $out/share/zabbix/conf/zabbix.conf.php ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5882eadc73b..4508285b15a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -687,6 +687,9 @@ mapAliases ({ mumble_git = pkgs.mumble; murmur_git = pkgs.murmur; + # added 2020-08-17 + zabbix44 = throw "Zabbix 4.4 is end of life, see https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 for details on upgrading to Zabbix 5.0."; + # added 2019-09-06 zeroc_ice = pkgs.zeroc-ice; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a15825b5a6..70522db3cb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16922,11 +16922,11 @@ in server = server-pgsql; }; - zabbix44 = recurseIntoAttrs (zabbixFor "v44"); + zabbix50 = recurseIntoAttrs (zabbixFor "v50"); zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40"); zabbix30 = dontRecurseIntoAttrs (zabbixFor "v30"); - zabbix = zabbix44; + zabbix = zabbix50; zipkin = callPackage ../servers/monitoring/zipkin { }; From f6a3403055e20774a9338f1a3c0b8cc5f27ee88d Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 17 Aug 2020 20:27:50 -0400 Subject: [PATCH 225/520] nixos/zabbix: use proper character set and collation for mysql database --- .../services/monitoring/zabbix-proxy.nix | 17 +++++++++-------- .../services/monitoring/zabbix-server.nix | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix index d51507c91a1..2c8b8b92cb3 100644 --- a/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -5,8 +5,8 @@ let pgsql = config.services.postgresql; mysql = config.services.mysql; - inherit (lib) mkDefault mkEnableOption mkIf mkMerge mkOption; - inherit (lib) attrValues concatMapStringsSep literalExample optional optionalAttrs optionalString types; + inherit (lib) mkAfter mkDefault mkEnableOption mkIf mkMerge mkOption; + inherit (lib) attrValues concatMapStringsSep getName literalExample optional optionalAttrs optionalString types; inherit (lib.generators) toKeyValue; user = "zabbix"; @@ -232,14 +232,15 @@ in services.mysql = optionalAttrs mysqlLocal { enable = true; package = mkDefault pkgs.mariadb; - ensureDatabases = [ cfg.database.name ]; - ensureUsers = [ - { name = cfg.database.user; - ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; - } - ]; }; + systemd.services.mysql.postStart = mkAfter (optionalString mysqlLocal '' + ( echo "CREATE DATABASE IF NOT EXISTS \`${cfg.database.name}\` CHARACTER SET utf8 COLLATE utf8_bin;" + echo "CREATE USER IF NOT EXISTS '${cfg.database.user}'@'localhost' IDENTIFIED WITH ${if (getName config.services.mysql.package == getName pkgs.mariadb) then "unix_socket" else "auth_socket"};" + echo "GRANT ALL PRIVILEGES ON \`${cfg.database.name}\`.* TO '${cfg.database.user}'@'localhost';" + ) | ${config.services.mysql.package}/bin/mysql -N + ''); + services.postgresql = optionalAttrs pgsqlLocal { enable = true; ensureDatabases = [ cfg.database.name ]; diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index df09488a8cc..c8658634ecb 100644 --- a/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixos/modules/services/monitoring/zabbix-server.nix @@ -5,8 +5,8 @@ let pgsql = config.services.postgresql; mysql = config.services.mysql; - inherit (lib) mkDefault mkEnableOption mkIf mkMerge mkOption; - inherit (lib) attrValues concatMapStringsSep literalExample optional optionalAttrs optionalString types; + inherit (lib) mkAfter mkDefault mkEnableOption mkIf mkMerge mkOption; + inherit (lib) attrValues concatMapStringsSep getName literalExample optional optionalAttrs optionalString types; inherit (lib.generators) toKeyValue; user = "zabbix"; @@ -220,14 +220,15 @@ in services.mysql = optionalAttrs mysqlLocal { enable = true; package = mkDefault pkgs.mariadb; - ensureDatabases = [ cfg.database.name ]; - ensureUsers = [ - { name = cfg.database.user; - ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; - } - ]; }; + systemd.services.mysql.postStart = mkAfter (optionalString mysqlLocal '' + ( echo "CREATE DATABASE IF NOT EXISTS \`${cfg.database.name}\` CHARACTER SET utf8 COLLATE utf8_bin;" + echo "CREATE USER IF NOT EXISTS '${cfg.database.user}'@'localhost' IDENTIFIED WITH ${if (getName config.services.mysql.package == getName pkgs.mariadb) then "unix_socket" else "auth_socket"};" + echo "GRANT ALL PRIVILEGES ON \`${cfg.database.name}\`.* TO '${cfg.database.user}'@'localhost';" + ) | ${config.services.mysql.package}/bin/mysql -N + ''); + services.postgresql = optionalAttrs pgsqlLocal { enable = true; ensureDatabases = [ cfg.database.name ]; From 416cfc71c0dde320e00dfc166624ac1567827204 Mon Sep 17 00:00:00 2001 From: elkowar <5300871+elkowar@users.noreply.github.com> Date: Fri, 7 Aug 2020 18:52:25 +0200 Subject: [PATCH 226/520] pipr: init at 0.0.12 --- pkgs/applications/misc/pipr/default.nix | 34 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/misc/pipr/default.nix diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/applications/misc/pipr/default.nix new file mode 100644 index 00000000000..b5a12f9ce7e --- /dev/null +++ b/pkgs/applications/misc/pipr/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, bubblewrap +, makeWrapper +, lib +}: + +rustPlatform.buildRustPackage rec { + pname = "pipr"; + version = "0.0.12"; + + src = fetchFromGitHub { + owner = "ElKowar"; + repo = pname; + rev = "v${version}"; + sha256 = "0l7yvpc59mbzh87lngj6pj8w586fwa07829l5x9mmxnkf6srapmc"; + }; + + cargoSha256 = "1xzc1x5mjvj2jgdhwmjbdbqi8d7ln1ss7akn72d96kmy1wsj1qsa"; + + nativeBuildInputs = [ makeWrapper ]; + postFixup = '' + wrapProgram "$out/bin/pipr" --prefix PATH : ${lib.makeBinPath [ bubblewrap ]} + ''; + + meta = with stdenv.lib; { + description = "A commandline-tool to interactively write shell pipelines"; + homepage = "https://github.com/ElKowar/pipr"; + license = licenses.mit; + maintainers = with maintainers; [ elkowar ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fb087e8b6a..83ed0c64b85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6089,6 +6089,8 @@ in pirate-get = callPackage ../tools/networking/pirate-get { }; + pipr = callPackage ../applications/misc/pipr { }; + pipreqs = callPackage ../tools/misc/pipreqs { }; pius = callPackage ../tools/security/pius { }; From 9b55e5bfcbbe1d152a0d19a1ff93d85a0c18f85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 18 Aug 2020 19:32:01 +0200 Subject: [PATCH 227/520] python3Packages.spacy_models: use pythonImportCheck For each model, check whether we can actually import the model after building. --- pkgs/development/python-modules/spacy/models.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index b83ae5d7ddc..c4a314ea474 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -14,6 +14,8 @@ let propagatedBuildInputs = [ spacy ] ++ lib.optionals (lang == "zh") [ jieba pkuseg ]; + pythonImportsCheck = [ pname ]; + meta = with stdenv.lib; { description = "Models for the spaCy NLP library"; homepage = "https://github.com/explosion/spacy-models"; From fb7acacd42658a59717bb20151ffe2b18efe508e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 18 Aug 2020 19:38:43 +0200 Subject: [PATCH 228/520] python3Packages.spacy: add passthru test I have been using the main example of the spaCy web page for testing updates of spacy (and its transitive dependencies). Let's convert this into a proper test to take out manual testing. --- .../spacy/annotation-test/annotate.py | 69 +++++++++++++++++++ .../spacy/annotation-test/default.nix | 23 +++++++ .../python-modules/spacy/default.nix | 3 + 3 files changed, 95 insertions(+) create mode 100644 pkgs/development/python-modules/spacy/annotation-test/annotate.py create mode 100644 pkgs/development/python-modules/spacy/annotation-test/default.nix diff --git a/pkgs/development/python-modules/spacy/annotation-test/annotate.py b/pkgs/development/python-modules/spacy/annotation-test/annotate.py new file mode 100644 index 00000000000..822eb8ac074 --- /dev/null +++ b/pkgs/development/python-modules/spacy/annotation-test/annotate.py @@ -0,0 +1,69 @@ +import pytest +import spacy + +en_text = ( + "When Sebastian Thrun started working on self-driving cars at " + "Google in 2007, few people outside of the company took him " + "seriously. “I can tell you very senior CEOs of major American " + "car companies would shake my hand and turn away because I wasn’t " + "worth talking to,” said Thrun, in an interview with Recode earlier " + "this week.") + + +@pytest.fixture +def en_core_web_sm(): + return spacy.load("en_core_web_sm") + + +@pytest.fixture +def doc_en_core_web_sm(en_core_web_sm): + return en_core_web_sm(en_text) + + +def test_entities(doc_en_core_web_sm): + entities = list(map(lambda e: (e.text, e.label_), + doc_en_core_web_sm.ents)) + + assert entities == [ + ('Sebastian Thrun', 'PERSON'), + ('Google', 'ORG'), ('2007', 'DATE'), + ('American', 'NORP'), + ('Thrun', 'ORG'), + ('earlier this week', 'DATE') + ] + + +def test_nouns(doc_en_core_web_sm): + assert [ + chunk.text for chunk in doc_en_core_web_sm.noun_chunks] == [ + 'Sebastian Thrun', + 'self-driving cars', + 'Google', + 'few people', + 'the company', + 'him', + 'I', + 'you', + 'very senior CEOs', + 'major American car companies', + 'my hand', + 'I', + 'Thrun', + 'an interview', + 'Recode'] + + +def test_verbs(doc_en_core_web_sm): + assert [ + token.lemma_ for token in doc_en_core_web_sm if token.pos_ == "VERB"] == [ + 'start', + 'work', + 'drive', + 'take', + 'can', + 'tell', + 'would', + 'shake', + 'turn', + 'talk', + 'say'] diff --git a/pkgs/development/python-modules/spacy/annotation-test/default.nix b/pkgs/development/python-modules/spacy/annotation-test/default.nix new file mode 100644 index 00000000000..1b066ff3c39 --- /dev/null +++ b/pkgs/development/python-modules/spacy/annotation-test/default.nix @@ -0,0 +1,23 @@ +{ stdenv, pytest, spacy_models }: + +stdenv.mkDerivation { + name = "spacy-annotation-test"; + + src = ./.; + + dontConfigure = true; + dontBuild = true; + doCheck = true; + + checkInputs = [ pytest spacy_models.en_core_web_sm ]; + + checkPhase = '' + pytest annotate.py + ''; + + installPhase = '' + touch $out + ''; + + meta.timeout = 60; +} diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 322f10d00ae..077aea4dc9a 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, callPackage , fetchPypi , pythonOlder , pytest @@ -64,6 +65,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "spacy" ]; + passthru.tests = callPackage ./annotation-test {}; + meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; homepage = "https://github.com/explosion/spaCy"; From e3193c9cdff60e3383fd95cb229b8362d490b491 Mon Sep 17 00:00:00 2001 From: oxalica Date: Sun, 16 Aug 2020 04:47:41 +0800 Subject: [PATCH 229/520] mycrypto: init at 1.7.11 --- .../blockchains/mycrypto/default.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/applications/blockchains/mycrypto/default.nix diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix new file mode 100644 index 00000000000..717683f91bc --- /dev/null +++ b/pkgs/applications/blockchains/mycrypto/default.nix @@ -0,0 +1,57 @@ +{ lib, appimageTools, fetchurl, makeDesktopItem +, gsettings-desktop-schemas, gtk2 +}: + +let + pname = "MyCrypto"; + version = "1.7.11"; + sha256 = "0k9vpmy6q5vkypicfsw87qg8s4xrs5gmzvdabhxpn0i5yikl8qy0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/mycryptohq/mycrypto/releases/download/${version}/linux-x86-64_${version}_MyCrypto.AppImage"; + inherit sha256; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; + + desktopItem = makeDesktopItem { + name = pname; + desktopName = pname; + comment = "MyCrypto is a free, open-source interface for interacting with the blockchain"; + exec = pname; + icon = "mycrypto"; + categories = "Finance;"; + }; + +in appimageTools.wrapType2 rec { + inherit name src; + + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk2}/share/gsettings-schemas/${gtk2.name}:$XDG_DATA_DIRS + ''; + + multiPkgs = null; # no p32bit needed + extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + + mkdir -p $out/share + cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons + ''; + + meta = with lib; { + description = "A free, open-source interface for interacting with the blockchain"; + longDescription = '' + MyCrypto is an open-source, client-side tool for generating ether wallets, + handling ERC-20 tokens, and interacting with the blockchain more easily. + ''; + homepage = "https://mycrypto.com"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ oxalica ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a15825b5a6..3f8d1d0b490 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5472,6 +5472,8 @@ in mycli = callPackage ../tools/admin/mycli { }; + mycrypto = callPackage ../applications/blockchains/mycrypto { }; + mydumper = callPackage ../tools/backup/mydumper { }; mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { }; From 1ce7c5af12cf806288685e6db8cf1fbf636e412c Mon Sep 17 00:00:00 2001 From: oxalica Date: Sun, 16 Aug 2020 05:11:03 +0800 Subject: [PATCH 230/520] mycrypto: fix icon --- pkgs/applications/blockchains/mycrypto/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix index 717683f91bc..094d65fc7f9 100644 --- a/pkgs/applications/blockchains/mycrypto/default.nix +++ b/pkgs/applications/blockchains/mycrypto/default.nix @@ -41,6 +41,8 @@ in appimageTools.wrapType2 rec { mkdir -p $out/share cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons + chmod -R +w $out/share + mv $out/share/icons/hicolor/{0x0,256x256} ''; meta = with lib; { From 726bf83ffaed48b88d530080abad8a0cdc6455f7 Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 18 Aug 2020 20:41:40 +0800 Subject: [PATCH 231/520] mycrypto: 1.7.11 -> 1.7.12 --- pkgs/applications/blockchains/mycrypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix index 094d65fc7f9..77e603e8380 100644 --- a/pkgs/applications/blockchains/mycrypto/default.nix +++ b/pkgs/applications/blockchains/mycrypto/default.nix @@ -4,8 +4,8 @@ let pname = "MyCrypto"; - version = "1.7.11"; - sha256 = "0k9vpmy6q5vkypicfsw87qg8s4xrs5gmzvdabhxpn0i5yikl8qy0"; + version = "1.7.12"; + sha256 = "0zmdmkli9zxygrcvrd4lbi0xqyq32dqlkxby8lsjknj1nd6l26n3"; name = "${pname}-${version}"; src = fetchurl { From c8e727c78339db22941ae53c306dbefd2fc5335b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Aug 2020 20:21:08 +0200 Subject: [PATCH 232/520] Revert "Merge #94880: thunderbird: enable branding by default" This reverts commit 4bf857a0f2a0c63b924356c949c0def7c6bf7ae2, reversing changes made to 00c48082521d6fbf236abf5c80cd3d2abac9d0df. See the PR for discussion; apparently an explicit permission is missing. --- .../networking/mailreaders/thunderbird/68.nix | 16 ++++++---------- .../mailreaders/thunderbird/default.nix | 16 ++++++---------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index f4d45508568..4b1efef027e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -62,16 +62,12 @@ , waylandSupport ? true , libxkbcommon, calendarSupport ? true -# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at -# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we -# have permission to use the official branding. -# -# For purposes of documentation the statement of @sylvestre: -# > As the person who did part of the work described in the LWN article -# > and release manager working for Mozilla, I can confirm the statement -# > that I made in -# > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815006 -, enableOfficialBranding ? true +, # If you want the resulting program to call itself "Thunderbird" instead +# of "Earlybird" or whatever, enable this option. However, those +# binaries may not be distributed without permission from the +# Mozilla Foundation, see +# http://www.mozilla.org/foundation/trademarks/. +enableOfficialBranding ? false }: assert waylandSupport -> gtk3Support == true; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 749e24faff6..961806fa9ab 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -60,16 +60,12 @@ , waylandSupport ? true , libxkbcommon, calendarSupport ? true -# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at -# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we -# have permission to use the official branding. -# -# For purposes of documentation the statement of @sylvestre: -# > As the person who did part of the work described in the LWN article -# > and release manager working for Mozilla, I can confirm the statement -# > that I made in -# > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815006 -, enableOfficialBranding ? true +, # If you want the resulting program to call itself "Thunderbird" instead +# of "Earlybird" or whatever, enable this option. However, those +# binaries may not be distributed without permission from the +# Mozilla Foundation, see +# http://www.mozilla.org/foundation/trademarks/. +enableOfficialBranding ? false }: assert waylandSupport -> gtk3Support == true; From 9841a891ef1835dab14ed1bcf9b283a3450a0768 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 30 May 2020 13:34:16 +0200 Subject: [PATCH 233/520] molot-lite: init at unstable-2014-04-23 --- pkgs/applications/audio/molot-lite/base.nix | 26 +++++++++++++++++++ .../applications/audio/molot-lite/default.nix | 14 ++++++++++ pkgs/applications/audio/molot-lite/mono.nix | 18 +++++++++++++ pkgs/applications/audio/molot-lite/stereo.nix | 18 +++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 5 files changed, 80 insertions(+) create mode 100644 pkgs/applications/audio/molot-lite/base.nix create mode 100644 pkgs/applications/audio/molot-lite/default.nix create mode 100644 pkgs/applications/audio/molot-lite/mono.nix create mode 100644 pkgs/applications/audio/molot-lite/stereo.nix diff --git a/pkgs/applications/audio/molot-lite/base.nix b/pkgs/applications/audio/molot-lite/base.nix new file mode 100644 index 00000000000..44880f74901 --- /dev/null +++ b/pkgs/applications/audio/molot-lite/base.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip, lv2 }: + +rec { + version = "unstable-2014-04-23"; + + src = fetchurl { + # the source is zipped inside the repository, so this doesn't work: + # url = "mirror://sourceforge/molot/molot_src.zip"; + url = "https://sourceforge.net/p/molot/code/ci/master/tree/molot_src.zip?format=raw"; + sha256 = "1c47dwfgrmn9459px8s5zikcqyr0777v226qzcxlr6azlcjwr51b"; + }; + + buildInputs = [ unzip lv2 ]; + + unpackPhase = "unzip $src"; + + installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ]; + + meta = with stdenv.lib; { + description = "a stereo and mono audio signal dynamic range compressor in LV2 format"; + homepage = "https://sourceforge.net/projects/molot/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/molot-lite/default.nix b/pkgs/applications/audio/molot-lite/default.nix new file mode 100644 index 00000000000..bb858e10644 --- /dev/null +++ b/pkgs/applications/audio/molot-lite/default.nix @@ -0,0 +1,14 @@ +{ stdenvNoCC, molot-mono-lite, molot-stereo-lite }: +with stdenvNoCC.lib; + + +stdenvNoCC.mkDerivation { + pname = "molot-lite"; + version = molot-mono-lite.version; + + buildCommand = '' + mkdir -p $out/lib/lv2/ + ln -s ${makeLibraryPath [molot-mono-lite]}/lv2/Molot_Mono_Lite.lv2 $out/lib/lv2 + ln -s ${makeLibraryPath [molot-stereo-lite]}/lv2/Molot_Stereo_Lite.lv2 $out/lib/lv2 + ''; +} diff --git a/pkgs/applications/audio/molot-lite/mono.nix b/pkgs/applications/audio/molot-lite/mono.nix new file mode 100644 index 00000000000..dd2f0e3261a --- /dev/null +++ b/pkgs/applications/audio/molot-lite/mono.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, unzip, lv2 }: + +let + base = import ./base.nix { inherit stdenv fetchurl unzip lv2; }; +in +stdenv.mkDerivation { + pname = "molot-mono-lite"; + + version = base.version; + src = base.src; + unpackPhase = base.unpackPhase; + buildInputs = base.buildInputs; + installFlags = base.installFlags; + + prePatch = '' + cd Molot_Mono_Lite + ''; +} diff --git a/pkgs/applications/audio/molot-lite/stereo.nix b/pkgs/applications/audio/molot-lite/stereo.nix new file mode 100644 index 00000000000..3cf59868930 --- /dev/null +++ b/pkgs/applications/audio/molot-lite/stereo.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, unzip, lv2 }: + +let + base = import ./base.nix { inherit stdenv fetchurl unzip lv2; }; +in +stdenv.mkDerivation { + pname = "molot-stereo-lite"; + + version = base.version; + src = base.src; + unpackPhase = base.unpackPhase; + buildInputs = base.buildInputs; + installFlags = base.installFlags; + + prePatch = '' + cd Molot_Stereo_Lite + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a15825b5a6..23465fb3f58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21496,6 +21496,10 @@ in xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; + molot-lite = callPackage ../applications/audio/molot-lite { }; + molot-mono-lite = callPackage ../applications/audio/molot-lite/mono.nix { }; + molot-stereo-lite = callPackage ../applications/audio/molot-lite/stereo.nix { }; + monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; monkeysphere = callPackage ../tools/security/monkeysphere { }; From bf838029d74819ba44292357c8df380966e0b827 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 18 Aug 2020 20:30:59 +0000 Subject: [PATCH 234/520] molot-lite: simplify definition --- pkgs/applications/audio/molot-lite/base.nix | 26 ------------ .../applications/audio/molot-lite/default.nix | 41 +++++++++++++++---- pkgs/applications/audio/molot-lite/mono.nix | 18 -------- pkgs/applications/audio/molot-lite/stereo.nix | 18 -------- pkgs/top-level/all-packages.nix | 2 - 5 files changed, 32 insertions(+), 73 deletions(-) delete mode 100644 pkgs/applications/audio/molot-lite/base.nix delete mode 100644 pkgs/applications/audio/molot-lite/mono.nix delete mode 100644 pkgs/applications/audio/molot-lite/stereo.nix diff --git a/pkgs/applications/audio/molot-lite/base.nix b/pkgs/applications/audio/molot-lite/base.nix deleted file mode 100644 index 44880f74901..00000000000 --- a/pkgs/applications/audio/molot-lite/base.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, unzip, lv2 }: - -rec { - version = "unstable-2014-04-23"; - - src = fetchurl { - # the source is zipped inside the repository, so this doesn't work: - # url = "mirror://sourceforge/molot/molot_src.zip"; - url = "https://sourceforge.net/p/molot/code/ci/master/tree/molot_src.zip?format=raw"; - sha256 = "1c47dwfgrmn9459px8s5zikcqyr0777v226qzcxlr6azlcjwr51b"; - }; - - buildInputs = [ unzip lv2 ]; - - unpackPhase = "unzip $src"; - - installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ]; - - meta = with stdenv.lib; { - description = "a stereo and mono audio signal dynamic range compressor in LV2 format"; - homepage = "https://sourceforge.net/projects/molot/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/molot-lite/default.nix b/pkgs/applications/audio/molot-lite/default.nix index bb858e10644..5c5aa505537 100644 --- a/pkgs/applications/audio/molot-lite/default.nix +++ b/pkgs/applications/audio/molot-lite/default.nix @@ -1,14 +1,37 @@ -{ stdenvNoCC, molot-mono-lite, molot-stereo-lite }: -with stdenvNoCC.lib; +{ stdenv, fetchurl, unzip, lv2 }: - -stdenvNoCC.mkDerivation { +stdenv.mkDerivation { pname = "molot-lite"; - version = molot-mono-lite.version; + version = "unstable-2014-04-23"; - buildCommand = '' - mkdir -p $out/lib/lv2/ - ln -s ${makeLibraryPath [molot-mono-lite]}/lv2/Molot_Mono_Lite.lv2 $out/lib/lv2 - ln -s ${makeLibraryPath [molot-stereo-lite]}/lv2/Molot_Stereo_Lite.lv2 $out/lib/lv2 + src = fetchurl { + # fetchzip does not accept urls that do not end with .zip. + url = "https://sourceforge.net/p/molot/code/ci/c4eddc426f8d5821e8ebcf1d67265365e4c8c52a/tree/molot_src.zip?format=raw"; + sha256 = "1c47dwfgrmn9459px8s5zikcqyr0777v226qzcxlr6azlcjwr51b"; + }; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ lv2 ]; + + unpackPhase = '' + unzip $src ''; + + buildPhase = '' + make -C Molot_Mono_Lite + make -C Molot_Stereo_Lite + ''; + + installPhase = '' + make install INSTALL_DIR=$out/lib/lv2 -C Molot_Mono_Lite + make install INSTALL_DIR=$out/lib/lv2 -C Molot_Stereo_Lite + ''; + + meta = with stdenv.lib; { + description = "Stereo and mono audio signal dynamic range compressor in LV2 format"; + homepage = "https://sourceforge.net/projects/molot/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/audio/molot-lite/mono.nix b/pkgs/applications/audio/molot-lite/mono.nix deleted file mode 100644 index dd2f0e3261a..00000000000 --- a/pkgs/applications/audio/molot-lite/mono.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, unzip, lv2 }: - -let - base = import ./base.nix { inherit stdenv fetchurl unzip lv2; }; -in -stdenv.mkDerivation { - pname = "molot-mono-lite"; - - version = base.version; - src = base.src; - unpackPhase = base.unpackPhase; - buildInputs = base.buildInputs; - installFlags = base.installFlags; - - prePatch = '' - cd Molot_Mono_Lite - ''; -} diff --git a/pkgs/applications/audio/molot-lite/stereo.nix b/pkgs/applications/audio/molot-lite/stereo.nix deleted file mode 100644 index 3cf59868930..00000000000 --- a/pkgs/applications/audio/molot-lite/stereo.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, unzip, lv2 }: - -let - base = import ./base.nix { inherit stdenv fetchurl unzip lv2; }; -in -stdenv.mkDerivation { - pname = "molot-stereo-lite"; - - version = base.version; - src = base.src; - unpackPhase = base.unpackPhase; - buildInputs = base.buildInputs; - installFlags = base.installFlags; - - prePatch = '' - cd Molot_Stereo_Lite - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23465fb3f58..69291516994 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21497,8 +21497,6 @@ in xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { }; molot-lite = callPackage ../applications/audio/molot-lite { }; - molot-mono-lite = callPackage ../applications/audio/molot-lite/mono.nix { }; - molot-stereo-lite = callPackage ../applications/audio/molot-lite/stereo.nix { }; monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; From 76e610a5761b3d73b3c8318378fc1ba11f876caf Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 15 Aug 2020 02:40:45 +0200 Subject: [PATCH 235/520] haskellPackages.jsaddle-webkit2gtk: Fix wrong patch-url I had specified the wrong commit id before --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 30053675fca..9bab2defb52 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1343,8 +1343,8 @@ self: super: { # 2020-08-14: Needs some manual patching to be compatible with haskell-gi-base 0.24 # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119 jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk (pkgs.fetchpatch { - url = "https://github.com/ghcjs/jsaddle/compare/9727365...09f44aa.patch"; - sha256 = "1bkwgmc04544haycb69fqsd97lg24jc7hc1yrin2sgr4l7hz04pf"; + url = "https://github.com/ghcjs/jsaddle/compare/9727365...f842748.patch"; + sha256 = "07l4l999lmlx7sqxf7v4f70rmxhx9r0cjblkgc4n0y6jin4iv1cb"; stripLen = 2; extraPrefix = ""; }); From bc472f8de7cc13cc779f2979c6d0655bec50f9c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Aug 2020 14:19:30 +0200 Subject: [PATCH 236/520] python3Packages.maxminddb: 1.5.4 -> 2.0.2 --- pkgs/development/python-modules/maxminddb/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index a5ec28f3448..f92b96c9ada 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, pythonAtLeast +{ stdenv, lib, buildPythonPackage, pythonOlder, pythonAtLeast , fetchPypi , libmaxminddb , ipaddress @@ -7,12 +7,13 @@ }: buildPythonPackage rec { - version = "1.5.4"; + version = "2.0.2"; pname = "maxminddb"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f4d28823d9ca23323d113dc7af8db2087aa4f657fafc64ff8f7a8afda871425b"; + sha256 = "15z5557rn4yvrhnpdm9l4kczr151qv9px736hd361rlr2z98wpdr"; }; buildInputs = [ libmaxminddb ]; From e157891bc7f63c63ec6c3fc2e35ea4579a211b87 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Aug 2020 14:39:58 +0200 Subject: [PATCH 237/520] pythonPackages.mocket: init at 3.8.7 --- .../python-modules/mocket/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/mocket/default.nix diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix new file mode 100644 index 00000000000..fa469b619a1 --- /dev/null +++ b/pkgs/development/python-modules/mocket/default.nix @@ -0,0 +1,43 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27 +, decorator +, importlib-metadata +, python +, python_magic +, six +, urllib3 }: + +buildPythonPackage rec { + pname = "mocket"; + version = "3.8.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zj2p20blf4p071kcs86h2c9sc964x6sahff60gg7y4d2c0iq3rs"; + }; + + patchPhase = '' + substituteInPlace requirements.txt \ + --replace "python-magic==0.4.18" "python-magic" \ + --replace "urllib3==1.25.10" "urllib3" + substituteInPlace setup.py --replace 'setup_requires=["pipenv"]' "setup_requires=[]" + ''; + + propagatedBuildInputs = [ + decorator + python_magic + urllib3 + six + ] ++ lib.optionals (isPy27) [ six ]; + + # Pypi has no runtests.py, github has no requirements.txt. No way to test, no way to install. + doCheck = false; + + pythonImportsCheck = [ "mocket" ]; + + meta = with lib; { + description = "A socket mock framework - for all kinds of socket animals, web-clients included"; + homepage = "https://github.com/mindflayer/python-mocket"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b616af06c7..4f0b06313e2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4848,6 +4848,8 @@ in { else callPackage ../development/python-modules/mock { }; + mocket = callPackage ../development/python-modules/mocket { }; + mock-open = callPackage ../development/python-modules/mock-open { }; mockito = callPackage ../development/python-modules/mockito { }; From d33659e94515700c26142bd41f3f93a3665c3736 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Aug 2020 14:40:55 +0200 Subject: [PATCH 238/520] python3Packages.geoip2: 3.0.0 -> 4.0.2 --- .../python-modules/geoip2/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index 1f03b1dd725..fea7d226a1c 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -1,24 +1,29 @@ { buildPythonPackage, lib, fetchPypi, isPy27 -, ipaddress +, aiohttp , maxminddb , mock +, mocket , requests , requests-mock }: buildPythonPackage rec { - version = "3.0.0"; + version = "4.0.2"; pname = "geoip2"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1q1ciqqd0qjkpgwsg9fws8wcqchkcq84gv2g4q3xgh2lpj3yjsaq"; + sha256 = "06q9r5sdmncj4yaxrdf0mls05jb5n6pwhf8j8r74825cks4mvysa"; }; - propagatedBuildInputs = [ requests maxminddb ] - ++ lib.optionals isPy27 [ ipaddress ]; + patchPhase = '' + substituteInPlace requirements.txt --replace "requests>=2.24.0,<3.0.0" "requests" + ''; - checkInputs = [ requests-mock ]; + propagatedBuildInputs = [ aiohttp requests maxminddb ]; + + checkInputs = [ mocket requests-mock ]; meta = with lib; { description = "MaxMind GeoIP2 API"; From 2addc08836303b28da105b55d72b3d6137c84331 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Aug 2020 14:58:14 +0200 Subject: [PATCH 239/520] python3Packages.sopel: 7.0.5 -> 7.0.6 --- .../python-modules/sopel/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index a2ea9dc28be..61a0414a998 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -5,20 +5,21 @@ , praw , pyenchant , pygeoip -, pytest +, pytestCheckHook , python , pytz +, sqlalchemy , xmltodict }: buildPythonPackage rec { pname = "sopel"; - version = "7.0.5"; + version = "7.0.6"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "6ebe85aa5441c5ddeb48bfd320d57ed0bc002bbd779c50b1b15883022964284d"; + sha256 = "0f0aixwjh5nax0hzar4993rg9yn1x23rksz5jl5gj8g2jyblsfay"; }; propagatedBuildInputs = [ @@ -29,20 +30,26 @@ buildPythonPackage rec { pyenchant pygeoip pytz + sqlalchemy xmltodict ]; # remove once https://github.com/sopel-irc/sopel/pull/1653 lands postPatch = '' substituteInPlace requirements.txt \ - --replace "praw<6.0.0" "praw<7.0.0" + --replace "praw>=4.0.0,<6.0.0" "praw" ''; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - HOME=$PWD # otherwise tries to create tmpdirs at root - pytest . + preCheck = '' + export TESTDIR=$(mktemp -d) + cp -R ./test $TESTDIR + pushd $TESTDIR + ''; + + postCheck = '' + popd ''; meta = with stdenv.lib; { From 108c60705e3163ef45282865c4da8114935d0eb6 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 18 Aug 2020 23:11:00 +0200 Subject: [PATCH 240/520] haskellPackages.cuda: Mark as unfree because of deps --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ed35261eaee..7da0d760330 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2760,6 +2760,7 @@ dont-distribute-packages: - boolector - ccelerate-cuda - cplex-hs + - cuda # 2020-08-18 because of dependency nvidia-x11 - cublas - cufft - cusolver diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 560b177585a..5b3f6971bcc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -65695,6 +65695,7 @@ self: { executableHaskellDepends = [ base pretty ]; description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cudd" = callPackage From fe868f7435df37c3955e40636c2a88adf5b00476 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 18 Aug 2020 23:54:21 +0200 Subject: [PATCH 241/520] haskellPackages.neuron: Fix build --- .../haskell-modules/configuration-common.nix | 24 ++++--------------- .../configuration-hackage2nix.yaml | 1 + .../haskell-modules/hackage-packages.nix | 23 ++++++++++++++++++ 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9bab2defb52..380e644d1d3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1383,23 +1383,11 @@ self: super: { reflex-dom-pandoc = super.reflex-dom-pandoc.override { pandoc-types = self.pandoc-types_1_21; }; - pandoc_2_10_1 = super.pandoc_2_10_1.override { + pandoc_2_10_1 = super.pandoc_2_10_1.overrideScope (self: super: { pandoc-types = self.pandoc-types_1_21; hslua = self.hslua_1_1_2; - texmath = self.texmath.override { - pandoc-types = self.pandoc-types_1_21; - }; - tasty-lua = self.tasty-lua.override { - hslua = self.hslua_1_1_2; - }; - hslua-module-text = self.hslua-module-text.override { - hslua = self.hslua_1_1_2; - }; - hslua-module-system = self.hslua-module-system.override { - hslua = self.hslua_1_1_2; - }; jira-wiki-markup = self.jira-wiki-markup_1_3_2; - }; + }); # Apply version-bump patch that is not contained in released version yet. # Upstream PR: https://github.com/srid/neuron/pull/304 @@ -1411,14 +1399,10 @@ self: super: { extraPrefix = ""; })) # See comment about overrides above commonmark-pandoc - .override { + .overrideScope (self: super: { pandoc = self.pandoc_2_10_1; pandoc-types = self.pandoc-types_1_21; - rib = super.rib.override { - pandoc = self.pandoc_2_10_1; - pandoc-types = self.pandoc-types_1_21; - }; - }; + }); # Testsuite trying to run `which haskeline-examples-Test` haskeline_0_8_0_0 = dontCheck super.haskeline_0_8_0_0; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ed35261eaee..bedc5670a05 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2581,6 +2581,7 @@ extra-packages: - hoogle == 5.0.14 # required by hie-hoogle - html-conduit ^>= 1.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 - http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - hslua == 1.1.2 # required for pandoc 2.10 - inline-c < 0.6 # required on GHC 8.0.x - inline-c-cpp < 0.2 # required on GHC 8.0.x - lens-labels == 0.1.* # required for proto-lens-descriptors diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 560b177585a..05f8a2a2bf6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -133316,6 +133316,29 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; + "hslua_1_1_2" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3 + , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "hslua"; + version = "1.1.2"; + sha256 = "1cv4lwr91ckscwm2jksrg29ka1z32974xgkcgmna4ibpyjwkslbl"; + configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl text + ]; + librarySystemDepends = [ lua5_3 ]; + testHaskellDepends = [ + base bytestring containers exceptions mtl QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + ]; + description = "Bindings to Lua, an embeddable scripting language"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) lua5_3;}; + "hslua_1_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3 , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit From 95defe7353065b914424a09f0a6a0ca667480a42 Mon Sep 17 00:00:00 2001 From: Robert Djubek Date: Tue, 18 Aug 2020 22:02:39 +0000 Subject: [PATCH 242/520] matterhorn: fix build for update new version wants newer brick and vty than on stackage --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9bab2defb52..6a98c9a2613 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -315,6 +315,13 @@ self: super: { then dontCheck super.math-functions # "erf table" test fails on Darwin https://github.com/bos/math-functions/issues/63 else super.math-functions; matplotlib = dontCheck super.matplotlib; + + # Needs the latest version of vty and brick. + matterhorn = super.matterhorn.overrideScope (self: super: { + brick = self.brick_0_55; + vty = self.vty_5_30; + }); + memcache = dontCheck super.memcache; metrics = dontCheck super.metrics; milena = dontCheck super.milena; From e5b3dd0f9ab94931cda300b645dca2a12010242e Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 19 Aug 2020 00:38:43 +0200 Subject: [PATCH 243/520] haskellPackages: Fix evaluation errors --- .../haskell-modules/configuration-hackage2nix.yaml | 3 ++- pkgs/development/haskell-modules/hackage-packages.nix | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ed35261eaee..140b6ec5950 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5904,6 +5904,7 @@ broken-packages: - hasql-queue - hasql-simple - hasql-th + - hasqly-mysql - hastache - hastache-aeson - haste @@ -6766,7 +6767,6 @@ broken-packages: - inject-function - inline-asm - inline-java - - inline-r - inserts - inspector-wrecker - instana-haskell-trace-sdk @@ -10078,6 +10078,7 @@ broken-packages: - sym - sym-plot - symantic + - symantic-atom - symantic-http-test - symantic-lib - symantic-xml diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 560b177585a..2815f391f8a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -119637,6 +119637,8 @@ self: { ]; description = "composable SQL generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hastache" = callPackage @@ -143717,8 +143719,6 @@ self: { ]; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) R;}; "inliterate" = callPackage @@ -244773,6 +244773,8 @@ self: { ]; description = "Library for reading and writing Atom"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "symantic-base" = callPackage From 9ea04a0391e184ed1e4576a444cc474f3aa3f857 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 19 Aug 2020 01:05:59 +0200 Subject: [PATCH 244/520] haskellPackages.hocker: Mark unbroken --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ed35261eaee..6d02bbffab4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6229,7 +6229,6 @@ broken-packages: - hobbes - hobbits - hocilib - - hocker - hodatime - HODE - hoe diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 560b177585a..56744b695a1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -128013,8 +128013,6 @@ self: { ]; description = "Interact with the docker registry and generate nix build instructions"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hodatime" = callPackage From e5a097a8cdeb731d2a2ecf300a0e0609d8d5677b Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Tue, 18 Aug 2020 18:06:46 +0200 Subject: [PATCH 245/520] pythonPackages.coloredlogs: remove obsolete patch --- .../python-modules/coloredlogs/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix index 6ef440da0ac..c2a329e08f3 100644 --- a/pkgs/development/python-modules/coloredlogs/default.nix +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -1,4 +1,13 @@ -{ lib, buildPythonPackage, fetchFromGitHub, stdenv, isPy3k, fetchpatch, humanfriendly, verboselogs, capturer, pytest, mock, utillinux }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, humanfriendly +, verboselogs +, capturer +, pytest +, mock +, utillinux +}: buildPythonPackage rec { pname = "coloredlogs"; @@ -11,13 +20,6 @@ buildPythonPackage rec { sha256 = "0rnmxwrim4razlv4vi3krxk5lc5ksck6h5374j8avqwplika7q2x"; }; - # patch by risicle - patches = lib.optional (stdenv.isDarwin && isPy3k) (fetchpatch { - name = "darwin-py3-capture-fix.patch"; - url = "https://github.com/xolox/python-coloredlogs/pull/74.patch"; - sha256 = "0pk7k94iz0gdripw623vzdl4hd83vwhsfzshl8pbvh1n6swi0xx9"; - }); - checkPhase = '' PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \ and not test_auto_install" From 0e2ed7a75a4f4705444e95dd4b8000dfdb980c28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Aug 2020 02:30:41 +0200 Subject: [PATCH 246/520] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-13-g52041eb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/69aea465111d74cf909c5084fd5cef4e09725027. --- .../haskell-modules/hackage-packages.nix | 182 +++++++++++++----- 1 file changed, 134 insertions(+), 48 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 560b177585a..70448067c6a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -40267,8 +40267,8 @@ self: { ({ mkDerivation, base, binaryen }: mkDerivation { pname = "binaryen"; - version = "0.0.2.0"; - sha256 = "111laqm68cs5ck4nc1cj8hy5anw6gkxv5yc1jrw87gn3i3va5046"; + version = "0.0.3.0"; + sha256 = "08pdk57q4n49l3wyd9zbda4w5ci65ifq4yxscq61kkdqz8i4ggjs"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ binaryen ]; description = "Haskell bindings to binaryen"; @@ -44012,17 +44012,17 @@ self: { }) {}; "boolector" = callPackage - ({ mkDerivation, base, boolector, c2hs, containers, directory, mtl - , temporary, time + ({ mkDerivation, base, boolector, c2hs, Cabal, containers + , directory, mtl, temporary, time }: mkDerivation { pname = "boolector"; - version = "0.0.0.11"; - sha256 = "1mj6pjh4vg7dziil68p8k60sn6s721jxdgpsq9kk1h05v67lh5fz"; + version = "0.0.0.12"; + sha256 = "10lmc0rcza22w3mv3l0z97w2d4nymylglv3sz4ffnpkcc2cinz41"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base containers directory mtl temporary time ]; - librarySystemDepends = [ boolector ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base ]; testSystemDepends = [ boolector ]; @@ -46112,8 +46112,8 @@ self: { }: mkDerivation { pname = "burrito"; - version = "1.1.0.2"; - sha256 = "1k625j5syyiq66i88zy6q0mvwkjl5jsj79sxdmd1rbam3m39whx1"; + version = "1.2.0.0"; + sha256 = "1nrb08czlnfcgb7v59vzkffik2w5yp833la4mq6sp6sgnm0ylgya"; libraryHaskellDepends = [ base bytestring containers parsec template-haskell text transformers @@ -48682,8 +48682,8 @@ self: { }: mkDerivation { pname = "cabal2spec"; - version = "2.6.1"; - sha256 = "19azvrg20rsk95nfvwlamlz007ihpkra1wgvqpjkdimwr5q7837h"; + version = "2.6.2"; + sha256 = "0x1r01fk5mch76zindalvmlkfaca4y1x89zw2dm0d46fncsfgdrv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -76156,8 +76156,8 @@ self: { }: mkDerivation { pname = "dobutokO-poetry"; - version = "0.14.0.0"; - sha256 = "14v276raxahkhb0xzjz358lhpwzigylqx70li65cp6zk85sv5949"; + version = "0.15.0.0"; + sha256 = "1091wqxzg138bc8kk55fkgv5ripq48zyvm3in2b2g54zjy6l4f1p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76189,8 +76189,8 @@ self: { }: mkDerivation { pname = "dobutokO-poetry-general-languages"; - version = "0.1.0.0"; - sha256 = "1am3pwzbqj079phkl14f549f7sf951kvkppc0iqbiswq20gssc87"; + version = "0.2.0.0"; + sha256 = "0gw89nagj1adb70k1li1p1syzgmc6g4lb0yfnjr9caiddq9mi9x5"; libraryHaskellDepends = [ base dobutokO-poetry-general mmsyn3 mmsyn6ukr uniqueness-periods-general vector @@ -81270,8 +81270,8 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.3.2"; - sha256 = "0jdphsnyd3fifal54axpngqvz3bpwyfrky2rhs4zwydi5khfwfik"; + version = "0.3.3"; + sha256 = "1cmp0f9rs0wb42400zsy65bzikjzk5rqd7vb7z86iqj2z9j4y4gx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -81291,8 +81291,8 @@ self: { }: mkDerivation { pname = "elynx-markov"; - version = "0.3.2"; - sha256 = "0m1yhh9hp254kd9l58qylg07xdvx4nad3x6zr9vz2zqbxsl65w53"; + version = "0.3.3"; + sha256 = "1anbfsgrn0s6aqhwnay9ki17812ybaygibpzss9l4c91qsr7wzmz"; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-seq hmatrix integration math-functions mwc-random parallel primitive statistics @@ -81311,8 +81311,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.3.2"; - sha256 = "0wqsxvsa15cjpx3gwasl1a6yxc34cwpzvs25l6gwz3rw02g0gj0b"; + version = "0.3.3"; + sha256 = "19yj4h6gavcvfz79bvyfajdhl2mq8ghiy7rv8bq7l0b28sf59m6r"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; @@ -81328,8 +81328,8 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.3.2"; - sha256 = "02rw23nkd5i1vmp6p1qgbcrxjzchffcwfq5jq25jsqff3skhks9p"; + version = "0.3.3"; + sha256 = "0cwk7g23gb72q91dy5gwwn74rhcwsmmfnzc07lia1cv6qmj4y4q5"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers matrices mwc-random parallel primitive vector vector-th-unbox word8 @@ -81352,8 +81352,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.3.2"; - sha256 = "086758j6pwbv2wbdljl72dk2w6mmcpxvkvn84ycc0bx002iag73s"; + version = "0.3.3"; + sha256 = "1mmy6h6h8rknclahyxsdv08ynfr12wn35lk632h6n4pmsfzhi0zw"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptohash-sha256 deepseq directory fast-logger hmatrix @@ -81375,8 +81375,8 @@ self: { }: mkDerivation { pname = "elynx-tree"; - version = "0.3.2"; - sha256 = "0s1rlf30q8cdyl5jickpb2wqlxxcvc2rg7v2djhhjp5wy5h5xz4i"; + version = "0.3.3"; + sha256 = "1pcl7nis867dkz30zl3dyzls8ccpk9rsm5vfwklx697jj5fglihf"; libraryHaskellDepends = [ aeson attoparsec base bytestring comonad containers deepseq double-conversion elynx-nexus math-functions mwc-random primitive @@ -91122,6 +91122,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fmlist_0_9_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "fmlist"; + version = "0.9.4"; + sha256 = "19h95ph7lh7llw6j1v1rssrdi5k7xw8x0iac9rgzss371s2w3g9d"; + libraryHaskellDepends = [ base ]; + description = "FoldMap lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fmt" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, call-stack , containers, criterion, deepseq, doctest, doctest-discover @@ -123585,8 +123597,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hextra"; - version = "1.0.0.0"; - sha256 = "17ik20q07if3gvfsifm00k8z6iffcjwmy19n5xyzzc4bd17qffzb"; + version = "1.1.0.1"; + sha256 = "0iq6kj7mijxppjghpqx19s79sj6k1jqf21gfi8jqbj6bq7j2cdvj"; libraryHaskellDepends = [ base ]; description = "Generic and niche utility functions and more for Haskell"; license = stdenv.lib.licenses.mpl20; @@ -131164,7 +131176,7 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;}; + }) {mesos = null; inherit (pkgs) protobuf;}; "hs-multiaddr" = callPackage ({ mkDerivation, base, bytes, bytestring, cereal, either-unwrap @@ -137077,6 +137089,21 @@ self: { broken = true; }) {}; + "http-query" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-conduit, network-uri + , text + }: + mkDerivation { + pname = "http-query"; + version = "0.1.0"; + sha256 = "1j2ad7ym5mkpavlw1fp07n4qlggms04i93l5rv6vg07ljf4imjvs"; + libraryHaskellDepends = [ + aeson base bytestring http-conduit network-uri text + ]; + description = "Simple http queries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "http-querystring" = callPackage ({ mkDerivation, base, bytestring, containers, doctest, hspec , http-types, QuickCheck @@ -161972,8 +161999,8 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.3.10"; - sha256 = "0d03ma5sq0aqkb42jy0531d4vkn1ci0gcs8vj3xd6ac4hwr0qcwm"; + version = "1.3.11"; + sha256 = "1r5qfip5xl22hq2v27b1lkcknixmc40wm7iya7vs3mrnwyavpmdb"; libraryHaskellDepends = [ async base exceptions free monad-control mtl prettyprinter semigroups stm stm-delay text time transformers transformers-base @@ -179818,6 +179845,8 @@ self: { pname = "network"; version = "3.1.2.0"; sha256 = "07zbaaa4f0rnc4xqg5kbzqivmr9lqz2g6bw01gmqkmh9k9svsap0"; + revision = "1"; + editedCabalFile = "079svy0nr035xhz4gd6cila0wvsjl23hi3hq5407m3qdmcf4rkis"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -180495,8 +180524,8 @@ self: { ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "network-run"; - version = "0.2.3"; - sha256 = "026l8j1nfgvs3lknn3fvsjj4x4niykhn99h5kywc47347b91xl3n"; + version = "0.2.4"; + sha256 = "0w3dmwk03j4n01xkiq8m4sqa27bskh239mpw7m4ihjmkxqcwc5gl"; libraryHaskellDepends = [ base bytestring network ]; description = "Simple network runner library"; license = stdenv.lib.licenses.bsd3; @@ -187282,6 +187311,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-simple_0_1_1_3" = callPackage + ({ mkDerivation, base, bytestring, directory, githash + , optparse-applicative, template-haskell, transformers + }: + mkDerivation { + pname = "optparse-simple"; + version = "0.1.1.3"; + sha256 = "1wymqhac2sngkka8w880gq6y1kk3xs0flbv4mrhfgzrplhax8r9k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base githash optparse-applicative template-haskell transformers + ]; + testHaskellDepends = [ base bytestring directory ]; + description = "Simple interface to optparse-applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-text" = callPackage ({ mkDerivation, base, hspec, optparse-applicative, text }: mkDerivation { @@ -230088,6 +230136,23 @@ self: { broken = true; }) {}; + "signature" = callPackage + ({ mkDerivation, aeson, base, byteable, bytestring + , case-insensitive, cryptohash, hexstring, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "signature"; + version = "0.1.1.0"; + sha256 = "0ciwxpmcdw5zn6005qpafx2q005bbyalr7zw22kj7grm95ffp5xq"; + libraryHaskellDepends = [ + aeson base byteable bytestring case-insensitive cryptohash + hexstring scientific text unordered-containers vector + ]; + description = "Hmac sha256 signature json and http payload"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "signed-multiset" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -232677,8 +232742,8 @@ self: { }: mkDerivation { pname = "slynx"; - version = "0.3.2"; - sha256 = "0zxsylwsb4dr8a0lk1qnd2ha16wssxf9i5kfjs13pzls6nvlp57f"; + version = "0.3.3"; + sha256 = "0rwiw27zyfbycsp51sxg3w7143c2gj1g5wm0hlkkx4m296k1hvkr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244779,8 +244844,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "symantic-base"; - version = "0.0.0.20200708"; - sha256 = "0ynpx4nima334qrg2hj184w9fnd74rgm6h8n4pxf52cxghmnwdnc"; + version = "0.0.2.20200708"; + sha256 = "1yvlvsr38b1ydplpz1jldy816sngmic273iajcmhr73rlyzk5y3d"; libraryHaskellDepends = [ base ]; description = "Basic symantics for writing Embedded Domain-Specific Languages (EDSL)"; license = stdenv.lib.licenses.gpl3; @@ -247395,8 +247460,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "taskpool" = callPackage @@ -249791,8 +249854,8 @@ self: { }: mkDerivation { pname = "termonad"; - version = "4.0.0.0"; - sha256 = "1rdr7ha0mmi0xd1dmiyxirmh789v8sbkr1c3gg43a98lh3kqgcq9"; + version = "4.0.0.1"; + sha256 = "0axsmlly8qa5rpakkp1iryypgzswpqjphcl0mgvwa34dsh2hqmyn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -254813,8 +254876,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.3.2"; - sha256 = "0yghlzscvf61ziw5wc26h3i9mh92d36r8m4b6f90hp9bd9mqx9rz"; + version = "0.3.3"; + sha256 = "1ik9mcfm5w0q6mdcawaw54nkcfyb4aac9njlp3q03rglxxy6j1r5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -261959,6 +262022,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unicode-transforms_0_3_7" = callPackage + ({ mkDerivation, base, bytestring, deepseq, filepath, gauge + , getopt-generics, ghc-prim, hspec, path, path-io, QuickCheck + , split, text + }: + mkDerivation { + pname = "unicode-transforms"; + version = "0.3.7"; + sha256 = "0pgxb4znvr39n0f7y5q0bdajc4l96zsih0a43n90qjlhj9084rp8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ghc-prim text ]; + testHaskellDepends = [ + base deepseq getopt-generics hspec QuickCheck split text + ]; + benchmarkHaskellDepends = [ + base deepseq filepath gauge path path-io text + ]; + description = "Unicode normalization"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unicode-tricks" = callPackage ({ mkDerivation, base, data-default, hspec, hspec-discover , QuickCheck, text @@ -262258,8 +262344,8 @@ self: { ({ mkDerivation, base, mmsyn6ukr, vector }: mkDerivation { pname = "uniqueness-periods"; - version = "0.1.0.0"; - sha256 = "15lk3hgkf0bxnss0rr8n8zjl3sdf0ylsl525pd9qdaldjw9l8x27"; + version = "0.2.0.0"; + sha256 = "1r5wnc9gdinxigqf9sb58k8rvbkbqmn71d2gxpg1xz3fgxs35cqq"; libraryHaskellDepends = [ base mmsyn6ukr vector ]; description = "Can be used to produce the 'uniquenessPeriods' function and related functionality"; license = stdenv.lib.licenses.mit; @@ -262269,8 +262355,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "uniqueness-periods-general"; - version = "0.1.0.0"; - sha256 = "15l5c1zwjv6p684fd2cyw4mi8casjhkwbx7237fs5rn35mngfd9q"; + version = "0.2.0.0"; + sha256 = "117svylwp76rgygc1fa871qz0ghv5hsfj7lr63zy1r3zcakak45q"; libraryHaskellDepends = [ base vector ]; description = "Can be used to produce the similar to 'String.Ukrainian.UniquenessPeriods' functions."; license = stdenv.lib.licenses.mit; From 4cb53831410ab0212b99e4324488df67615b20dc Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 19 Aug 2020 12:56:19 +1200 Subject: [PATCH 247/520] qt: bring back QML import patch in 5.14 (#95772) This was missed in the 5.12 -> 5.14 update process. Resolves #95636 --- .../libraries/qt-5/5.14/qtdeclarative.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch index f2f4ee77354..8f5b5d4790f 100644 --- a/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch +++ b/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch @@ -1,3 +1,23 @@ +diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp +index 005db4248..685c5b1b2 100644 +--- a/src/qml/qml/qqmlimport.cpp ++++ b/src/qml/qml/qqmlimport.cpp +@@ -1760,6 +1760,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + addImportPath(installImportsPath); + ++ // Add import paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir)); ++ } ++ } ++ + // env import paths + if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { + const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf index 537eaf62e..e21de58f6 100644 --- a/tools/qmlcachegen/qmlcache.prf From 7c93f85b7abe3f99b83c23b44d5664ac55ea5362 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 16 Aug 2020 23:22:56 +1000 Subject: [PATCH 248/520] genpass: fix darwin build --- pkgs/tools/security/genpass/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix index 54a084ff596..39a84112d63 100644 --- a/pkgs/tools/security/genpass/default.nix +++ b/pkgs/tools/security/genpass/default.nix @@ -1,6 +1,9 @@ { stdenv , fetchFromGitHub , rustPlatform +, CoreFoundation +, libiconv +, Security }: rustPlatform.buildRustPackage rec { pname = "genpass"; @@ -15,6 +18,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; + meta = with stdenv.lib; { description = "A simple yet robust commandline random password generator."; homepage = "https://github.com/cyplo/genpass"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3acb51a625f..52af1b91e4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -997,7 +997,9 @@ in fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; - genpass = callPackage ../tools/security/genpass { }; + genpass = callPackage ../tools/security/genpass { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; genymotion = callPackage ../development/mobile/genymotion { }; From a3278c293d22344780f20b00044a710ff7fbf6a4 Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Fri, 24 Jul 2020 19:44:04 +0530 Subject: [PATCH 249/520] rescuetime: 2.15.0.1 -> 2.16.0.1 --- pkgs/applications/misc/rescuetime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 9784e24187b..67c5f610bf7 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -5,15 +5,15 @@ let if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "1yzbs2lg04bq0clkr6gfkx3j6wrahpnxqfiq4askk9k76y4ncd4m"; + sha256 = "16igpi53n040h1qxwci4p20xxlj3y7fbmhzldrslckb2h1fjskaq"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "1njxsh601d0p6n0hxv44gcg8gd43xwym83xwqba26vj6xw82bknv"; + sha256 = "1ccnh6kn313dbgvxwxlaz4ax6xdn5zm4xhhzikca4vv8a7nhxjgv"; }; in mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.15.0.1"; + name = "rescuetime-2.16.0.1"; inherit src; nativeBuildInputs = [ dpkg ]; # avoid https://github.com/NixOS/patchelf/issues/99 From 4645e5fef6f4e1ab31457fdb63affa131352a9a3 Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Fri, 7 Aug 2020 10:41:11 +0530 Subject: [PATCH 250/520] rescuetime: 2.16.0.1 -> 2.16.2.1 --- pkgs/applications/misc/rescuetime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 67c5f610bf7..837e30ee8f2 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -5,15 +5,15 @@ let if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "16igpi53n040h1qxwci4p20xxlj3y7fbmhzldrslckb2h1fjskaq"; + sha256 = "157yg4n5ppgnrd5wrz06qfx391vggp3wifla39rvcaaysvvisl8v"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "1ccnh6kn313dbgvxwxlaz4ax6xdn5zm4xhhzikca4vv8a7nhxjgv"; + sha256 = "17gjiwf0qbh1zbrxxsilnpg0qxy5kdpqxlnl28namp671rv0aic8"; }; in mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.16.0.1"; + name = "rescuetime-2.16.2.1"; inherit src; nativeBuildInputs = [ dpkg ]; # avoid https://github.com/NixOS/patchelf/issues/99 From b2b8cf9e33f32f7ccd9bd6a91d6ff100606d50dd Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Wed, 19 Aug 2020 18:06:11 +1200 Subject: [PATCH 251/520] haskellPackages.ghcHEAD: Mark exceptions as a core library --- pkgs/development/haskell-modules/configuration-ghc-head.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 8d084162783..cbfd4b84b2f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -48,6 +48,7 @@ self: super: { transformers = null; unix = null; xhtml = null; + exceptions = null; # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; From 59d48ade22e37a6e7a2d4032c95ce202933b3da6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 12 Aug 2020 06:43:02 +0200 Subject: [PATCH 252/520] =?UTF-8?q?coqPackages.coq-ext-lib:=200.11.1=20?= =?UTF-8?q?=E2=86=92=200.11.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/coq-ext-lib/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 17f9c2c4611..9cf30e277f3 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,10 +5,11 @@ let params = "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; }; - "8.8" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; }; - "8.9" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; }; - "8.10" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; }; - "8.11" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; }; + "8.8" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; + "8.9" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; + "8.10" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; + "8.11" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; + "8.12" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; }; param = params.${coq.coq-version}; in From 6a1d98ecc465a6635c74cf25f4fa9a39b1a7a9b6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 12 Aug 2020 06:47:09 +0200 Subject: [PATCH 253/520] coqPackages.simple-io: enable for Coq 8.12 --- pkgs/development/coq-modules/simple-io/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index bc020174daa..82fa215ee9c 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } From 6f83faf70bbc8ba147352cab2f1fc8d5fa298013 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 12 Aug 2020 07:02:11 +0200 Subject: [PATCH 254/520] =?UTF-8?q?coqPackages.QuickChick:=201.3.1=20?= =?UTF-8?q?=E2=86=92=201.3.2,=201.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/QuickChick/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 96ab512db61..a167b7988dc 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -33,9 +33,15 @@ let params = }; "8.11" = rec { - version = "1.3.1"; + version = "1.3.2"; rev = "v${version}"; - sha256 = "0cajan9w52faqrg42r9rxai4wzsggs86qar88w7lcb928jvcakml"; + sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs"; + }; + + "8.12" = rec { + version = "1.4.0"; + rev = "v${version}"; + sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc"; }; }; param = params.${coq.coq-version}; From a9efab0451473fe076414ea74b94210c65d7dee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Wed, 19 Aug 2020 08:08:40 +0200 Subject: [PATCH 255/520] gnome-notes: 3.36.2 -> 3.36.3 --- pkgs/desktops/gnome-3/apps/gnome-notes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 8b99d309d2e..c32289d70d7 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -23,7 +23,7 @@ }: let - version = "3.36.2"; + version = "3.36.3"; in stdenv.mkDerivation { pname = "gnome-notes"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; - sha256 = "1d5ynfhwbmrbdk1gcnhddn32d3kakwniq6lwjzsrhq26hq5xncsd"; + sha256 = "1midnphyg038s94ahhzv0pvbzzzn62ccky28c9nazxqvw4hvdsbh"; }; doCheck = true; From fca712bf21850322ea99e152d554ac19266343f5 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Wed, 19 Aug 2020 08:22:14 +0200 Subject: [PATCH 256/520] dbeaver: 7.1.4 -> 7.1.5 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 324c010b8b5..70ac55ed5ad 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.1.4"; + version = "7.1.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0a11hjwngm9i05wjx3qavf1zmlaz13dvhqm54ci4d27qrczywcyr"; + sha256 = "14pdkg9xxnldr7qwpb61hp2dgsd5h9scjn59ajqsqn4f4sgcpba0"; }; installPhase = '' From 36b0dfe4a67e693ddcae4582416a21cc69999e04 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 18 Aug 2020 23:07:16 -0700 Subject: [PATCH 257/520] jetbrains.rider: 2020.1.4 -> 2020.2 --- pkgs/applications/editors/jetbrains/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 10569afec94..fa382cc8836 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -220,9 +220,6 @@ let }; }) (attrs: { patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + '' - # Patch built-in mono for ReSharperHost to start successfully - interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) - patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen rm -rf lib/ReSharperHost/linux-x64/dotnet mkdir -p lib/ReSharperHost/linux-x64/dotnet/ ln -s ${dotnet-sdk_3}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet @@ -388,12 +385,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.1.4"; /* updated by script */ + version = "2020.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/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0vicgwgsbllfw6fz4l82x4vbka3agf541576ix9akyvsskwbaxj9"; /* updated by script */ + sha256 = "0fxgdxsrrl659lh45slikgck6jld90rd6nnj8gj3aixq0yp5pkix"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; From 873cca6e032dba597804fc46ed133b3e07d40560 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 19 Aug 2020 08:55:07 +0200 Subject: [PATCH 258/520] obsidian: 0.7.3 -> 0.8.2 --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 396a7845112..98eb76d9be1 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -2,7 +2,7 @@ let pname = "obsidian"; - version = "0.7.3"; + version = "0.8.2"; in appimageTools.wrapType2 rec { @@ -11,7 +11,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/Obsidian-${version}.AppImage"; - sha256 = "1qiag5szagalik72j8s2dmp7075g48jxgcdy0wgd02kfv90ai0y6"; + sha256 = "04jgsd97ivdm84diiafwqxzc9vvga1gsr7xicmqhdq05ns3xsfyz"; }; profile = '' From 7e6ba48ab97840ac049f492adddbb5f6c013dc68 Mon Sep 17 00:00:00 2001 From: Sasha Bogicevic Date: Wed, 19 Aug 2020 11:16:17 +0200 Subject: [PATCH 259/520] haskellPackages.snap-templates jailbreak stack-templates are marked as broken because of hashable and template-haskell version mismatch. I opened up an issue on the upstream repo about it https://github.com/snapframework/snap-templates/issues/22 --- pkgs/development/haskell-modules/configuration-common.nix | 1 + pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9bab2defb52..39e60d76f24 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -834,6 +834,7 @@ self: super: { then dontCheck else pkgs.lib.id; in doJailbreak (f super.servant-docs); # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage. + snap-templates = doJailbreak super.snap-templates; # https://github.com/snapframework/snap-templates/issues/22 swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; # Copy hledger man pages from data directory into the proper place. This code diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ed35261eaee..39483d09fcb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -9711,7 +9711,6 @@ broken-packages: - snap-loader-static - snap-routes - snap-stream - - snap-templates - snap-testing - snap-utils - snap-web-routes From 4e5a9e52a35b37f53d2844555139b1feed87c7da Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 18 Aug 2020 15:52:54 +0200 Subject: [PATCH 260/520] =?UTF-8?q?pdfpc:=204.3.4=20=E2=86=92=204.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/pdfpc/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index d8203b9e7b5..4e172e5fd7c 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.3.4"; + version = "4.4.0"; src = fetchFromGitHub { repo = product; owner = product; rev = "v${version}"; - sha256 = "07aafsm4jzdgpahz83p0ajv40hry7gviyadqi13ahr8xdhhwy2sd"; + sha256 = "0vh2r32akvasdrghkaq7ard24r2qncp34jfiyshi3zxabm9bhfaa"; }; nativeBuildInputs = [ @@ -31,14 +31,6 @@ stdenv.mkDerivation rec { cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DMOVIES=OFF"; - patches = [ - # Fix build vala 0.46 - (fetchpatch { - url = "https://github.com/pdfpc/pdfpc/commit/bbc16b97ecbdcdd22c2dc827a5c0e8b569073312.patch"; - sha256 = "0wi1rqcvg65cxnxvmvavcvghqyksnpijq1p91m57jaby3hb0pdcy"; - }) - ]; - meta = with stdenv.lib; { description = "A presenter console with multi-monitor support for PDF files"; homepage = "https://pdfpc.github.io/"; From 1b71929034d40aa5dfa7ead9ea061fa4a60bc892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 18 Aug 2020 16:32:04 +0200 Subject: [PATCH 261/520] finalfusion-utils: 0.11.2 -> 0.12.0 Changelog: https://github.com/finalfusion/finalfusion-utils/releases/tag/0.12.0 --- .../science/machine-learning/finalfusion-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index e3db0054647..eeeafdd3d98 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "finalfusion-utils"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "finalfusion"; repo = pname; rev = version; - sha256 = "1y2ik3qj2wbjnnk7bbglwbvyvbm5zfk7mbd1gpxg4495nzlf2jhf"; + sha256 = "0gxcjrhfa86kz5qmdf5h278ydc3nc0nfj61brnykb723mg45jj41"; }; - cargoSha256 = "19yay31f76ns1d6b6k9mgw5mrl8zg69y229ca6ssyb2z82gyhsnw"; + cargoSha256 = "03p786hh54zql61vhmsqcdgvz23v2rm12cgwf7clfmk6a6yj6ibx"; # Enables build against a generic BLAS. cargoBuildFlags = [ From ae993f3307c5a816991fbb2c8beb641d683328aa Mon Sep 17 00:00:00 2001 From: William Roe Date: Tue, 18 Aug 2020 21:36:51 +0100 Subject: [PATCH 262/520] hikari: 2.1.1 -> 2.1.2 --- pkgs/applications/window-managers/hikari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 1e8f7ecd987..9bf68adaef4 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -12,7 +12,7 @@ let pname = "hikari"; - version = "2.1.1"; + version = "2.1.2"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "0m9akxk5kwbdi04wch4xfaahl7h3k7c6a67yjmdzqxh3bqwa8igj"; + sha256 = "1qzbwc8dgsvp5jb4faapcrg9npsl11gq8jvhbbk2h7hj52c5lgmv"; }; nativeBuildInputs = [ pkgconfig bmake ]; From 19d9c7b99d479d1de3427f7d47232cb6e9646a0b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 19 Aug 2020 17:43:16 +0800 Subject: [PATCH 263/520] strawberry: 0.6.13 -> 0.7.2 --- pkgs/applications/audio/strawberry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index ba3c9c4de83..f278b68b922 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.6.13"; + version = "0.7.2"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "1v0334aivqyqx611cmhgshknzmrgyynbmxcg70qzrs2lyybw2fc1"; + sha256 = "sha256-YUR9SDiRV/gJKx4H1cgdDnKGulTQPVP7MpHyihUEgqg="; }; buildInputs = [ From 9dac262767885b16294df9f35496b343b3ef9b9e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Aug 2020 12:54:04 +0200 Subject: [PATCH 264/520] homeassistant: 0.114.0 -> 0.114.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5797889df21..4290599cbf8 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.114.0"; + version = "0.114.2"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "accuweather" = ps: with ps; [ ]; # missing inputs: accuweather diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6eaf1bc45d1..f0a664dd635 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -72,7 +72,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.114.0"; + hassVersion = "0.114.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -91,7 +91,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0g7jwhdvdcam7gvrj72aknrsvdwm5i5hs93nngqm26m1g4sng0ma"; + sha256 = "0llyf3icdgb9mh7x02309m35hxhinzsbd6i31mmb9fjfzp0d27q9"; }; propagatedBuildInputs = [ From 7b86674f09dc4fe74f67d328d900b9103a7fe579 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 18 Aug 2020 21:04:39 +0700 Subject: [PATCH 265/520] mozwire: init at 0.4.1 --- pkgs/tools/networking/mozwire/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/mozwire/default.nix diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix new file mode 100644 index 00000000000..533f2adab70 --- /dev/null +++ b/pkgs/tools/networking/mozwire/default.nix @@ -0,0 +1,23 @@ +{ rustPlatform, stdenv, fetchFromGitHub, Security }: +rustPlatform.buildRustPackage rec { + pname = "MozWire"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "NilsIrl"; + repo = pname; + rev = "v${version}"; + sha256 = "1slfb6m22vzglnrxahlhdcwzwpf3b817mskdx628s92mjzngzyih"; + }; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + cargoSha256 = "0b00j8vn1vvvphcyv8li7i73pq66sq6dr4wc1w4s3pppa151xr55"; + + meta = with stdenv.lib; { + description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN"; + homepage = "https://github.com/NilsIrl/MozWire"; + license = licenses.gpl3; + maintainers = with maintainers; [ siraben nilsirl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52af1b91e4e..8220eb65b17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3216,6 +3216,10 @@ in mcrcon = callPackage ../tools/networking/mcrcon {}; + mozwire = callPackage ../tools/networking/mozwire { + inherit (darwin.apple_sdk.frameworks) Security; + }; + rage = callPackage ../tools/security/rage { inherit (darwin.apple_sdk.frameworks) Security; }; From 12a9e5f6e914d19448cefd0cb934a420366af6fd Mon Sep 17 00:00:00 2001 From: Nils Date: Tue, 18 Aug 2020 16:28:46 +0100 Subject: [PATCH 266/520] maintainers: add nilsirl --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 75a8a8ef9ff..2e30bab5679 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5957,6 +5957,12 @@ githubId = 1224006; name = "Roberto Abdelkader Martínez Pérez"; }; + nilsirl = { + email = "nils@nilsand.re"; + github = "NilsIrl"; + githubId = 26231126; + name = "Nils ANDRÉ-CHANG"; + }; ninjatrappeur = { email = "felix@alternativebit.fr"; github = "ninjatrappeur"; From ea3072f63842a340cfa6a6cc3c95939c20cc7fd4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 19 Aug 2020 08:21:28 -0400 Subject: [PATCH 267/520] linux: 4.19.139 -> 4.19.140 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index ff3699a5cba..6b9629edca7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.139"; + version = "4.19.140"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "01anspwh3vskmcqf4xclx0jx6h0h33zfgmmvrzxq17wlzqhvyklw"; + sha256 = "1a4fy48jb16qdx165n48qch6nikfvmxqwys7mw8fynq0pykzj3ya"; }; } // (args.argsOverride or {})) From afe457db9b57a3a7a539bd47335fd48281d58994 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 19 Aug 2020 08:21:47 -0400 Subject: [PATCH 268/520] linux: 5.4.58 -> 5.4.59 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index c6fec5fcdbd..d1fe6b47890 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.58"; + version = "5.4.59"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0iqnn98hj3lq1avlrbjv9qdyfwffv01vd0a465xkhxck26py4bvh"; + sha256 = "1zdjqkm6sniy718dgqzbc1w1sgwpy2x64n1p91cjwps3wjr9vjwv"; }; } // (args.argsOverride or {})) From f36489b7b06cb898c8773d257cd4318461c25b81 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 19 Aug 2020 08:21:55 -0400 Subject: [PATCH 269/520] linux: 5.7.15 -> 5.7.16 --- pkgs/os-specific/linux/kernel/linux-5.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix index db137f0dc45..927940df9a0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7.15"; + version = "5.7.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "04jj7vmwd1fjpfnwrhnc92qnskj7i150dyxvilfmkg3ki521gsqf"; + sha256 = "0lypik2wvkl3z60zi1x4dxrh646jn0c4x0cg5z9yp33504q4x1ip"; }; } // (args.argsOverride or {})) From 423361a6643d780175138bab3d0a57b284bbe267 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 19 Aug 2020 08:24:11 -0400 Subject: [PATCH 270/520] oh-my-zsh: 2020-08-17 -> 2020-08-18 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index a7e17df9dee..47a7b8c2af5 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-08-17"; + version = "2020-08-18"; pname = "oh-my-zsh"; - rev = "7deda85f8cf7fb3c2f36b771a2e8bd70a28bf0b3"; + rev = "89400f156a6e1d64acaeab9ec265f54cdab91817"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "16czqfa01a1ak00ln37334q3gq811f5df2nqbvmj3129agnx28s4"; + sha256 = "1k659480dv7wi9rz1zdq8w0nysgjsm58jy2kzp3rnxaxm7fkzivm"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 68bf9101d7764297466041c67f72b2db4b998c26 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Wed, 19 Aug 2020 21:55:11 +0900 Subject: [PATCH 271/520] qtwebengine: fix build for darwin --- .../libraries/qt-5/5.12/default.nix | 6 ++- ...e-darwin-fix-failed-static-assertion.patch | 31 +++++++++++ ...qtwebengine-darwin-no-platform-check.patch | 44 ++++++++++++++-- .../libraries/qt-5/modules/qtwebengine.nix | 52 +++++++++++-------- 4 files changed, 105 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-fix-failed-static-assertion.patch diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index e8d052d3cd1..e89c0a8b403 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -97,8 +97,10 @@ let url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951"; sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; }) - ] - ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; + ] ++ optionals stdenv.isDarwin [ + ./qtwebengine-darwin-no-platform-check.patch + ./qtwebengine-darwin-fix-failed-static-assertion.patch + ]; qtwebkit = [ ./qtwebkit.patch ] ++ optionals stdenv.isDarwin [ ./qtwebkit-darwin-no-readline.patch diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-fix-failed-static-assertion.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-fix-failed-static-assertion.patch new file mode 100644 index 00000000000..510e25f56a4 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-fix-failed-static-assertion.patch @@ -0,0 +1,31 @@ +Fix a following build error: + +In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7: +../../3rdparty/chromium/base/bind.h:59:3: error: static_assert failed "Bound argument |i| of type |Arg| cannot be forwarded as |Unwrapped| to the bound functor, which declares it as |Param|." + static_assert( + ^ +../../3rdparty/chromium/base/bind.h:91:7: note: in instantiation of template class 'base::internal::AssertConstructible<1, long, long, const long &, NSError *>' requested here + : AssertConstructible, Unwrapped, Params>... { + ^ +../../3rdparty/chromium/base/bind.h:213:27: note: in instantiation of template class 'base::internal::AssertBindArgsValidity, base::internal::TypeList, long>, base::internal::TypeList, base::internal::TypeList >' requested here + static_assert(internal::AssertBindArgsValidity< + ^ +../../3rdparty/chromium/base/bind.h:242:16: note: in instantiation of function template specialization 'base::BindRepeating, long>' requested here + return base::BindRepeating(std::forward(functor), + ^ +../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:211:15: note: in instantiation of function template specialization 'base::Bind, long>' requested here + base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, + ^ + +Resurrected from https://github.com/NixOS/nixpkgs/blob/ddcf01bca6c7a7a7f096bec836a1e6a707ad473d/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch because the same problem is present in 5.12 when compiling on macOS. + +--- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm ++++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm +@@ -209,7 +209,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic( + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, + base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, +- weak_ptr_factory_.GetWeakPtr(), nil)); ++ weak_ptr_factory_.GetWeakPtr(), nullptr)); + } + } diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch index 546e753144d..8ed3fe59a5a 100644 --- a/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch +++ b/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch @@ -1,4 +1,18 @@ +diff --git a/configure.pri b/configure.pri +index 897bea54..6f834c20 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -269,7 +269,7 @@ defineReplace(webEngineGetMacOSVersion) { + } + + defineReplace(webEngineGetMacOSSDKVersion) { +- value = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null") ++ value = $$system("xcrun --show-sdk-version") + return($$value) + } + diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf +index 35eb6b89..7eed640a 100644 --- a/mkspecs/features/platform.prf +++ b/mkspecs/features/platform.prf @@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { @@ -19,15 +33,39 @@ diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf } } else { skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") +@@ -111,7 +107,7 @@ defineTest(isMinOSXSDKVersion) { + requested_minor = $$2 + requested_patch = $$3 + isEmpty(requested_patch): requested_patch = 0 +- WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null") ++ WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("xcrun --show-sdk-version") + export(WEBENGINE_OSX_SDK_PRODUCT_VERSION) + isEmpty(WEBENGINE_OSX_SDK_PRODUCT_VERSION) { + skipBuild("Could not resolve SDK product version for \'$$QMAKE_MAC_SDK\'.") diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri +index 4426901c..3aa6057e 100644 --- a/src/core/config/mac_osx.pri +++ b/src/core/config/mac_osx.pri -@@ -5,8 +5,6 @@ load(functions) +@@ -5,16 +5,16 @@ load(functions) # otherwise query for it. QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) isEmpty(QMAKE_MAC_SDK_VERSION) { - QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") -- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") ++ QMAKE_MAC_SDK_VERSION = $$system("xcrun --show-sdk-version") + isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") } - + QMAKE_CLANG_DIR = "/usr" +-QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX) +-!isEmpty(QMAKE_CLANG_PATH) { +- clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../") +- exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir +-} ++# QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX) ++# !isEmpty(QMAKE_CLANG_PATH) { ++# clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../") ++# exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir ++# } + + QMAKE_CLANG_PATH = "$${QMAKE_CLANG_DIR}/bin/clang++" + message("Using clang++ from $${QMAKE_CLANG_PATH}") diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 512060701e2..c0db5915b94 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -13,7 +13,7 @@ , systemd , enableProprietaryCodecs ? true , gn -, cups, darwin, openbsm, runCommand, xcbuild +, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin , ffmpeg_3 ? null , lib, stdenv }: @@ -51,6 +51,13 @@ qtModule { substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \ --replace /bin/echo ${coreutils}/bin/echo '' + # Prevent Chromium build script from making the path to `clang` relative to + # the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR` + # from `src/core/config/mac_osx.pri`. + + optionalString stdenv.isDarwin '' + substituteInPlace ./src/3rdparty/chromium/build/toolchain/mac/BUILD.gn \ + --replace 'prefix = rebase_path("$clang_base_path/bin/", root_build_dir)' 'prefix = "$clang_base_path/bin/"' + '' # Patch library paths in Qt sources + '' sed -i \ @@ -69,32 +76,15 @@ qtModule { '' + optionalString stdenv.isDarwin ('' substituteInPlace src/core/config/mac_osx.pri \ - --replace /usr ${stdenv.cc} + --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"' '' + # Following is required to prevent a build error: + # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it + (optionalString (lib.versionAtLeast qtCompatVersion "5.11") '' substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ --replace '$sysroot/usr' "${darwin.xnu}" '') + '' - - cat < src/3rdparty/chromium/build/mac/find_sdk.py -#!/usr/bin/env python -print("${darwin.apple_sdk.sdk}") -print("10.12.0") -EOF - - cat < src/3rdparty/chromium/build/config/mac/sdk_info.py -#!/usr/bin/env python -print('xcode_version="0910"') -print('xcode_version_int=910') -print('xcode_build="9B55"') -print('machine_os_build="17E199"') -print('sdk_path=""') -print('sdk_version="10.10"') -print('sdk_platform_path=""') -print('sdk_build="17B41"') -EOF - # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" @@ -111,8 +101,8 @@ EOF # TODO: investigate and fix properly "-march=westmere" ] ++ lib.optionals stdenv.isDarwin [ - "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10" - "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10" + "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12" + "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_12" # # Prevent errors like @@ -189,6 +179,7 @@ EOF CoreWLAN Quartz Cocoa + LocalAuthentication openbsm libunwind @@ -197,6 +188,21 @@ EOF buildInputs = optionals stdenv.isDarwin (with darwin; [ cups + # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py` + # to get some information about the host platform. + (writeScriptBin "sw_vers" '' + #!${stdenv.shell} + + while [ $# -gt 0 ]; do + case "$1" in + -buildVersion) echo "17E199";; + *) break ;; + + esac + shift + done + '') + # For sandbox.h include (runCommand "MacOS_SDK_sandbox.h" {} '' install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h From f9c3038465a42055d4a87f1b47690ead1711f92c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 19 Aug 2020 15:46:46 +0200 Subject: [PATCH 272/520] chromium: 84.0.4147.125 -> 84.0.4147.135 https://chromereleases.googleblog.com/2020/08/stable-channel-update-for-desktop_18.html This update includes 1 security fix. CVEs: CVE-2020-6556 --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 17c3c188a48..14e9f306bf9 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 = "0qvcp47m3mc1lw22sq1a4pvaxxi5wlmwzjz23ak01wj3v1xifsh6"; - sha256bin64 = "1a06yhaifbjs88wskfb3mcx06klhvdvz2mnkzz6szhkypz8mi3dp"; - version = "85.0.4183.59"; + sha256 = "0i7vd0w1swvxw46wiy1xrni02xa7yvccw4cp9v2dc2lm5r43dw5q"; + sha256bin64 = "0by3fgmd54zj5q5znazrl3vf42ik3rhirwy5815i7isqiq7bb6lq"; + version = "85.0.4183.69"; }; dev = { - sha256 = "0nirf72i3zdqsy201qzinfn9k40iy315i6z0a8xn3ciagh10p5j4"; - sha256bin64 = "1ss36w8bsqfswnqddhn2aamjmsyh2vr0y9gjlzrh702mda8yraq1"; - version = "86.0.4221.3"; + sha256 = "1yasmx3alal3gygyjvvjk799z0b6p6nm7q10m0qyls2mpfvxpcyw"; + sha256bin64 = "0lp93z9qwdbjblmj0d514plk44hs0yqw1v7vr5mnrrx6l9gm0yg0"; + version = "86.0.4229.0"; }; stable = { - sha256 = "1xdg9pnnvbzasmra09rl7wdrir61rfcqml46jj7kv39drwk9chwq"; - sha256bin64 = "1fbn9vkz4kf1dhivi1sfnfi8dady9qjmfr44hvfmb8aibh9kzc8w"; - version = "84.0.4147.125"; + sha256 = "1n4n95gllqmsrzxmcp9p4gz95gndq2v3vknfvm8p1qfhjqah0hfx"; + sha256bin64 = "1ak903wm8zq6pri88md2wdij3izr6kz9d4avyqnpmd68ch16vfnj"; + version = "84.0.4147.135"; }; } From 465985bd8e7680ff69f6ca7117c0bcd12513b65f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 19 Aug 2020 16:19:25 +0200 Subject: [PATCH 273/520] glances: 3.1.4.1 -> 3.1.5 --- pkgs/applications/system/glances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 470a532ac72..6b77914539c 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -8,14 +8,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.1.4.1"; + version = "3.1.5"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "04dc3pwj9qbbhxpihf13ckdgwz0qc771c7v7awni4vyzk3a9cdfb"; + sha256 = "0l91nvlwyabxlsy5p533dqnc68mmvykfsrcsnxylcpjjl1nzy931"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): From f13d9521214d881be36c9854681567aa69ab3b09 Mon Sep 17 00:00:00 2001 From: eyjhb Date: Wed, 19 Aug 2020 16:40:28 +0200 Subject: [PATCH 274/520] androidenv: fix convert files not quoting urls --- pkgs/development/mobile/androidenv/convertaddons.xsl | 12 ++++++------ .../mobile/androidenv/convertpackages.xsl | 4 ++-- .../mobile/androidenv/convertsystemimages.xsl | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/mobile/androidenv/convertaddons.xsl b/pkgs/development/mobile/androidenv/convertaddons.xsl index 73f58ff5cde..20f007eca04 100644 --- a/pkgs/development/mobile/androidenv/convertaddons.xsl +++ b/pkgs/development/mobile/androidenv/convertaddons.xsl @@ -36,13 +36,13 @@ archives = { all = fetchurl { - url = ; + url = ""; sha1 = ""; }; = fetchurl { - url = ; + url = ""; sha1 = ""; }; @@ -60,13 +60,13 @@ archives = { all = fetchurl { - url = ; + url = ""; sha1 = ""; }; = fetchurl { - url = ; + url = ""; sha1 = ""; }; @@ -108,13 +108,13 @@ archives = { all = fetchurl { - url = ; + url = ""; sha1 = ""; }; = fetchurl { - url = ; + url = ""; sha1 = ""; }; diff --git a/pkgs/development/mobile/androidenv/convertpackages.xsl b/pkgs/development/mobile/androidenv/convertpackages.xsl index 5c36deb73c0..edc9074a898 100644 --- a/pkgs/development/mobile/androidenv/convertpackages.xsl +++ b/pkgs/development/mobile/androidenv/convertpackages.xsl @@ -98,13 +98,13 @@ archives = { all = fetchurl { - url = ; + url = !"; sha1 = ""; }; = fetchurl { - url = ; + url = ""; sha1 = ""; }; diff --git a/pkgs/development/mobile/androidenv/convertsystemimages.xsl b/pkgs/development/mobile/androidenv/convertsystemimages.xsl index de57041f192..947950badb4 100644 --- a/pkgs/development/mobile/androidenv/convertsystemimages.xsl +++ b/pkgs/development/mobile/androidenv/convertsystemimages.xsl @@ -64,7 +64,7 @@ displayName = ""; archives.all = fetchurl { - url = ; + url = ""; sha1 = ""; }; From b7f3c994a1e479b08f05ac734a8dcca9354c4cf5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Aug 2020 18:12:11 +0200 Subject: [PATCH 275/520] python-osc: update to version 0.170.0 --- pkgs/development/python-modules/osc/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index c9ce8324b18..cae6a468c77 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -1,19 +1,21 @@ -{ stdenv, buildPythonPackage , fetchFromGitHub , bashInteractive , urlgrabber, m2crypto, rpm }: +{ stdenv, buildPythonPackage, fetchFromGitHub, bashInteractive, urlgrabber +, m2crypto, rpm, chardet +}: buildPythonPackage rec { pname = "osc"; - version = "0.167.1"; + version = "0.170.0"; src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; rev = version; - sha256 = "0f3c6mzvk9yjicwfdh47j4s2l1wrfgpa6lmqdchasdqfsacps4r6"; + sha256 = "10dj9kscz59qm8rw5084gf0m8ail2rl7r8rg66ij92x88wvi9mbz"; }; buildInputs = [ bashInteractive ]; # needed for bash-completion helper checkInputs = [ rpm ]; - propagatedBuildInputs = [ urlgrabber m2crypto ]; + propagatedBuildInputs = [ urlgrabber m2crypto chardet ]; postInstall = '' ln -s $out/bin/osc-wrapper.py $out/bin/osc From a19d6323c0a23135e175a01b8185c36b830a40e9 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 20 Aug 2020 00:18:52 +0900 Subject: [PATCH 276/520] cargo-tree: remove --- .../package-management/cargo-tree/default.nix | 25 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 pkgs/tools/package-management/cargo-tree/default.nix diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix deleted file mode 100644 index 2e0207e01ed..00000000000 --- a/pkgs/tools/package-management/cargo-tree/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-tree"; - version = "0.29.0"; - - src = fetchFromGitHub { - owner = "sfackler"; - repo = "cargo-tree"; - rev = "v${version}"; - sha256 = "16k41pj66m2221n1v2szir7x7qwx4i0g3svck2c8cj76h0bqyy15"; - }; - - cargoSha256 = "0762gdj4n5mlflhzynnny1h8z792zyxmb4kcn54jj7qzdask4qdy"; - - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; - - meta = with lib; { - description = "A cargo subcommand that visualizes a crate's dependency graph in a tree-like format"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ jD91mZM2 ma27 ]; - homepage = "https://crates.io/crates/cargo-tree"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5882eadc73b..d1eb331c5bb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -67,6 +67,7 @@ mapAliases ({ buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 + cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20 casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken."; catfish = xfce.catfish; # added 2019-12-22 cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8220eb65b17..fbc22fc2ab8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9450,7 +9450,6 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { }; - cargo-tree = callPackage ../tools/package-management/cargo-tree { }; cargo-update = callPackage ../tools/package-management/cargo-update { inherit (darwin.apple_sdk.frameworks) Security; }; From 30cc8337441a9c7843a8cec84d6f89fd55f38124 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Wed, 19 Aug 2020 14:14:14 +0000 Subject: [PATCH 277/520] timescale-prometheus: 0.1.0-beta.1 -> 0.1.0-beta.2 --- pkgs/servers/monitoring/timescale-prometheus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/timescale-prometheus/default.nix b/pkgs/servers/monitoring/timescale-prometheus/default.nix index 3af28b56dbf..bd847176e0a 100644 --- a/pkgs/servers/monitoring/timescale-prometheus/default.nix +++ b/pkgs/servers/monitoring/timescale-prometheus/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "timescale-prometheus"; - version = "0.1.0-beta.1"; + version = "0.1.0-beta.2"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "${version}"; - sha256 = "1q6xky4h9x4j2f0f6ajxwlnqq1pgd2n0z1ldrcifyamd90qkwcm5"; + sha256 = "1rrr0qb27hh3kcmmxapr1j39dhfxf02vihpjf4b7zpwdf1mpvrbc"; }; - vendorSha256 = "sha256:1vp30y59w8mksqxy9ic37vj1jw4lbq24ahhb08a72rysylw94r57"; + vendorSha256 = "sha256:0y5rq2y48kf2z1z3a8ags6rqzfvjs54klk2679fk8x0yjamj5x04"; doCheck = false; From 12ce9f072ff51f375dc0e49199b0d4272675c0a4 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 19 Aug 2020 19:45:21 +0200 Subject: [PATCH 278/520] osslsigncode: unstable-2019-07-25 -> unstable-2020-08-02 --- pkgs/development/tools/osslsigncode/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index a867e3850e2..6924ec9e37a 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "unstable-2019-07-25"; + version = "unstable-2020-08-02"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; - rev = "18810b7e0bb1d8e0d25b6c2565a065cf66bce5d7"; - sha256 = "02jnbr3xdsb5dpll3k65080ryrfr7agawmjavwxd0v40w0an5yq8"; + rev = "01b3fb5b542ed0b41e3860aeee7a85b735491ff2"; + sha256 = "03ynm1ycbi86blglma3xiwadck8kc5yb0gawjzlhyv90jidn680l"; }; nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ]; @@ -24,8 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mtrojnar/osslsigncode"; description = "OpenSSL based Authenticode signing for PE/MSI/Java CAB files"; license = licenses.gpl3Plus; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; platforms = platforms.all; }; } - From c09965182ac18de3215b55c4749b2bb38b721cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 19 Aug 2020 19:46:55 +0200 Subject: [PATCH 279/520] firefox*, thunderbird*: explain no-buildconfig*.patch --- .../networking/browsers/firefox/no-buildconfig-ffx65.patch | 1 + .../networking/browsers/firefox/no-buildconfig-ffx76.patch | 1 + .../networking/mailreaders/thunderbird/no-buildconfig-68.patch | 1 + .../networking/mailreaders/thunderbird/no-buildconfig.patch | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch index 7d129dc78f9..1380c7dc9a2 100644 --- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch +++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch @@ -1,3 +1,4 @@ +Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. diff -ur firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp firefox-65.0/docshell/base/nsAboutRedirector.cpp --- firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp 2019-01-23 00:48:28.988747428 +0100 +++ firefox-65.0/docshell/base/nsAboutRedirector.cpp 2019-01-23 00:51:13.378188397 +0100 diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch index 2fe30980a35..3530954ea5c 100644 --- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch +++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch @@ -1,3 +1,4 @@ +Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. diff -ur firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp firefox-65.0/docshell/base/nsAboutRedirector.cpp --- firefox-76.0.orig/docshell/base/nsAboutRedirector.cpp 2020-05-03 19:01:29.926544735 +0200 +++ firefox-76.0/docshell/base/nsAboutRedirector.cpp 2020-05-03 19:12:00.845035570 +0200 diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch index fe3a93ebda7..482c10bd1cf 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch +++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch @@ -1,3 +1,4 @@ +Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp --- a/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200 +++ b/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200 diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch index efbddd3fba8..d413a06475d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch +++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch @@ -1,3 +1,4 @@ +Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp --- a/docshell/base/nsAboutRedirector.cpp +++ b/docshell/base/nsAboutRedirector.cpp From f77e427cf6ce9c4ef4e1a7d3b18a37b7e432a13c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 19 Aug 2020 19:49:16 +0200 Subject: [PATCH 280/520] thunderbird: Enable official branding by default Now we do have an explicit permission from Mozilla. /cc PR #94880 --- .../networking/mailreaders/thunderbird/68.nix | 9 +++------ .../networking/mailreaders/thunderbird/default.nix | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index 4b1efef027e..3143c7f62bb 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -62,12 +62,9 @@ , waylandSupport ? true , libxkbcommon, calendarSupport ? true -, # If you want the resulting program to call itself "Thunderbird" instead -# of "Earlybird" or whatever, enable this option. However, those -# binaries may not be distributed without permission from the -# Mozilla Foundation, see -# http://www.mozilla.org/foundation/trademarks/. -enableOfficialBranding ? false +# Use official trademarked branding. Permission obtained at: +# https://github.com/NixOS/nixpkgs/pull/94880#issuecomment-675907971 +, enableOfficialBranding ? true }: assert waylandSupport -> gtk3Support == true; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 961806fa9ab..53d337067d7 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -60,12 +60,9 @@ , waylandSupport ? true , libxkbcommon, calendarSupport ? true -, # If you want the resulting program to call itself "Thunderbird" instead -# of "Earlybird" or whatever, enable this option. However, those -# binaries may not be distributed without permission from the -# Mozilla Foundation, see -# http://www.mozilla.org/foundation/trademarks/. -enableOfficialBranding ? false +# Use official trademarked branding. Permission obtained at: +# https://github.com/NixOS/nixpkgs/pull/94880#issuecomment-675907971 +, enableOfficialBranding ? true }: assert waylandSupport -> gtk3Support == true; From d5acb85b09e044886486f9e1c45ef1d01590c13d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 19 Aug 2020 19:05:54 +0100 Subject: [PATCH 281/520] emacsPackages.elpa-packages: 2020-08-19 --- .../editors/emacs-modes/elpa-generated.nix | 318 ++++++++++++------ 1 file changed, 219 insertions(+), 99 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index b1b33dc9354..a56cb73fb24 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -19,10 +19,10 @@ elpaBuild { pname = "ack"; ename = "ack"; - version = "1.8"; + version = "1.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ack-1.8.tar"; - sha256 = "1d4218km7j1bx1fsna29j3gi3k2ak2fzbk1gyki327pnnlma6bav"; + url = "https://elpa.gnu.org/packages/ack-1.10.tar"; + sha256 = "0jz8badhjpzjlrprpzgcm1z6ask1ykc7ab62ixjrj9wcgfjif5qw"; }; packageRequires = []; meta = { @@ -39,10 +39,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "7.1.1"; + version = "7.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-7.1.1.tar"; - sha256 = "11ch0dn478ddzkcjcyqf2rjim7w0fjb8xfijqxxi07847w4gkklp"; + url = "https://elpa.gnu.org/packages/ada-mode-7.1.4.tar"; + sha256 = "13zcs7kn7rca82c80qshbdpmmmgkf5phr88hf7p5nwxqhkazy9cd"; }; packageRequires = [ emacs uniquify-files wisi ]; meta = { @@ -54,10 +54,10 @@ elpaBuild { pname = "ada-ref-man"; ename = "ada-ref-man"; - version = "2012.5"; + version = "2020.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-ref-man-2012.5.tar"; - sha256 = "0n7izqc44i3l6fxbzkq9gwwlcf04rr9g1whrk8biz84jhbyh23x8"; + url = "https://elpa.gnu.org/packages/ada-ref-man-2020.1.tar"; + sha256 = "1g4brb9g2spd55issyqldfc4azwilbrz8kh8sl0lka2kn42l3qqc"; }; packageRequires = []; meta = { @@ -223,10 +223,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "12.2.1"; + version = "12.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-12.2.1.tar"; - sha256 = "14y0kdri2zvz81qwpncsr3ly4ciqab6g8yxl956k3ddn36b3a56s"; + url = "https://elpa.gnu.org/packages/auctex-12.2.4.tar"; + sha256 = "1yz2h692mr35zgqwlxdq8rzv8n0jixhpaqmbiki00hlysm4zh9py"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -557,10 +557,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.9.12"; + version = "0.9.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.12.tar"; - sha256 = "1vcgfccdc06alba3jl6dg7ms20wdzdhaqikh7id5lbawb00hc10j"; + url = "https://elpa.gnu.org/packages/company-0.9.13.tar"; + sha256 = "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw"; }; packageRequires = [ emacs ]; meta = { @@ -636,6 +636,36 @@ license = lib.licenses.free; }; }) {}; + counsel = callPackage ({ elpaBuild, emacs, fetchurl, lib, swiper }: + elpaBuild { + pname = "counsel"; + ename = "counsel"; + version = "0.13.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/counsel-0.13.1.el"; + sha256 = "1y3hr3j5bh5mbyh1cqzxx04181qpvj4xyv1gym2gxcjd30nfllli"; + }; + packageRequires = [ emacs swiper ]; + meta = { + homepage = "https://elpa.gnu.org/packages/counsel.html"; + license = lib.licenses.free; + }; + }) {}; + cpio-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "cpio-mode"; + ename = "cpio-mode"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cpio-mode-0.16.tar"; + sha256 = "06xdifgx45aghfppz5dws3v6w37q84lwgxp1pc51p2jjflqbqy5q"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cpio-mode.html"; + license = lib.licenses.free; + }; + }) {}; crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "crisp"; @@ -730,10 +760,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.22"; + version = "0.25"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.22.tar"; - sha256 = "05ik9qv539b5c1nzxkk3lk23bqj4vqgmfmd8x367abhb7c9gix2z"; + url = "https://elpa.gnu.org/packages/debbugs-0.25.tar"; + sha256 = "0h0pxav170yzfpjf4vb8simiw67x9dkcjx9m4ghdk6wia25y8jni"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -745,10 +775,10 @@ elpaBuild { pname = "delight"; ename = "delight"; - version = "1.5"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/delight-1.5.el"; - sha256 = "0kzlvzwmn6zj0874086q2xw0pclyi7wlkq48zh2lkd2796xm8vw7"; + url = "https://elpa.gnu.org/packages/delight-1.7.el"; + sha256 = "0pihsghrf9xnd1kqlq48qmjcmp5ra95wwwgrb3l8m1wagmmc0bi1"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -925,10 +955,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.17"; + version = "0.6.18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.17.tar"; - sha256 = "07335pcqvvj1apzbwy4dc4i6pc6w21hr7v9fvgkc9c2x7fqlqg24"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.18.tar"; + sha256 = "0znbv3c7wdgak1f1zb051vg4r29fksqh53k1j77jfmqcvwkpz2mw"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -970,10 +1000,10 @@ elpaBuild { pname = "ediprolog"; ename = "ediprolog"; - version = "1.2"; + version = "2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ediprolog-1.2.el"; - sha256 = "039ffvp7c810mjyargmgw1i87g0z8qs8qicq826sd9aiz9hprfaz"; + url = "https://elpa.gnu.org/packages/ediprolog-2.1.el"; + sha256 = "1piimsmzpirw8plrpy79xbpnvynzzhcxi31g6lg6is8gridiv3md"; }; packageRequires = []; meta = { @@ -1040,10 +1070,10 @@ elpaBuild { pname = "eldoc"; ename = "eldoc"; - version = "1.0.0"; + version = "1.8.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eldoc-1.0.0.el"; - sha256 = "0jdqnndvpz929rbfgrm2bgw3z2vp7dvvgk3wnhvlhf63mdiza89m"; + url = "https://elpa.gnu.org/packages/eldoc-1.8.0.el"; + sha256 = "1zxy9x9a0yqwdi572jj04x9lyj3d87mpyfbn3092a5nqwc864k9w"; }; packageRequires = [ emacs ]; meta = { @@ -1085,10 +1115,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.4"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.4.tar"; - sha256 = "18ia04aq4pqa8374x60g3g66jqmm17c6n904naa0jhqphlgam8pb"; + url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.7.tar"; + sha256 = "1ps28bvh87d98k84ygx374a1kbwvnqm4w8jpkgzic01as78hgkiz"; }; packageRequires = []; meta = { @@ -1096,6 +1126,21 @@ license = lib.licenses.free; }; }) {}; + emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "emms"; + ename = "emms"; + version = "5.42"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/emms-5.42.tar"; + sha256 = "1khx1fvllrs6w9kxk12mp1hj309c90mc7lkq1vvlqlr7vd6zmnpj"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/emms.html"; + license = lib.licenses.free; + }; + }) {}; enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "enwc"; @@ -1187,10 +1232,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.23"; + version = "0.24"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.23.tar"; - sha256 = "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5"; + url = "https://elpa.gnu.org/packages/exwm-0.24.tar"; + sha256 = "0lj1a3cmbpf4h6x8k6x8cdm1qb51ca6filydnvi5zcda8zpl060s"; }; packageRequires = [ xelb ]; meta = { @@ -1243,16 +1288,16 @@ license = lib.licenses.free; }; }) {}; - flymake = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.0.8.el"; - sha256 = "1hqxrqb227v4ncjjqx8im3c4mhg8w5yjbz9hpfcm5x8xnr2yd6bp"; + url = "https://elpa.gnu.org/packages/flymake-1.0.9.el"; + sha256 = "0xm1crhjcs14iqkf481igbf40wj2ib3hjzinw1gn8w1n0462ymp6"; }; - packageRequires = [ emacs ]; + packageRequires = [ eldoc emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/flymake.html"; license = lib.licenses.free; @@ -1292,10 +1337,10 @@ elpaBuild { pname = "frog-menu"; ename = "frog-menu"; - version = "0.2.10"; + version = "0.2.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/frog-menu-0.2.10.el"; - sha256 = "050qikvgh9v7kgvhznjsfrpyhs7iq1x63bryqdkrwlf668yhzi1m"; + url = "https://elpa.gnu.org/packages/frog-menu-0.2.11.el"; + sha256 = "06iw11z61fd0g4w3562k3smcmzaq3nivvvc6gzm8y8k5pcrqzdff"; }; packageRequires = [ avy emacs posframe ]; meta = { @@ -1591,10 +1636,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "7.0.6"; + version = "7.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/hyperbole-7.0.6.tar"; - sha256 = "08gi4v76s53nfmn3s0qcxc3zii0pspjfd6ry7jq1kgm3z34x8hab"; + url = "https://elpa.gnu.org/packages/hyperbole-7.1.2.tar"; + sha256 = "1bspmqnbniwr9385wh823dsr5fgch5qnlkf45s4vi0nvg8jdccp1"; }; packageRequires = [ emacs ]; meta = { @@ -1636,10 +1681,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.13.0"; + version = "0.13.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-0.13.0.tar"; - sha256 = "18r9vb9v7hvdkylchn436sgh7ji9avhry1whjip8zrn0c1bnqmk8"; + url = "https://elpa.gnu.org/packages/ivy-0.13.1.tar"; + sha256 = "0n0ixhdykbdpis4krkqq6zncbby28p34742q96n0l91w0p19slcx"; }; packageRequires = [ emacs ]; meta = { @@ -1726,10 +1771,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.11"; + version = "1.0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.11.el"; - sha256 = "04cy1mqd6y8k5lcpg076szjk9av9345mmsnzzh6vgbcw3dcgbr23"; + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.12.el"; + sha256 = "0cqp05awikbrn88ifld3vwnv6cxgmr83wlnsvxw8bqb96djz70ad"; }; packageRequires = [ emacs ]; meta = { @@ -1782,6 +1827,21 @@ license = lib.licenses.free; }; }) {}; + leaf = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "leaf"; + ename = "leaf"; + version = "4.2.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/leaf-4.2.5.tar"; + sha256 = "0y78mp4c2gcwp7dc87wlx3r4hfmap14vvx8gkjc9nkf99qavpnkw"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/leaf.html"; + license = lib.licenses.free; + }; + }) {}; let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "let-alist"; @@ -2026,10 +2086,10 @@ elpaBuild { pname = "mmm-mode"; ename = "mmm-mode"; - version = "0.5.7"; + version = "0.5.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mmm-mode-0.5.7.tar"; - sha256 = "0c4azrkgagyfm9znh7hmw93gkvddpsxlr0dwjp96winymih7mahf"; + url = "https://elpa.gnu.org/packages/mmm-mode-0.5.8.tar"; + sha256 = "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4"; }; packageRequires = [ cl-lib ]; meta = { @@ -2041,10 +2101,10 @@ elpaBuild { pname = "modus-operandi-theme"; ename = "modus-operandi-theme"; - version = "0.8.1"; + version = "0.11.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.8.1.el"; - sha256 = "0i8s6blkhx53m1jk1bblqs7fwlbn57xkxxhsp9famcj5m0xyfimb"; + url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.11.0.el"; + sha256 = "11sq105vpp8rmyayfb7h8gz099kfdr7nb8n4pg81iby4fllj1kgd"; }; packageRequires = [ emacs ]; meta = { @@ -2056,10 +2116,10 @@ elpaBuild { pname = "modus-vivendi-theme"; ename = "modus-vivendi-theme"; - version = "0.8.1"; + version = "0.11.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.8.1.el"; - sha256 = "121nlr5w58j4q47rh9xjjf9wzb97yl2m1n2l6g58ck4vnarwndl1"; + url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.11.0.el"; + sha256 = "14ky9cxg9cpvhgg24ra0xla2dapqjlf948470q7v0m402x1r2iif"; }; packageRequires = [ emacs ]; meta = { @@ -2485,10 +2545,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.3.48"; + version = "0.3.52"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.3.48.tar"; - sha256 = "1mnbrsgh6lx7kgkfsfq5zk78a97iwh8mxgxzyf1zq4jj6ziwd6bv"; + url = "https://elpa.gnu.org/packages/phps-mode-0.3.52.tar"; + sha256 = "11783i4raw6z326bqin9g37ig2szbqsma1r0fsdckyn2q6w7nn92"; }; packageRequires = [ emacs ]; meta = { @@ -2530,10 +2590,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.7.0.el"; - sha256 = "1kwl83jb5k1hnx0s2qw972v0gjqbbvk4sdcdb1qbdxsyw36sylc9"; + url = "https://elpa.gnu.org/packages/posframe-0.8.0.el"; + sha256 = "1vzaiiw2pxa0zrc2bkaxljpr4035xrh3d8z3l5f0jvp72cnq49kp"; }; packageRequires = [ emacs ]; meta = { @@ -2541,16 +2601,16 @@ license = lib.licenses.free; }; }) {}; - project = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + project = callPackage ({ elpaBuild, emacs, fetchurl, lib, xref }: elpaBuild { pname = "project"; ename = "project"; - version = "0.1.2"; + version = "0.5.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.1.2.el"; - sha256 = "0713hwim1chf6lxpg1rb234aa1gj92c153fjlc4jddp6dzzgn50d"; + url = "https://elpa.gnu.org/packages/project-0.5.1.el"; + sha256 = "1i15hlrfipsfrdmgh6xzkr6aszgvik3y8j9363qkj654dl04pmz4"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs xref ]; meta = { homepage = "https://elpa.gnu.org/packages/project.html"; license = lib.licenses.free; @@ -2571,6 +2631,21 @@ license = lib.licenses.free; }; }) {}; + pspp-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "pspp-mode"; + ename = "pspp-mode"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/pspp-mode-1.1.el"; + sha256 = "1qnwj7r367qs0ykw71c6s96ximgg2wb3hxg5fwsl9q2vfhbh35ca"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/pspp-mode.html"; + license = lib.licenses.free; + }; + }) {}; python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "python"; @@ -2620,10 +2695,10 @@ elpaBuild { pname = "rainbow-mode"; ename = "rainbow-mode"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.4.el"; - sha256 = "0rp76gix1ph1wrmdax6y2m3i9y1dmgv7ikjz8xsl5lizkygsy9cg"; + url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.5.el"; + sha256 = "159fps843k5pap9k04a7ll1k3gw6d9c6w08lq4bbc3lqg78aa2l9"; }; packageRequires = []; meta = { @@ -2840,10 +2915,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.17"; + version = "1.18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.17.tar"; - sha256 = "1nv13dqdhf72c1jgk1ml4k6jqb8wsyphcx2vhsyhig5198lg4kd7"; + url = "https://elpa.gnu.org/packages/relint-1.18.tar"; + sha256 = "0zfislsksrkn6qs0w26yaff5xr7xqy2x235dcdpz8s2v35b6dhci"; }; packageRequires = [ emacs xr ]; meta = { @@ -2881,6 +2956,21 @@ license = lib.licenses.free; }; }) {}; + rt-liberation = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "rt-liberation"; + ename = "rt-liberation"; + version = "1.31"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rt-liberation-1.31.tar"; + sha256 = "0qqqqwdkb0h8137rqsr08179skl1475cg4hl7a987rmccys0j83c"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/rt-liberation.html"; + license = lib.licenses.free; + }; + }) {}; rudel = callPackage ({ cl-generic , cl-lib ? null , cl-print @@ -3067,6 +3157,21 @@ license = lib.licenses.free; }; }) {}; + so-long = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "so-long"; + ename = "so-long"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/so-long-1.0.el"; + sha256 = "00z9gnxz32rakd0k7lqaj050fwmqzq5vr9d6rb7ji3fn01rjp7kj"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/so-long.html"; + license = lib.licenses.free; + }; + }) {}; soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "soap-client"; @@ -3191,10 +3296,10 @@ elpaBuild { pname = "svg-clock"; ename = "svg-clock"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-clock-1.1.el"; - sha256 = "12wf4dd3vgbq1v3363cil4wr2skx60xy546jc69ycyk0jq7plcq3"; + url = "https://elpa.gnu.org/packages/svg-clock-1.2.el"; + sha256 = "15pmj07wnlcpv78av9qpnbfwdjlkf237vib8smpa7nvyikdfszfr"; }; packageRequires = [ emacs svg ]; meta = { @@ -3202,6 +3307,21 @@ license = lib.licenses.free; }; }) {}; + swiper = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }: + elpaBuild { + pname = "swiper"; + ename = "swiper"; + version = "0.13.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/swiper-0.13.1.el"; + sha256 = "06ild7kck0x5ry8bf0al24nh04q01q3jhj6jjl4xz8n2s6jnn70y"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://elpa.gnu.org/packages/swiper.html"; + license = lib.licenses.free; + }; + }) {}; system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "system-packages"; @@ -3300,10 +3420,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.4.3.4"; + version = "2.4.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.4.3.4.tar"; - sha256 = "01il42xb6s38qnb7bhn9d7gscc5p5y4da5a4dp1i1cyi823sfp8f"; + url = "https://elpa.gnu.org/packages/tramp-2.4.4.1.tar"; + sha256 = "0jayd75yscaqvg6y0m6g2mgbjswyj5gqdij2az9g0j18vm5vbqy3"; }; packageRequires = [ emacs ]; meta = { @@ -3491,10 +3611,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2020.2.23.232634261"; + version = "2020.6.27.14326051"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2020.2.23.232634261.el"; - sha256 = "07r2nzyfwmpv1299q1v768ai14rdgq7y4bvz5xsnp4qj3g06p0f6"; + url = "https://elpa.gnu.org/packages/verilog-mode-2020.6.27.14326051.el"; + sha256 = "194gn8cj01jb9xcl0qq3gq6mzxfdyn459ysb35fnib7pcnafm188"; }; packageRequires = []; meta = { @@ -3704,10 +3824,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-3.1.1.tar"; - sha256 = "0abm9xfyk2izi0w9172sfhdq83abcxgbngngbh2gby54df0ycn0q"; + url = "https://elpa.gnu.org/packages/wisi-3.1.3.tar"; + sha256 = "0cbjcm35lp164wd06mn3clikga07qxfsfnkvadswsapsd0cn2b4k"; }; packageRequires = [ emacs seq ]; meta = { @@ -3724,10 +3844,10 @@ elpaBuild { pname = "wisitoken-grammar-mode"; ename = "wisitoken-grammar-mode"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.1.0.tar"; - sha256 = "123z9j76cm0p22d9n4kqvn2477fdkgp5jarw564nd71cxrrb52ms"; + url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.2.0.tar"; + sha256 = "0isxmpwys148djjymszdm5nisqjp9xff8kad45l4cpb3c717vsjw"; }; packageRequires = [ emacs mmm-mode wisi ]; meta = { @@ -3810,16 +3930,16 @@ license = lib.licenses.free; }; }) {}; - xref = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: + xref = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xref"; ename = "xref"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.0.1.el"; - sha256 = "17wlwilm2d1gvin8mkkqnpw2skjx0klxfs1pqpy8rrzdfpsb55li"; + url = "https://elpa.gnu.org/packages/xref-1.0.2.el"; + sha256 = "156rfwdihb3vz31iszbmby16spqswyf69nhl3r2cp6jzkgwzc1d8"; }; - packageRequires = [ emacs project ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/xref.html"; license = lib.licenses.free; From 5f74bb1eac68ec4c6f7438b2887686c4211dd99d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 19 Aug 2020 19:05:56 +0100 Subject: [PATCH 282/520] emacsPackages.org-packages: 2020-08-19 --- .../editors/emacs-modes/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 4beb5750166..b0eccbd8881 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20200511"; + version = "20200817"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20200511.tar"; - sha256 = "147k6nmq00milw5knyhw01z481rcdl6s30vk4fkjidw508nkmg9c"; + url = "https://orgmode.org/elpa/org-20200817.tar"; + sha256 = "159hch9zls3apxq11c5rjpmci1avyl7q3cgsrqxwgnzy8c61104d"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20200511"; + version = "20200817"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20200511.tar"; - sha256 = "1hsdp7n985404zdqj6gyfw1bxxbs0p3bf4fyizvgji21zxwnf63f"; + url = "https://orgmode.org/elpa/org-plus-contrib-20200817.tar"; + sha256 = "0n3fhcxjsk2w78p7djna4nlppa7ypjxzpq3r5dmzc8jpl71mipba"; }; packageRequires = []; meta = { From 462ddc56a5de33ecb5fd42c27cd37abdfc318edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 19 Aug 2020 19:07:15 +0100 Subject: [PATCH 283/520] emacsPackages.melpa-packages: 2020-08-19 --- .../emacs-modes/recipes-archive-melpa.json | 12188 +++++++++------- 1 file changed, 7258 insertions(+), 4930 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index a10df779103..98346d4d82a 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -31,20 +31,20 @@ "url": "https://git.sr.ht/~zge/nullpointer-emacs", "unstable": { "version": [ - 20200411, - 1227 + 20200521, + 1352 ], - "commit": "59136313132c08ab5fddaa875f6abeb22916a04b", - "sha256": "0acdh1r28v6xcsh39r13xppzqb6m00jgxgsxl17779isw98w9a3y" + "commit": "16581d94a1e32677091f3721506a48177cc49e68", + "sha256": "08gdycsi5mjz7ak8x71i3zs7xnr23b384bdlf1bspa325k8v2klq" }, "stable": { "version": [ 0, 3, - 0 + 1 ], - "commit": "1d29192a3c28ba088d93410bfcdd4bee0abb6610", - "sha256": "02kmfzkrl35y599w5yal5d7rjb3xi02zhvb8q0m3iw4mbm16sw28" + "commit": "16581d94a1e32677091f3721506a48177cc49e68", + "sha256": "08gdycsi5mjz7ak8x71i3zs7xnr23b384bdlf1bspa325k8v2klq" } }, { @@ -322,14 +322,14 @@ "repo": "zk-phi/ac-c-headers", "unstable": { "version": [ - 20151021, - 834 + 20200816, + 1007 ], "deps": [ "auto-complete" ], - "commit": "de13a1d35b311e6601556d8ef163de102057deea", - "sha256": "1z6rj15p5gjv0jwnnck8789n9csf1pwxfvsz37graihgfy2khj0y" + "commit": "67e1e86a48c9bed57bc7ce5ce2553ad203f5752e", + "sha256": "1yk0a4p1pi7jwv48rvzn4i2733kg5ffp0q5vgcq22f98pmzyk77f" } }, { @@ -966,16 +966,16 @@ "stable": { "version": [ 2, - 2, - 2 + 3, + 0 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "4490d168778a61a4ee8623defe760164cd9745b8", - "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" } }, { @@ -1003,8 +1003,8 @@ "stable": { "version": [ 2, - 2, - 2 + 3, + 0 ], "deps": [ "dash", @@ -1014,8 +1014,8 @@ "s", "xcscope" ], - "commit": "4490d168778a61a4ee8623defe760164cd9745b8", - "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" } }, { @@ -1064,8 +1064,8 @@ "auto-complete", "rtags" ], - "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", - "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" + "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824", + "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b" }, "stable": { "version": [ @@ -1360,14 +1360,14 @@ "repo": "abo-abo/ace-link", "unstable": { "version": [ - 20200515, - 1854 + 20200518, + 957 ], "deps": [ "avy" ], - "commit": "b610dcb99510328d07ab1e1ea67b2f87ecb1cc5b", - "sha256": "0r7cyvrkbqq0dsm5963wn2i1wqgq0md5r8b2afjbr3m9b6v5lnq4" + "commit": "298f02f7dd117f9ec01f6aa2a2ddfecae0efb7f4", + "sha256": "1i243wfwrbxn00sh96248lpqfb7cvxqqwlc78nf8kim4ymylpp41" }, "stable": { "version": [ @@ -1449,8 +1449,8 @@ "deps": [ "avy-menu" ], - "commit": "02b22bdb40a5828dbd0a2af290034adb761743f0", - "sha256": "12b6s99d0wzs4q827kn5zr56vrp3x1kf2pxp4cr8z5hikylfswcs" + "commit": "390f0711d2a42675980d8b531fd5dc396b85f24b", + "sha256": "00va4glq9iibrfrnhinv8a7f5q0z7xvfyxnjf1rl4z770drz9j4n" }, "stable": { "version": [ @@ -1473,14 +1473,14 @@ "repo": "abo-abo/ace-window", "unstable": { "version": [ - 20200311, - 1025 + 20200606, + 1259 ], "deps": [ "avy" ], - "commit": "7003c88cd9cad58dc35c7cd13ebc61c355fb5be7", - "sha256": "0f3r40d5yxp2pm2j0nn86s29nqj8py0jxjbj50v4ci3hsd92d8jl" + "commit": "c7cb315c14e36fded5ac4096e158497ae974bec9", + "sha256": "06zkb5v6h0gwrqx7xiz2vlzf13kzf3z79xc5jhv2j73rqcajjy9v" }, "stable": { "version": [ @@ -1531,6 +1531,30 @@ "sha256": "02ba4d8qkvgy52g0zcbyfvsnhr9685gq569nkwa2as30xdcq3khm" } }, + { + "ename": "acme-theme", + "commit": "0bf14d91ff89556671b175d5f7e71066f27cb73d", + "sha256": "0zsrqvhly3si2qkvc4rhki89r2z185l684wf7j9kx32fgaaqanac", + "fetcher": "github", + "repo": "ianpan870102/acme-emacs-theme", + "unstable": { + "version": [ + 20200724, + 1833 + ], + "commit": "e416ec678be72eb1aed3de3d88a8a9e3ee7315ca", + "sha256": "0y98il3gsnhm586hr1qdmif4r6v1987fzl82wgx75g8kiy5shbrj" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "680b2022445861e3e9030a96d9fe587188d778c8", + "sha256": "1mww6x8gwhkrqcylxxm25xhcvam52nhj7q3f3bvaxhyfdc7jw9yq" + } + }, { "ename": "actionscript-mode", "commit": "2c11e74f2156f109b713380cebf83022d7159d4a", @@ -1847,11 +1871,11 @@ "repo": "vietor/agtags", "unstable": { "version": [ - 20191112, - 142 + 20200730, + 116 ], - "commit": "8813eb055dfd3faf1021c7d02fed0dabd8e518c1", - "sha256": "0xj394fiqsyh32g21mcp64srs8dlf0ixaildyla1gm27v8cgiakb" + "commit": "d80c6f61dee74040c07b7010d48cab1df13a3abf", + "sha256": "05jkkh7m126j24ayh85bk10s4z3lsy1s6n217qb7hlgfl8y5fqdj" } }, { @@ -1865,8 +1889,8 @@ 20191212, 652 ], - "commit": "938c78327aad94d5f8e8d86ffd9808a687f3e953", - "sha256": "1zzhy5ajr6ivmj4jbbmaznxfqgxl4xy21s2r4wip668w8kw02h4m" + "commit": "3ca848bcf1fc4c18b4a5329d1439c5effb7dcb97", + "sha256": "1lgxwhq5359qrn3zv5m9sssz93vbqa6bp49z526pck1bkf80s3vx" } }, { @@ -1940,11 +1964,11 @@ "repo": "skeeto/emacs-aio", "unstable": { "version": [ - 20200410, - 1409 + 20200610, + 1904 ], - "commit": "9367005c44c42c46c8ca1e7d3f780731c7d123dd", - "sha256": "063avjlizpjc53myjzvkqsp64gkxwcc7w7shjdf1xgjb9b58pbc1" + "commit": "da93523e235529fa97d6f251319d9e1d6fc24a41", + "sha256": "0hnxbz5pxlrgxhjr5gnhf06qwg67g5pd87xkp0smmagsh18pnf76" }, "stable": { "version": [ @@ -2006,21 +2030,21 @@ }, { "ename": "alan-mode", - "commit": "6e52314db81dad3517ab400099b032260c3e3e6f", - "sha256": "1528rh26kr9zj43djbrfb7vmq78spfay3k3ps5apc580ipx1a4hg", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1i3vhqdrp8zdmkzgyri5z7vh1j0mykcp7mkjxjc7293ncsj310d8", "fetcher": "github", - "repo": "M-industries/AlanForEmacs", + "repo": "alan-platform/AlanForEmacs", "unstable": { "version": [ - 20190407, - 555 + 20200723, + 1405 ], "deps": [ "flycheck", "s" ], - "commit": "a5a705b64230bb14ad1d19bcc0613e3261e8cbe5", - "sha256": "1jhsrb26fpm9yykp974rx77ika76zq3gq7pcjgixw4d4ga737d95" + "commit": "fc1fc0312b3e7f868f95b917a66719afb96f0c9a", + "sha256": "1cadc2v8mdlz5di7cwhc9qqhrkwgl3gxyw5v4il895r44rcdifgq" }, "stable": { "version": [ @@ -2133,11 +2157,11 @@ "repo": "alezost/alect-themes", "unstable": { "version": [ - 20190506, - 1440 + 20200801, + 2041 ], - "commit": "da7305075d292cc1909bf26dc5634bc3cc8d2603", - "sha256": "06nsfmydlcdqi4fp3nn6yz4xys38f3q196pf3bmmdqgg7pbcm259" + "commit": "684249b83d711145865ec31650e66ed9aa6e691b", + "sha256": "1cyd327shiwgdxf7bx542pfw6d6ilsq51n65lz3bfs8fzm5mib8v" }, "stable": { "version": [ @@ -2240,14 +2264,14 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20200508, - 1157 + 20200730, + 1545 ], "deps": [ "memoize" ], - "commit": "d6cb6d4a779eaa3570d8e451fd4d38b2b4554860", - "sha256": "0pnzsnklqjlks6ipaj242vlrk5skmwflpn1sdd00xw9gmb5mxb3m" + "commit": "8c0228053dd6693d926970d89270094be52b0f75", + "sha256": "08p2x6da4dp6imw6dg501kw68m4rhjfdbc6yn5ld29mazvv923zl" }, "stable": { "version": [ @@ -2307,14 +2331,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20200319, - 1625 + 20200612, + 1642 ], "deps": [ "all-the-icons" ], - "commit": "3ee9e32f480329e94e45f86538343b0ddc7ddd4f", - "sha256": "1cs9027q26nfm5k3182mbmmhj8s8y2nv47gsyamwpjqdma0sbl73" + "commit": "8bb1a893e826e39ad4d7abc0add5dd6c33b18f29", + "sha256": "02sbddvjys6bf8pcbg3pv5fc1f8b48vmx0bnfyqw1x04dyb8cdm7" }, "stable": { "version": [ @@ -2369,28 +2393,28 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20200324, - 550 + 20200811, + 838 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "a9a4389c1930a5a071857b4d450eaecb21f4d6b9", - "sha256": "133vl3awl3qxxd2ka8zdr33v6s8hrjpsv4bv2db5j8jz35m0hx9d" + "commit": "e918b23d55313a7464d8cb5d45eb917249638e32", + "sha256": "1wz3dgn8cggdkijzm7qf13g3s9gmz6v895bjck7sdhmr5mbr28a4" }, "stable": { "version": [ 1, - 2, - 0 + 4, + 1 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "3e02da9a166df7ebea25aae476efd7b8d74d63e0", - "sha256": "0p91yvpqy7xjkz2mcpq6c8kjfxqfw9byxprqg2qqnzg421c5yv6x" + "commit": "e918b23d55313a7464d8cb5d45eb917249638e32", + "sha256": "1wz3dgn8cggdkijzm7qf13g3s9gmz6v895bjck7sdhmr5mbr28a4" } }, { @@ -2440,20 +2464,20 @@ "repo": "jcs-elpa/alt-codes", "unstable": { "version": [ - 20190701, - 1246 + 20200723, + 1037 ], - "commit": "ded8cbff05f4f2fc4d023c5ee08ebe8b1bdb9ca9", - "sha256": "1v8sir3c0akv5sb8yg01zh0n6qqd4hp95sahbx01z1200g0phcaw" + "commit": "b36c2b2bccc628da1579016381d5c3195c9e12b2", + "sha256": "19nqpg91in65gj59zndhncx6c1005k0wh05rprv1z6465j5gd40g" }, "stable": { "version": [ 0, 0, - 4 + 5 ], - "commit": "7dcd9cdcc41cfb991801ea1e2f5b3c925a5309ee", - "sha256": "19xg4ng3p49zvn1y7vagrfiiwvc2fynwibr6cmj7qam1y64lw90c" + "commit": "b36c2b2bccc628da1579016381d5c3195c9e12b2", + "sha256": "19nqpg91in65gj59zndhncx6c1005k0wh05rprv1z6465j5gd40g" } }, { @@ -2593,14 +2617,14 @@ "repo": "stardiviner/amread-mode", "unstable": { "version": [ - 20200404, - 1143 + 20200623, + 1544 ], "deps": [ "cl-lib" ], - "commit": "a595828fcc2257f765139b576beb6c33b4fc3bce", - "sha256": "1mwlj48hjp59mcafia612qqzmqxh30k0jshzrnzsnwlfbbsdxjwj" + "commit": "7b1ed6c8aea409e2dce4a3b59f304d716a8efab7", + "sha256": "12hcgkznf1l4db8y0q33v735b5iin8iycc5s0di46ichxcjr0b7x" } }, { @@ -2611,14 +2635,14 @@ "repo": "DarwinAwardWinner/amx", "unstable": { "version": [ - 20200417, - 1513 + 20200701, + 2108 ], "deps": [ "s" ], - "commit": "7fb7b874291e0cdeb1f0acb18564a686ec86788d", - "sha256": "0yc2b814zcl3c6lgamrr63cl4r3ayzlyfqql8875fzflc541nnnc" + "commit": "ccfc92c600df681df5e8b5fecec328c462ceb71e", + "sha256": "0pdgicknrph4lfyjxwdqh7xwcfsnqnrx1l4xpd972ivy1n8s7783" }, "stable": { "version": [ @@ -2640,8 +2664,8 @@ "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20200129, - 1718 + 20200806, + 436 ], "deps": [ "dash", @@ -2649,8 +2673,8 @@ "pythonic", "s" ], - "commit": "10299bd9ff38c4f0da1d892905d02ef828e7fdce", - "sha256": "0s5pxfjcsmyrqc5pa2lqx6mxzwy3g8mc3iaxbj313sn1nly26vjw" + "commit": "73266a48fa964d44268c3f3478597e553b9843f1", + "sha256": "0b4zzkr73hmjg92vr348294xymrynw4j0x89jzklh2plizp0alcr" }, "stable": { "version": [ @@ -2730,11 +2754,11 @@ "repo": "fernando-jascovich/android-env.el", "unstable": { "version": [ - 20190720, - 1927 + 20200722, + 1403 ], - "commit": "dcb0bff0e77257266201cf1ccf17e7ca94e67fb1", - "sha256": "132fshzb4f0miqn3ijvwfdigldrvx7dsx06dczr9z9v9xw61ar8j" + "commit": "5c6a6d9449f300eec4f374a5410edc1cbab02e40", + "sha256": "182b3fd85q3x5ynnfnjb01phhq1glf1wxj5rz8zx43ddnzz9ahmn" } }, { @@ -2778,21 +2802,17 @@ }, { "ename": "angular-mode", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "0pq4lyhppzi806n1k07n0gdhr8z8z71ri12my0pl81rl5j2z69l2", + "commit": "54d86ad963ca7357ccb62a2e4aa124ed44bc0ebf", + "sha256": "04c07flrfnfr6jsqm76xdl5gw79rh18ys4cmqjmgv55rrs0w4rws", "fetcher": "github", - "repo": "rudolfolah/angularjs-mode", + "repo": "emacsattic/angular-mode", "unstable": { "version": [ 20200510, 1729 ], "commit": "b24020768217f16b1b86aa236e9729b3d40e17b3", - "error": [ - "exited abnormally with code 1\n", - "", - "error: unable to download 'https://github.com/rudolfolah/angularjs-mode/archive/b24020768217f16b1b86aa236e9729b3d40e17b3.tar.gz': HTTP error 404\n" - ] + "sha256": "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377" }, "stable": { "version": [ @@ -2877,8 +2897,8 @@ "repo": "davidshepherd7/anki-mode", "unstable": { "version": [ - 20200413, - 1019 + 20200703, + 736 ], "deps": [ "dash", @@ -2886,8 +2906,8 @@ "request", "s" ], - "commit": "fcbcfa7cd7fb5c282e1138322e61242942729e3d", - "sha256": "06ab3zdaz5wf30zbci7cav3dvvnknnbzq18zfzzfi4xjcsi0zkvr" + "commit": "3918e4f7b2f14e485cc3acc927abe6563695963f", + "sha256": "16fx2w1nz6jxsrc9naykah3valab46xnwsmjz5lm9zl38g4ypyna" }, "stable": { "version": [ @@ -2962,20 +2982,20 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20200330, - 1640 + 20200812, + 1439 ], - "commit": "f0a71bb14806c79f09cb6aacb5ef98a852ef66e2", - "sha256": "1v2rbrhqg4kipk4l901xzfdc4wm5fkvvx4j3l8mfp7nvc2x8gcbw" + "commit": "2bf7a7c1acb6768a590954c9bfef5f72ae8cc452", + "sha256": "05zwfflsx69904jxlayalh3n3n9msl92zw2rk5kk17p9psjpv9yw" }, "stable": { "version": [ 0, - 4, - 7 + 7, + 0 ], - "commit": "e6af7f8ef7d241fdc9f866d57dce24beb4bb6b87", - "sha256": "19a419rnqqsmvrcl2vwy3gl7mvbfg669vyin2h2xpm56rxsinvy1" + "commit": "99c45f553e7caef693506498d11e4b664b6f2946", + "sha256": "154655p54xxsbr06lbbdpzzx4hif6542a4cf767qnichsz9cj75j" } }, { @@ -3028,15 +3048,16 @@ "repo": "rejeep/ansi.el", "unstable": { "version": [ - 20150703, - 826 + 20200611, + 944 ], "deps": [ + "cl-lib", "dash", "s" ], - "commit": "12b4c5d91b3da1902838f421e5af6d40e2cd57dd", - "sha256": "19k71dj83kvc8mks6zhl45vsrsb61via53dqxjv9bny1ybh2av85" + "commit": "a41d5cc719297515d85bb5256980cd1204a71b88", + "sha256": "051v8dmji90chwbsyqsqry7h35mksal2j6rgw1kpmjsni86d79y1" }, "stable": { "version": [ @@ -3060,28 +3081,28 @@ "repo": "k1LoW/emacs-ansible", "unstable": { "version": [ - 20191003, - 1430 + 20200704, + 1354 ], "deps": [ "f", "s" ], - "commit": "c6532e52161a381ed3dddfeaa7c92ae636d3f052", - "sha256": "16i0r019lj9fdkxcga2jb8ha0r2lf1mz7jywg44hnj7r3lzdcmwp" + "commit": "b5ef59406604bc5027f4d816d90e633feef0149c", + "sha256": "1v56mz39vlszprd6m6virbv87qvsnb38n0h0yhqzcy85c2l0jzx3" }, "stable": { "version": [ 0, 3, - 0 + 1 ], "deps": [ "f", "s" ], - "commit": "c6532e52161a381ed3dddfeaa7c92ae636d3f052", - "sha256": "16i0r019lj9fdkxcga2jb8ha0r2lf1mz7jywg44hnj7r3lzdcmwp" + "commit": "b5ef59406604bc5027f4d816d90e633feef0149c", + "sha256": "1v56mz39vlszprd6m6virbv87qvsnb38n0h0yhqzcy85c2l0jzx3" } }, { @@ -3576,6 +3597,21 @@ "sha256": "11ssqaax4jl7r3z5agzmc74sjsfvl0m3xvp015ncqzpzysla47g3" } }, + { + "ename": "arduino-cli-mode", + "commit": "613b2f82b1fd035e725e574c750da408e8386cde", + "sha256": "1h49bfn4gn1h2xdb6axhbg6wm74h4fmiylcm55lwg9ri57rcdqkl", + "fetcher": "github", + "repo": "motform/arduino-cli-mode", + "unstable": { + "version": [ + 20200812, + 935 + ], + "commit": "80c5aa6a29a192f9a9d3ba3d7fb7446b1281051a", + "sha256": "1bj4vlvryk2k3920zc9pg9jca9385hji76nrx7avhd6jsjjm79mf" + } + }, { "ename": "arduino-mode", "commit": "2db785f52c2facc55459e945ccb4d4b088506747", @@ -3584,15 +3620,15 @@ "repo": "stardiviner/arduino-mode", "unstable": { "version": [ - 20180509, - 36 + 20200819, + 103 ], "deps": [ "cl-lib", "spinner" ], - "commit": "23ae47c9f28f559e70b790b471f20310e163a39b", - "sha256": "08vnbz9gpah1l93fzfd87aawrhcnh2v1kyfxgsn88pdwg8awz8rx" + "commit": "16955f579c5caca223c0ba825075e3573dcf2288", + "sha256": "1vf3ahvs81i0fa3rbwz3i67ahf3x169pv879p5igxk93xf6whqnp" } }, { @@ -3826,11 +3862,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20200113, - 1745 + 20200809, + 501 ], - "commit": "86aef2c38e7d35e8509b7feeee3e989d825eba91", - "sha256": "1slxlpxjggyg5q8xppn9csh54j93b2hc4v8lcn85ymw2hp3rsib9" + "commit": "36a10151e70e956e2f766ed9e65f4a9cfc8479b2", + "sha256": "08glbksm13kgxvy17x0kg01x9cgnkz01yqqnlwzfaan0zbf6brdl" }, "stable": { "version": [ @@ -3905,6 +3941,30 @@ "sha256": "1pvnwzp0i1s19cyyzrkcannhx1jizvylxsr7qcipfiy2kmf8sbhz" } }, + { + "ename": "atl-markup", + "commit": "42025212ccfe998023f7eb563588be76282d53de", + "sha256": "1123lbnc6hlycm6bg5f7292z7cdnp2iv0wb8mg0n0ydma524s6bm", + "fetcher": "github", + "repo": "jcs-elpa/atl-markup", + "unstable": { + "version": [ + 20200810, + 845 + ], + "commit": "79adac0149bb6083ad3a327c6bbdf56537282ee9", + "sha256": "1kd9fk1f3aaw0ikkbf9n6w5b2sy7v0xzsch688h8ac9rp6s2yws8" + }, + "stable": { + "version": [ + 0, + 1, + 5 + ], + "commit": "876d8a31d5e233d5234231f1428f8edb013e30eb", + "sha256": "1czqi0l1jzhlb47n0grlrnx421wi9mdqb41abcfd33k4mjavv0iz" + } + }, { "ename": "atom-dark-theme", "commit": "d1f565871559d6ea4ca4bb2fbaebce58f2f383eb", @@ -4019,14 +4079,14 @@ "repo": "tsuu32/auctex-cluttex", "unstable": { "version": [ - 20200311, - 1453 + 20200531, + 402 ], "deps": [ "auctex" ], - "commit": "76fba4a1a918ce8a276fa0e22f026ad9a45a47dc", - "sha256": "1rd92s2c08z3l2r2wxcs46bbri4rj0d0aym36v89pwq0fcqqx2ry" + "commit": "7e36dcb88c0021e48e7a095257e63e2913f75789", + "sha256": "1wfsd7kcjm8inbhacsilngjqcwfn5alr02m4bcpv5w8gjyc0qwgx" }, "stable": { "version": [ @@ -4192,11 +4252,11 @@ "repo": "ccrusius/auth-source-xoauth2", "unstable": { "version": [ - 20200509, - 2304 + 20200817, + 1604 ], - "commit": "5e646a32c9ba31a015a09fce1ad711b85717119a", - "sha256": "0nl859csl8xcd6ybpjj15ph8l8fxwkwf45kbylss68alkyf1rl3v" + "commit": "b0386d4a12a88c5635b26eaa4c9e355fc84fb3f6", + "sha256": "11i184s36ddxs06d8gq15nd0q59im8vfqnww3mvy35q12y6r8gpq" }, "stable": { "version": [ @@ -4286,8 +4346,8 @@ "cl-lib", "popup" ], - "commit": "2f11a4e6ff7f5d4939c3e1724158411a7efed057", - "sha256": "067ymm5swi9yq3sndzghqxlyyywzk434ip68nf6fxbj51raxzzq8" + "commit": "c0836fa0662095071e3c40237db611063e3c3ceb", + "sha256": "1269k2q1hv1yixn7w32ani7g0zspiiwfmbywxi8lvh9hj0asbrsc" }, "stable": { "version": [ @@ -4532,10 +4592,10 @@ }, { "ename": "auto-complete-sage", - "commit": "f1cd78dcd58d559c47873f8fcfcab089a8493dd6", - "sha256": "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0ic60b9jnzgidpwxriwamicimyqa8y4hqfbkxmwcrp0snk4nf4hn", "fetcher": "github", - "repo": "stakemori/auto-complete-sage", + "repo": "sagemath/auto-complete-sage", "unstable": { "version": [ 20160514, @@ -4593,11 +4653,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20200516, - 1608 + 20200801, + 2029 ], - "commit": "f712de72d4618ce6c5d55ba20c848c83a87c5f32", - "sha256": "17dsdfs9l3g4jnna5b2pzifvxv13rr5rja76frl5wwp2brfmq8qv" + "commit": "cad370fb6c9fc7186c2af221932e097af5900a2d", + "sha256": "0hjxadi8245zwwsp0kdz0c6i1j25drbky5cvksdnc8xw2l91kpbs" } }, { @@ -4729,14 +4789,14 @@ "repo": "zonuexe/auto-read-only.el", "unstable": { "version": [ - 20170306, - 443 + 20200726, + 1356 ], "deps": [ "cl-lib" ], - "commit": "79654f8fc024f383ae7af05487c1345738236500", - "sha256": "123822s9xkzw25swn1h1szxmmajnn9rq85vasygvy5cn2l6lar3l" + "commit": "a6c493c5279d484c00ce7fe75dfd2e60101b97db", + "sha256": "0wg6pl69k1hy69hgsqry5zahycr1n13avjfrw7g3sva71rqzkzrn" } }, { @@ -4747,20 +4807,20 @@ "repo": "jcs-elpa/auto-rename-tag", "unstable": { "version": [ - 20190525, - 628 + 20200717, + 814 ], - "commit": "27ca700cb2f61a1040013600c5744d68a27cbd8d", - "sha256": "1hydigzi82zana6ivcj4nxqvdnh3973594ag6zlgw9nijilih64r" + "commit": "7227c93e58a2c1837aa35ca35b6325c6f734d0f9", + "sha256": "1q029xy4ssb6lvd199yl1p63ir142q9waw31v2zagxlyn9rs9qx9" }, "stable": { "version": [ 0, - 0, - 2 + 2, + 9 ], - "commit": "4bd41b3107d3971c9533f9d0c8718c299669cb78", - "sha256": "1g6kllnl625h6vmnps15a7ivpxq3k6s4vdxj50dj2i76g19wi2cn" + "commit": "7227c93e58a2c1837aa35ca35b6325c6f734d0f9", + "sha256": "1q029xy4ssb6lvd199yl1p63ir142q9waw31v2zagxlyn9rs9qx9" } }, { @@ -4778,24 +4838,6 @@ "sha256": "0ckjijjpqpbv9yrqfnl3x9hcdwwdgvm5r2vyx1a9nk4d3i0hd9i5" } }, - { - "ename": "auto-scroll-mode", - "commit": "195041c70d2807184d4d8c711bcd3f54b8dfc73a", - "sha256": "1hvnhszn1cqzw42wn7w0hrq7wn161alg2w6xpd53ydg61g31i68n", - "fetcher": "github", - "repo": "stardiviner/auto-scroll-mode", - "unstable": { - "version": [ - 20200316, - 134 - ], - "deps": [ - "cl-lib" - ], - "commit": "a23669a8747e71ca5b1003b923f7a3d3834740e3", - "sha256": "033msm39fdhm6iqd7khjsqvxrv4314h8klsq3g06zsrgpmjki1xr" - } - }, { "ename": "auto-shell-command", "commit": "ea710bfa77fee7c2688eea8258ca9d2105d1896e", @@ -4866,16 +4908,16 @@ "repo": "marcwebbie/auto-virtualenv", "unstable": { "version": [ - 20170125, - 1917 + 20200729, + 2204 ], "deps": [ "cl-lib", "pyvenv", "s" ], - "commit": "3826db66b417788e2b2eb138717255b1f52a55c3", - "sha256": "12691m4z0zr3prmdhmjlpcx0ajj1ddrbj9gy827xmgr0vaqbr7b2" + "commit": "214604ebd3366078d03814a344c3249268d1f15a", + "sha256": "14waa4v6nr0ybyncgfjg96r43ma4lw57iyma0chvpqifmbs6ski0" } }, { @@ -4955,14 +4997,14 @@ "repo": "erjoalgo/autobuild", "unstable": { "version": [ - 20200209, - 2005 + 20200713, + 227 ], "deps": [ "cl-lib" ], - "commit": "9e7a101e1563eaf6f5d671e5877d652079cea78b", - "sha256": "0khhmhh5fv004xhs3v8v8y3m8i1ibi19w74sv4shpy0ixd5zq1bj" + "commit": "6c10b13c285cc4180dc64c1f89ead264e6786f53", + "sha256": "02zjfv5365misiivjgjwwrp6bly7z81vnndkyrn6xzv88d2l2byv" } }, { @@ -5026,21 +5068,6 @@ "sha256": "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85" } }, - { - "ename": "automargin", - "commit": "0937e63ec686cc3e183bddb029a514c64934fc81", - "sha256": "0llqz01wmacc0f8j3h7r0j57vkmzksl9vj1h0igfxzpm347mm9q8", - "fetcher": "github", - "repo": "zk-phi/automargin", - "unstable": { - "version": [ - 20131112, - 814 - ], - "commit": "4901d969ad69f5244e6300baab4ba04efed800c3", - "sha256": "02nnyncfh6g0xizy7wa8721ahpnwk451kngd6n0y0249f50p3962" - } - }, { "ename": "autopair", "commit": "4150455d424326667390f72f6edd22b274d9fa01", @@ -5082,8 +5109,8 @@ 20190331, 2230 ], - "commit": "bcd3d76a47b4f0e7c382fb680b14f40208dae568", - "sha256": "0sgzjddd34icbbm4pc7v1662k6288pkr70ki4p2j3q4mh9qqc8q7" + "commit": "fc9ec563430e3beaefc00b26da179f4b4ca9855b", + "sha256": "1m4v56yy73gvycsvpc36h7yh6yhn3fgp90rk5m248hz89gjf9kxv" } }, { @@ -5189,14 +5216,14 @@ "repo": "abo-abo/avy", "unstable": { "version": [ - 20200422, - 1153 + 20200624, + 1148 ], "deps": [ "cl-lib" ], - "commit": "509471bad0e8094b8639729ec39ca141fae7d4bd", - "sha256": "0kj4nbp8g22xyvjdy8vh54v6zgd4f3z6srrw5pd55gbczm5csnbj" + "commit": "bbf1e7339eba06784dfe86643bb0fbddf5bb0342", + "sha256": "0jmjjckrmivfy2r527vynq9x0mzwcgcyclydar9fa2xb1wn669pd" }, "stable": { "version": [ @@ -5245,8 +5272,8 @@ "deps": [ "avy" ], - "commit": "aee6878a8c2f18c3ac3bd34d608783b52cd708e0", - "sha256": "1526a6cqaa16x5gi2fsdi9brqa54n3m0dvrnkd85w6sgaz33cpiz" + "commit": "970204989bcd4a4f8223c2fe980a08dc58441045", + "sha256": "196pwh83p0yrnagpiig8h2mq9xxm7wk9q8x832ffwizip4yni80b" }, "stable": { "version": [ @@ -5390,6 +5417,21 @@ "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6" } }, + { + "ename": "ayu-theme", + "commit": "22bdc35d5c432c5d58d751c0fc3f2e5d0fafe583", + "sha256": "1ygg6dwzg0kjxxd8c6w5j174jcjkc7f4hljgd70vkh4k7817kxj8", + "fetcher": "github", + "repo": "vutran1710/Ayu-Theme-Emacs", + "unstable": { + "version": [ + 20200521, + 1157 + ], + "commit": "ed98a9f41d9f0e08458ee71cc1038f66c50e1979", + "sha256": "1qdw9pq1daydky0b94x248q27sjzaxpfw9d027xk6ygi9hksvcsk" + } + }, { "ename": "babel", "commit": "b0d748fa06b3cbe336cb01a7e3ed7b0421d885cc", @@ -5475,11 +5517,11 @@ "repo": "mschuldt/backlight.el", "unstable": { "version": [ - 20190905, - 519 + 20200813, + 1839 ], - "commit": "3e5b971b4ee89299240a89614db92d2c4034e954", - "sha256": "0hsb1vd1mk4mcgr4l93b81hz2bq7cpd7b3kdhabv9z489mxiy3fa" + "commit": "38fcb9256c3bf7300a41332fa7f9feffc4e2db9a", + "sha256": "0982il82v10yclm87b06ghwv4cglw03ia0zs4m838ag6zg8a08jg" } }, { @@ -5633,20 +5675,20 @@ "url": "https://git.sr.ht/~zge/bang", "unstable": { "version": [ - 20200510, - 1107 + 20200811, + 1008 ], - "commit": "f80c7c394b57057499db6409f386ade9ac32f763", - "sha256": "0mj2kr13gpvy4kpzxvy1jmz0c9cdnikazlsb9j0dx94f9777sy04" + "commit": "e02338331463461a85144c0ce6b9b877bd3a7567", + "sha256": "1rvgmkl950zrakczk9libws29c9l2hklw49m3xb4swa14kz1r639" }, "stable": { "version": [ 1, 0, - 2 + 3 ], - "commit": "1fb0162ffd2115080d4e1ddf65935277cf3c75db", - "sha256": "12nr5la6y5dnh46rfij3p1srgpwdc3fiaf4ckfx6f9kl0n1zyrls" + "commit": "e02338331463461a85144c0ce6b9b877bd3a7567", + "sha256": "1rvgmkl950zrakczk9libws29c9l2hklw49m3xb4swa14kz1r639" } }, { @@ -5674,10 +5716,10 @@ }, { "ename": "bap-mode", - "commit": "05b1b5885a9d5e3bda38bc8a2f987bffd9353cc0", - "sha256": "1n0sv6d6vnv40iks18vws16psbv83v401pdd8w2d2cfhhsmmi4ii", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0w82dzhahp9zc1dhkfwc77irpqbq0fdp14cjfkk3g5cmvyzz5s1a", "fetcher": "github", - "repo": "fkie-cad/bap-mode", + "repo": "BinaryAnalysisPlatform/bap-mode", "unstable": { "version": [ 20200128, @@ -5748,20 +5790,20 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20191126, - 1824 + 20200806, + 1743 ], - "commit": "96ce14af9674f3e605bacca87abc0c23b8f13cd5", - "sha256": "1w3yvpcdjq9a6m2q2lz23dib2ijmfgn4w2z2g5y9wkpdmx48k655" + "commit": "d47edb9d4142a22746009c1f680df93a4fefd107", + "sha256": "11j2k3irixp47r2iglxdmjphahqhgnxg98n2xwagwzyq99lsamj4" }, "stable": { "version": [ - 2, + 3, 1, 0 ], - "commit": "6aedd690006e07199b2fcd319b9b840a527650e5", - "sha256": "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0" + "commit": "d47edb9d4142a22746009c1f680df93a4fefd107", + "sha256": "11j2k3irixp47r2iglxdmjphahqhgnxg98n2xwagwzyq99lsamj4" } }, { @@ -5902,11 +5944,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20200515, - 1408 + 20200627, + 1625 ], - "commit": "39d4649f4a179e22fabbef1166afe1725c8dbea6", - "sha256": "0n5kqjcmwfbr58my3yisgfigh77rhy5b18jr4kh2b327r76ssqwl" + "commit": "2cf143b616df3de4b199538341d674c58386719e", + "sha256": "1p9pxxdx39jmf8sav660ps6mqwbsgcl4v1i9xb8xsd5qdxmwjqli" }, "stable": { "version": [ @@ -6118,21 +6160,6 @@ "sha256": "0q0i1j8ljfd61rk6d5fys7wvdbym9pz5nhwyfvmm0ijmy19d1ppz" } }, - { - "ename": "bdo", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1n2kpaps6992nxl0v1003czcbw1k4xq906an56694wkh05az505j", - "fetcher": "github", - "repo": "chrisdone/bdo", - "unstable": { - "version": [ - 20140126, - 901 - ], - "commit": "c96cb6aa9e97fa3491185c50dee0f77a13241010", - "sha256": "0d5b7zyl2vg621w1ll2lw3kjz5hx6lqxc0jivh0i449gckk5pzkm" - } - }, { "ename": "beacon", "commit": "d09cfab21be800831644218e9c8c4433087951c0", @@ -6171,14 +6198,14 @@ "repo": "Sodaware/beeminder.el", "unstable": { "version": [ - 20180413, - 1929 + 20200610, + 2311 ], "deps": [ "org" ], - "commit": "3fcee7a7003a37171ddb59171c7f4b5dd4b34349", - "sha256": "0phiyv4n5y052fgxngl3yy74akb378sr6manx21s360gnxzcblwd" + "commit": "8f86ae34ebd17324d98146a2b3a532d56dd1cdd0", + "sha256": "0jw62l1nnnnz4gr7jrk10jlf8ayjngyx9wm97fd339spiygld5pr" }, "stable": { "version": [ @@ -6201,11 +6228,11 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20200415, - 1752 + 20200526, + 2005 ], - "commit": "bb51f7ee9229ff0b6ec5ba4a730f7360246fb9ea", - "sha256": "0l7lbmn6ljh8yv7ch2fax47mr7kxly5b5ps5vg61ra15nv8v5vfr" + "commit": "9c7a92779d75f6fd985cf707ff5241bc98ccea6c", + "sha256": "1r9033zlx2q2dk3bjz004flxdiw79qiswq0zqdjnlzwassvk0f35" }, "stable": { "version": [ @@ -6257,10 +6284,10 @@ }, { "ename": "benchstat", - "commit": "d9180fbedf95f9b1f5810bbf4929dfee513f89e3", - "sha256": "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1pcwgvln6dhyqk52021hqs5gpgnj1a07ddbb7xs1qclgyyk72y85", "fetcher": "github", - "repo": "Quasilyte/benchstat.el", + "repo": "quasilyte/benchstat.el", "unstable": { "version": [ 20171014, @@ -6364,11 +6391,11 @@ "repo": "technomancy/better-defaults", "unstable": { "version": [ - 20200209, - 1717 + 20200717, + 2012 ], - "commit": "fc9a03138c959f0d24301c6401f800eb6e7d3af9", - "sha256": "1hi1xxc99z0pkbj8w63fx3qsy4sq5b3gdc2ccyk0gnbzw2sfc93j" + "commit": "293237a22a4f24171dd9910d6517a0eccf526fdf", + "sha256": "0f3alik361d81kdwpigcgkj9rxww23prqfhjfdh97fnycp3r1nyb" }, "stable": { "version": [ @@ -6442,14 +6469,14 @@ "repo": "zk-phi/bfbuilder", "unstable": { "version": [ - 20150924, - 1650 + 20200816, + 519 ], "deps": [ "cl-lib" ], - "commit": "49560bdef131fa5672dab660e0c62376dbdcd906", - "sha256": "1y9fxs1nbf0xsn8mw45m9ghmji3h64wdbfnyr1npmf5fb27rmd17" + "commit": "00cbf1010dc3fee5a0b8e7c0e0b6041bb6251bdf", + "sha256": "1n1aq3kwsjc3hlgas73bs22pvrn69hfba1wcbqs2j28j2j9j00b2" } }, { @@ -6680,20 +6707,20 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20200429, - 1021 + 20200723, + 2222 ], - "commit": "1bd8836171cf8da0be836fc407f2f140f52bdeb1", - "sha256": "0zd8ls2qyxgdzkmhl7mxlh7wbkp627kync8zg95kvrh3qymf5vys" + "commit": "799969a66192b27c6464fc2e0025f4089d70493b", + "sha256": "13179nlhjkdsgpjp2lbx8fqx76ka79hjkhip6im6afv9icr3j3ba" }, "stable": { "version": [ 0, - 3, - 1 + 4, + 2 ], - "commit": "91d9f946690df0a1ed866f2cd1eab1b2e7c7480a", - "sha256": "0pkn99srwyvyibz5zxkh58csbf598x26f31mpizacx3bs4nys0qb" + "commit": "799969a66192b27c6464fc2e0025f4089d70493b", + "sha256": "13179nlhjkdsgpjp2lbx8fqx76ka79hjkhip6im6afv9icr3j3ba" } }, { @@ -6764,8 +6791,8 @@ "bind-key", "key-chord" ], - "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", - "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" + "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1", + "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip" }, "stable": { "version": [ @@ -6788,11 +6815,11 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20191110, - 416 + 20200805, + 1727 ], - "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", - "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" + "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1", + "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip" }, "stable": { "version": [ @@ -6993,11 +7020,11 @@ "repo": "pythonic-emacs/blacken", "unstable": { "version": [ - 20191123, - 1547 + 20200626, + 2018 ], - "commit": "a09f8e2564739792a1b86bc8a6ce41039db3bbf8", - "sha256": "0cs9nmi30dknrw6p2xvx9np1zmzpsn3bs93lhfiqy2a4ylf96brl" + "commit": "784da60033fe3743336d1da0f33239f1bf514266", + "sha256": "1s7isvih1xl4l6say8xa69r9lf3prq9sd6d9fmn1n8g8p3w09cnq" } }, { @@ -7276,26 +7303,26 @@ "repo": "kyleam/bog", "unstable": { "version": [ - 20180815, - 2213 + 20200720, + 244 ], "deps": [ "cl-lib" ], - "commit": "6c8fa1b4961e279ae63130902996c5f71a2e64e4", - "sha256": "0kph9898s2m086p8gj97bbzr7mba9y7hmyxh1z4mgpv5808zvd05" + "commit": "14241d308d15410bfaafcf607a8a4a7ff3d7254c", + "sha256": "1k9ww9in54v0bmw8l6azx67wbb18r2q6fdwl1j931gaz9pngk3k0" }, "stable": { "version": [ 1, 3, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "6ed4d3edbe771e586d873b826330f3ef23aa1611", - "sha256": "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j" + "commit": "14241d308d15410bfaafcf607a8a4a7ff3d7254c", + "sha256": "1k9ww9in54v0bmw8l6azx67wbb18r2q6fdwl1j931gaz9pngk3k0" } }, { @@ -7444,15 +7471,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20200513, - 1954 + 20200805, + 1131 ], "deps": [ "epkg", "magit" ], - "commit": "f6a2e0cb8c3db5840c717114caba93793f2e9661", - "sha256": "1sa0wk7xj3qsk9fr4z2av80gp8n0804zylx3d27pdwm8bjyfzf7b" + "commit": "1fe1d2b7a574dd560740a55d87d9a5fb3a989dbc", + "sha256": "19rxqh6qagznsm5hqal65cv03k9gg1cfvb0j5saaqfc4nxkhkv7v" }, "stable": { "version": [ @@ -7507,25 +7534,25 @@ "repo": "davep/boxquote.el", "unstable": { "version": [ - 20170802, - 1117 + 20200727, + 1203 ], "deps": [ "cl-lib" ], - "commit": "7e47e0e2853bc1215739b2e28f260e9eed93b2c5", - "sha256": "1aqhg24gajvllbqxb0zxrnx6sddas37k2ldfinqyszd856sjhsg3" + "commit": "bdc6c84b9274b228dbc383a14abf9694157e869c", + "sha256": "0wwjawgylaaifdsszqxcfsyhfzgxbjkzqhzrnxnr9b16wghb7xf7" }, "stable": { "version": [ 2, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883", - "sha256": "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm" + "commit": "bdc6c84b9274b228dbc383a14abf9694157e869c", + "sha256": "0wwjawgylaaifdsszqxcfsyhfzgxbjkzqhzrnxnr9b16wghb7xf7" } }, { @@ -7638,14 +7665,25 @@ "url": "https://bitbucket.org/MikeWoolley/brf-mode", "unstable": { "version": [ - 20200329, - 1531 + 20200811, + 1622 ], "deps": [ "fringe-helper" ], - "commit": "f1ae0c5eb74f62af109ebaf18e8663d6f51270cb", - "sha256": "1pzxz5irx6ysa8nhl9x50v8l5r2cvd6pafj71q4i5lrxv9a1dkl1" + "commit": "4e12ec16d6b896402f8bcdc1cd468d4064a2df6f", + "sha256": "1pdrpvff6hvhjv512z1vkivd848ar5li4p63jnbvl90hp7kpy7c3" + }, + "stable": { + "version": [ + 1, + 19 + ], + "deps": [ + "fringe-helper" + ], + "commit": "0024b1a276c43fde0d85011b51b5aaf1f201da64", + "sha256": "1nnhb0vyx5f3f7h2fsg2p7656kcsk7ahrndxrhs7a77svnr426lb" } }, { @@ -8098,20 +8136,20 @@ "repo": "jcs-elpa/buffer-wrap", "unstable": { "version": [ - 20200223, - 605 + 20200724, + 906 ], - "commit": "460f90bc024b6c287ed8afac3ff1bed2a147c777", - "sha256": "07r50iiiyhbqbia9c8c3kz1hvqjs6dkb8rkqpq4yyv3vd1kc9qnb" + "commit": "ef0fcb38b23246cfea1721570acc266764cef0a4", + "sha256": "029vq5hfknp5l8b9lmxw4hskq9bmv56kqysdfka0636hp7bvc63p" }, "stable": { "version": [ 0, 1, - 1 + 3 ], - "commit": "813a3dab3007a34fa27cf0a1ae687dc0eae98240", - "sha256": "0m2ryic16083ab0x6qwfrxrpsgq84s518vn0cbfcxycblpdh89al" + "commit": "c24eb1f251baecfb0bbfa750904e6b15cc977a6c", + "sha256": "1bzr5bf4rm1wm0xdhhdprlv7z60ijwrp1lq9h572iw6giyl0hgc3" } }, { @@ -8452,19 +8490,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20200509, - 2224 + 20200817, + 2001 ], - "commit": "e71a40f1ffef4847df28c9d4ad7edc1e360ee52a", - "sha256": "0avmxbxxsazd14h5avsrqh2yyfnp8jan64sbp5ih2c9hm7xv5p1k" + "commit": "0e5eae0766a33b5c8997e1477e3914d5c8ba3d29", + "sha256": "0qn3i26g119h14jv9q0vha55s4g154djp3f68d2g7i0f46wm54hz" }, "stable": { "version": [ 1, - 21 + 23 ], - "commit": "0dbd474460e4c314bf8bc6e4d3dec647081538c9", - "sha256": "1ra5r56k539q6l98msxdn4vfd7k6jm00g8cdhs6hpwvb1blj8di2" + "commit": "a9647cbb566eb488b7bbde44c4cdaf51b7915851", + "sha256": "0ym1hajy47n5f1rxic8qfxrwd8zc1r7csz1v4hrwhwm4qld4krfr" } }, { @@ -8909,6 +8947,42 @@ "sha256": "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa" } }, + { + "ename": "calibredb", + "commit": "774ebbd69372ffba6fd16107762957b8ea3713a5", + "sha256": "1bdkxzs18c8krw28vfnzirx0pq13yf8pgkmjy8ks5j8zbih4dhqm", + "fetcher": "github", + "repo": "chenyanming/calibredb.el", + "unstable": { + "version": [ + 20200809, + 1128 + ], + "deps": [ + "dash", + "org", + "s", + "transient" + ], + "commit": "a53d3c3d87fb7cd756f73fcd813aca0480ada5f7", + "sha256": "11m9d015fnjf89qg6wpy0vs1vhvak5q753m4dzqrdw3jgm9zsnmv" + }, + "stable": { + "version": [ + 2, + 5, + 0 + ], + "deps": [ + "dash", + "org", + "s", + "transient" + ], + "commit": "a53d3c3d87fb7cd756f73fcd813aca0480ada5f7", + "sha256": "11m9d015fnjf89qg6wpy0vs1vhvak5q753m4dzqrdw3jgm9zsnmv" + } + }, { "ename": "call-graph", "commit": "a6acf099e2510c82b4b03e2f35051afc3d28af45", @@ -9013,11 +9087,7 @@ 1 ], "commit": "9803cf37ac52bbfa5130fde0f228dc51c4590c2d", - "error": [ - "exited abnormally with code 1\n", - "", - "error: unable to download 'https://github.com/ocaml/caml-mode/archive/9803cf37ac52bbfa5130fde0f228dc51c4590c2d.tar.gz': HTTP error 404\n" - ] + "sha256": "13gz0s7bnjsnab7wn8mk0zva7756hf68izqp9agd8vqnm0c75nlp" } }, { @@ -9028,16 +9098,16 @@ "repo": "kisaragi-hiu/cangjie.el", "unstable": { "version": [ - 20190929, - 1221 + 20200808, + 828 ], "deps": [ "dash", "f", "s" ], - "commit": "0a703f4d1162259d77bfb3f862d13c1b1f11a711", - "sha256": "19f7xzc1204zdv8bbd5vfzxqrinhk8m9mw911dc77jab2in22348" + "commit": "0cbf706890df06b9e0d541692c579ed213da8252", + "sha256": "0a3mwgbza09rfiswmk4kh699mqc5746k16jc6rgy9q24jbjgradf" }, "stable": { "version": [ @@ -9149,8 +9219,8 @@ "dash", "s" ], - "commit": "92a31f6a7cae0b4e2af106cd6f2b0abe6c2d8921", - "sha256": "1cp9i69npvyn72fqv0w8q1hlkcawkhbah4jblc341ycxwxb48mkl" + "commit": "75ddb9c64eeb78b46d9e1db99bef8d0fb1e46b99", + "sha256": "06briiapv2pfll8zc0wl55sad8cjgxkb8j8d4bvc8w5li3d52xa9" }, "stable": { "version": [ @@ -9175,8 +9245,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20191004, - 1155 + 20200814, + 913 ], "deps": [ "ansi", @@ -9188,8 +9258,8 @@ "s", "shut-up" ], - "commit": "a4715f7c6c9797639c3636399cb21c2b0332b354", - "sha256": "1zjz3mp8hgnsfyapq7qdfysj31g9f6syvrik2w057r3w3bxp8vkf" + "commit": "c69822a1a3168d43caebb7afaa13249429419ae0", + "sha256": "0w7q16y2r54rann07lk4gwi7jkqnb5xc8cbjnx2avgpsk7kawi8w" }, "stable": { "version": [ @@ -9368,11 +9438,11 @@ "repo": "xuchunyang/cc-cedict.el", "unstable": { "version": [ - 20181217, - 1112 + 20200705, + 443 ], - "commit": "0dd9bcd5337c8f16fc9c8d27daba4a9362695c99", - "sha256": "16qp0r413lqrym2xh2vpx0hg295g8mr428fg6q07w1hnzz10dpc2" + "commit": "6bb9481e48b889503626b4e3cb7cfec8d14cbf4b", + "sha256": "0nxq8p7hafpl1xq9daf5lcyk8ragdgnwsfxxd2d0rnzmyflgw5wi" } }, { @@ -9386,8 +9456,8 @@ 20200314, 1557 ], - "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", - "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" + "commit": "275a831be77573470309a78967734d2b6d10f218", + "sha256": "1a25aybavi6p7ijc4rbd8zyzgiim1m2xwm7yqfmsvrfzwgb29xal" } }, { @@ -9398,16 +9468,15 @@ "repo": "MaskRay/emacs-ccls", "unstable": { "version": [ - 20200327, - 1915 + 20200819, + 106 ], "deps": [ "dash", - "lsp-mode", - "projectile" + "lsp-mode" ], - "commit": "17ec7bb4cf362b7268c24e070e841f0dfac1c919", - "sha256": "08pndwbw6wcpysnvhkqfvrw91ac0np31swiq0yv3dr2x0sq70cp5" + "commit": "44f1fb38786cb6159e03e930876239a215d3feee", + "sha256": "0adw1gfp8a6cfyh7s1bchdpak7z32jlnliq35ynhakwwx3ixzmfv" } }, { @@ -9433,11 +9502,11 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20200314, - 1557 + 20200803, + 2138 ], - "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", - "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" + "commit": "275a831be77573470309a78967734d2b6d10f218", + "sha256": "1a25aybavi6p7ijc4rbd8zyzgiim1m2xwm7yqfmsvrfzwgb29xal" } }, { @@ -9507,11 +9576,11 @@ "repo": "zk-phi/cedit", "unstable": { "version": [ - 20141231, - 1614 + 20200816, + 526 ], - "commit": "0878d851b6307c162bfbddd2bb02789e5e27bc2c", - "sha256": "1f8gdj3p54q3410c66716y3l7i7nnkmq6hqz0dg1a1sc6jwdij3v" + "commit": "cb38316903e6cfa8b8c978defa7e1dafcd4e0c12", + "sha256": "1m5n0rwh97g3vl4x0akclgc8flh9vpdavp82q3i1yraigvzqzfc9" } }, { @@ -9571,15 +9640,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20200511, - 1242 + 20200722, + 27 ], "deps": [ "cl-lib", "powerline" ], - "commit": "57afd81c7fd6449239af7adcda4cd2192976dbb8", - "sha256": "1sa4anfqvhidn7kxqnchk0d8kc2v0l3cxbf0bnwwx7nk04gjvshg" + "commit": "7e0332b138f836b9d0b6d2134310f53369598cfd", + "sha256": "1fjs1l79wsyiyi4nrdkxg2hhfkngm7g0zpdq5ca3c1zi4fsv084i" }, "stable": { "version": [ @@ -9706,17 +9775,17 @@ 20171115, 2108 ], - "commit": "dc0e180cbaf73e86d22f1d2996c7582dd0eb07b5", - "sha256": "0n9f87syrj30dn5k4vq1l7i02hzwfnadanfjbwv4a9wfjl77xy53" + "commit": "ec47889f4bef53c6c5a15add60d34c44c6ef1634", + "sha256": "16lndmhm0ad23g0pa4rl7dyrwmdv22xmscnpqnd49sg88356fyd2" }, "stable": { "version": [ 3, - 15, - 1 + 16, + 0 ], - "commit": "e766ee2484f9a7609688ac1832ff2ca7528624c5", - "sha256": "18iv6s2g7gz2dmqhipn6ln6g4qngywcj7fm4gqwrph04bx5dfqac" + "commit": "ee2c1fd898a8219e81fea4f753648070e50ebc2e", + "sha256": "1jcvh67kxx5isqb78zjbca51px21cyjcwy1cbfkx47y1rmgsqzaw" } }, { @@ -9866,17 +9935,20 @@ }, { "ename": "chapel-mode", - "commit": "ff32db72ad55a7191b5105192480e17535c7edde", - "sha256": "0hmnsv8xf85fc4jqkaqz5j3sf56hgib4jp530vvyc2dl2sps6vzz", + "commit": "f84c693e9e90069b028be6149dd730f2ba5f4aff", + "sha256": "0yi1xjm1myxywjdb3n1505mz7vnylrvpd067aibjc4vgq0gqvq6f", "fetcher": "github", - "repo": "russel/Emacs-Chapel-Mode", + "repo": "damon-kwok/chapel-mode", "unstable": { "version": [ - 20160504, - 808 + 20200814, + 759 ], - "commit": "6e095edd7639f5f0a81e14d6412410b49466697e", - "sha256": "0r3yja2ak3z62lav2s8vimmjyi4rd5s82fbs8r6p2k0shm6lj7hz" + "deps": [ + "hydra" + ], + "commit": "0855d6ea5e74da7b02e7307066da912c242084c8", + "sha256": "08bgjwkm6bhm5s73pdx62bjm58z18q21fhj02zdp0q8dds5babf9" }, "stable": { "version": [ @@ -9902,8 +9974,8 @@ "deps": [ "avy-menu" ], - "commit": "22d0e061f170d59d7cf6bcd948c11fa0266b7771", - "sha256": "1m29vg4cispsd8nl8lpmv5fify1208nrf8h7nkl17pplrk7hqhwb" + "commit": "a1ccf5ed786af6e2441037964668d817b9c7362f", + "sha256": "19yl7gmzalhrhr3spi8vs6wpxpv6m3m1d9564naznswxx19sjcjy" }, "stable": { "version": [ @@ -9926,11 +9998,11 @@ "repo": "lateau/charmap", "unstable": { "version": [ - 20160309, - 946 + 20200616, + 1418 ], - "commit": "bd4b3e466d7a9433cf35167e3a68ec74fe631bb2", - "sha256": "0vqsfk83lg3gvcv62jsgxxwz7icpkpswgg30hmcq0qfg0dfwwcl9" + "commit": "feac50b87d2a596c5e5b7b82b79ddd65b6dedd8c", + "sha256": "1pms4s1qnf60d3amhx1lfa255ln5wypq0q6w918whhzi4l7mdyz4" }, "stable": { "version": [ @@ -10291,36 +10363,71 @@ }, { "ename": "chronometrist", - "commit": "35d03fe9c066e7388d5ff4adad1afa1e30145995", - "sha256": "09dil46qjn7y55y7qax92l7mcw8g1bsb1mjqc92zgln96asi25kj", - "fetcher": "git", - "url": "https://framagit.org/contrapunctus/chronometrist/", + "commit": "9031f880b8646bf9a4be61f3057dc6a3c50393e8", + "sha256": "1xjxq257iwjd3zzwqicjqs3mdrkg9x299sm7wfx53dac14d7sa9g", + "fetcher": "github", + "repo": "contrapunctus-1/chronometrist", "unstable": { "version": [ - 20200503, - 633 + 20200816, + 1947 ], "deps": [ + "anaphora", "dash", "s", - "seq" + "seq", + "ts" ], - "commit": "16f2ca86540001b40725c4099d04154aab0a6ba5", - "sha256": "19z8wmhsqbm12h0vvzfgjmzj7g3mcpa9qgcz3cnmrr4hgkx4b9a5" + "commit": "c886dbb1ec8d1e22f7e9891ce9794d373b3b4e9b", + "sha256": "0f94w039ibqyysldgs0rdzjczhpgd1dq6ll85gdb4av7vw6mp3hy" }, "stable": { "version": [ 0, - 4, + 5, 3 ], "deps": [ "dash", "s", - "seq" + "seq", + "ts" ], - "commit": "282c338c21d01932049392f271f66e1725562efd", - "sha256": "1ljjqzghcap4admv0hvw6asm148b80mfgjgxjjcw6qc95fkjjjlr" + "commit": "0445b5187293a927f505633e851ca871bb89d8df", + "sha256": "0jz35972m372kx9x8mgf42zhzdw2w9wv2ri52chfb2fin4bh1biy" + } + }, + { + "ename": "chronometrist-goal", + "commit": "61031b9ab0c0dedf88e6947ae2ad8d4ad0351210", + "sha256": "0hcww5qy167fiwwkj33pj8fdc89b61mb767gz85ya5r6d5nd4si3", + "fetcher": "github", + "repo": "contrapunctus-1/chronometrist-goal", + "unstable": { + "version": [ + 20200706, + 1306 + ], + "deps": [ + "alert", + "chronometrist" + ], + "commit": "a9c4410f25f875c55b9237ef6544e82f4a805af6", + "sha256": "0wydrc4x19rp6nn1hyhaa5zxr4br51aamrv0ky5yppr17rnyygsy" + }, + "stable": { + "version": [ + 0, + 2, + 1 + ], + "deps": [ + "alert", + "chronometrist" + ], + "commit": "e651821d0f64830235232082a8295e86a173574b", + "sha256": "02q9bksjs24hxl1lz93f16rvqyn6ah10acjg2yw7kx0nj3qxff8v" } }, { @@ -10379,8 +10486,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20200511, - 1025 + 20200814, + 1540 ], "deps": [ "clojure-mode", @@ -10391,14 +10498,14 @@ "sesman", "spinner" ], - "commit": "25fb15d915117310069254016391c9d76abcebcc", - "sha256": "1hz2l2ryllwyv1zk0la376klg7yndz9q32pd1vypwymwnac93c0y" + "commit": "a89b694cc3cec0294d84bf9dbe1163ad2373e8db", + "sha256": "0m77jbxl380dp1wyj12m82bb06r80js8yxl530ryp1mwvy74f00d" }, "stable": { "version": [ 0, - 24, - 0 + 26, + 1 ], "deps": [ "clojure-mode", @@ -10409,8 +10516,8 @@ "sesman", "spinner" ], - "commit": "bfcf9157a970c9423fe27c5021f445b509e71280", - "sha256": "1y7fngd47c5dz6sdf4b5w5lxdw5jmm4wa98l4h48badl8cn6m1vl" + "commit": "a89b694cc3cec0294d84bf9dbe1163ad2373e8db", + "sha256": "0m77jbxl380dp1wyj12m82bb06r80js8yxl530ryp1mwvy74f00d" } }, { @@ -10583,14 +10690,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20200125, - 2110 + 20200815, + 1410 ], "deps": [ "cl-lib" ], - "commit": "e5bf5f89741a9c43aa406491e94dd8d58c302fb4", - "sha256": "104l0b9n9ia7zrha20yaxp6c09wg1h5l5a8b988k6mhyj9a1w1aw" + "commit": "89aac22259e5d09ae1183e0df163338fe491e9e7", + "sha256": "16hfahyhl1vv3r0amyvc514sw6x9x56b319lkp7bwcy8mxicc3cy" }, "stable": { "version": [ @@ -10643,8 +10750,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20200305, - 2126 + 20200705, + 1155 ], "deps": [ "dash", @@ -10654,24 +10761,63 @@ "s", "string-inflection" ], - "commit": "1884b5c88ad4eb35450a7acf053594369ccb1b22", - "sha256": "0dr4fx14kmahg533ij92ycn1a8kagbadfml9iyziisllxypmjrzf" + "commit": "0ad1f975a095156d02dd7f9adc0fecbc57b1e751", + "sha256": "1xhkicffmdiy4c22m9qilm09nq9zqfsi9gawq3gflla79avblh4r" }, "stable": { "version": [ 0, 1, - 1 + 2 ], "deps": [ "dash", "f", + "org", "queue", "s", "string-inflection" ], - "commit": "6d68f52ebd150e035b33dcaa59d9e2aceab69b84", - "sha256": "04xz3y3j8k1pv5v6v9wqscqlpmgqi85fs3igrv8c9y0xagild29k" + "commit": "80b395b8a0c7fc92290f0d1bfd1b5520ffd415fd", + "sha256": "1b918gjzds9jzs0ywfr41wd069l234pshpa9rn8srkzlpj5lac4d" + } + }, + { + "ename": "citeproc-org", + "commit": "2055da5d0628ca3c35b111b5ded56c0f635ca690", + "sha256": "06kr5qg0l2389n72vyxmh86sc376hjg4npzkrh42cgb1c2m4psj8", + "fetcher": "github", + "repo": "andras-simonyi/citeproc-org", + "unstable": { + "version": [ + 20200615, + 947 + ], + "deps": [ + "citeproc", + "dash", + "f", + "org", + "org-ref" + ], + "commit": "342f6531b08f5d789a1ae222f9707f636b1f5e2f", + "sha256": "1dc5qkwmfi2jm12297yy14fqbc335qjsdfi2mfgiz8wvs84hyci8" + }, + "stable": { + "version": [ + 0, + 2, + 4 + ], + "deps": [ + "citeproc", + "dash", + "f", + "org", + "org-ref" + ], + "commit": "a35655c55bbdc3f8c0571c8a8f14a33f9eac330b", + "sha256": "1n9k25qsxjv50nkk0v7cfqwdb0y89bid8lprfzzn8zi9b7gyly6x" } }, { @@ -10750,6 +10896,30 @@ "sha256": "1xp0zajp4rsnxkfzrmz0m5bihk0n1hgwc1cm9q163b2azsvixxmw" } }, + { + "ename": "clang-capf", + "commit": "c47e1fd9d5a4b85f08676742a9b36b74a2ac8fb6", + "sha256": "11qfh8c2kjcy715yyp0sywla74z92qn5j1z9wp4fv5p45w6b6112", + "fetcher": "git", + "url": "https://git.sr.ht/~zge/clang-capf", + "unstable": { + "version": [ + 20200813, + 2056 + ], + "commit": "630ab057ed614d142ac08bb3a44a869a81cb591a", + "sha256": "0xrxk4b903ayymrngf2swk8d7ic8np1dy8zp9hg3wjlibsmagak0" + }, + "stable": { + "version": [ + 1, + 2, + 0 + ], + "commit": "630ab057ed614d142ac08bb3a44a869a81cb591a", + "sha256": "0xrxk4b903ayymrngf2swk8d7ic8np1dy8zp9hg3wjlibsmagak0" + } + }, { "ename": "clang-format", "commit": "be27e728327016b819535ef8cae10020e5a07c2e", @@ -11004,8 +11174,8 @@ "seq", "yasnippet" ], - "commit": "8259791e054382457b87d1f78061b5e3ce948907", - "sha256": "0vn32b8vhlp75vj4schy8blmiddc6dn92jl4f935yd4sg7pm04cj" + "commit": "97095682580bbc5bfebcbc5349f03f5bd7121c96", + "sha256": "1dgksqzdln8cv0hyq273ikfk2bmk16rwvkiyscqsxzi8jdv8cdck" }, "stable": { "version": [ @@ -11061,6 +11231,26 @@ "sha256": "0jy6hkz8sr1bplymwxnjg4q408cw2dgfrv70chlw3y5ddc4cingj" } }, + { + "ename": "cljr-ivy", + "commit": "c34d8d2edc5e5d213aef33255a9214ff87ece1bf", + "sha256": "03afriiwswaw0canv4wphqr4kfrrpkclcczcx5ab0w3pm4bax1zl", + "fetcher": "github", + "repo": "wandersoncferreira/cljr-ivy", + "unstable": { + "version": [ + 20200602, + 1607 + ], + "deps": [ + "cl-lib", + "clj-refactor", + "ivy" + ], + "commit": "921ba65d0db7cda4edcd690c708946125b874a70", + "sha256": "12g74sfjw6siix8hvfbb0a7y8cxzxi1mb22sw8wih56bcv1987wl" + } + }, { "ename": "cljsbuild-mode", "commit": "d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba", @@ -11160,6 +11350,70 @@ "sha256": "0qkkdlifii6wkfxaj95zphiw3psmf9qnds3whmp6jq2lq9wpd74f" } }, + { + "ename": "clojure-essential-ref", + "commit": "8ecff309816256bdc09163aee6ca06b4292d98b7", + "sha256": "0vl4lz9wmymkai7yhv0gqiky5czmzd7yz9g9czfp7lhfh1hpgbkg", + "fetcher": "github", + "repo": "p3r7/clojure-essential-ref", + "unstable": { + "version": [ + 20200619, + 1653 + ], + "deps": [ + "cider" + ], + "commit": "3787300a2f6100d1a20b1259b488256f3a840fa6", + "sha256": "08r5whs39r2fscicjzvmdfj7s7f49afhiz4i2i05ps1f1545569d" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "cider" + ], + "commit": "e05d61b96f6469a93f52015b7ad5deadf616139e", + "sha256": "118zkdx118p1mzgq1szschl40qmb2cb5vw9jb9fhpimqdrlq53md" + } + }, + { + "ename": "clojure-essential-ref-nov", + "commit": "11341af9478acdaec9d5e0b5011269ac7c0ada86", + "sha256": "1740mmv8qh8gsnzvvvfdxsp676ss8b6filidbxq6b6qz2jyb7fzw", + "fetcher": "github", + "repo": "p3r7/clojure-essential-ref", + "unstable": { + "version": [ + 20200719, + 608 + ], + "deps": [ + "clojure-essential-ref", + "dash", + "nov" + ], + "commit": "3787300a2f6100d1a20b1259b488256f3a840fa6", + "sha256": "08r5whs39r2fscicjzvmdfj7s7f49afhiz4i2i05ps1f1545569d" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "clojure-essential-ref", + "dash", + "nov" + ], + "commit": "e05d61b96f6469a93f52015b7ad5deadf616139e", + "sha256": "118zkdx118p1mzgq1szschl40qmb2cb5vw9jb9fhpimqdrlq53md" + } + }, { "ename": "clojure-mode", "commit": "5e3cd2e6ee52692dc7b2a04245137130a9f521c7", @@ -11168,20 +11422,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20200419, - 559 + 20200813, + 639 ], - "commit": "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a", - "sha256": "0v4q031rvy34llbxhksqlzf3ign4q5xcwf6b3fzblb9k5nz2b3hr" + "commit": "84ed16c5ddb6561620886485e20669d0c81f88a1", + "sha256": "1kdm9dfj3qifwylj9j2x12xwxzrkmyp4pvph7bvwfrv65jp4r58j" }, "stable": { "version": [ 5, - 11, + 12, 0 ], - "commit": "721287c7a756678d5fe8fa0dcb2d8dc846d239a2", - "sha256": "1x1yszp6waa778ki6sw66w1pzcz389wd01gkcldfxxnd7z89ad5d" + "commit": "3dc12d3a54ab17dee2db36c8fc48eb9598a17c5e", + "sha256": "14ipfy9ji39pnb9x7bzjp8lyqyxk168fx017m823j7a2g9i0sgp3" } }, { @@ -11198,20 +11452,20 @@ "deps": [ "clojure-mode" ], - "commit": "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a", - "sha256": "0v4q031rvy34llbxhksqlzf3ign4q5xcwf6b3fzblb9k5nz2b3hr" + "commit": "84ed16c5ddb6561620886485e20669d0c81f88a1", + "sha256": "1kdm9dfj3qifwylj9j2x12xwxzrkmyp4pvph7bvwfrv65jp4r58j" }, "stable": { "version": [ 5, - 11, + 12, 0 ], "deps": [ "clojure-mode" ], - "commit": "721287c7a756678d5fe8fa0dcb2d8dc846d239a2", - "sha256": "1x1yszp6waa778ki6sw66w1pzcz389wd01gkcldfxxnd7z89ad5d" + "commit": "3dc12d3a54ab17dee2db36c8fc48eb9598a17c5e", + "sha256": "14ipfy9ji39pnb9x7bzjp8lyqyxk168fx017m823j7a2g9i0sgp3" } }, { @@ -11284,30 +11538,30 @@ "repo": "clojure-emacs/clomacs", "unstable": { "version": [ - 20191201, - 200 + 20200808, + 2347 ], "deps": [ "cider", "s", "simple-httpd" ], - "commit": "88b8fc6d1b7105adae009578ef24fedaf157f341", - "sha256": "13rhnncqj8666g2v7493i8xh79mczjrmg24p12knzhkslxdnv9hp" + "commit": "ada167954911bf1631ea73537b4b496f35f99a73", + "sha256": "0gc4c97s6y7al1777zmzvq1n30i532b4v8k2p7i71bzzijr97fml" }, "stable": { "version": [ 0, 0, - 4 + 5 ], "deps": [ "cider", "s", "simple-httpd" ], - "commit": "292c8f5370a2c74094da46ede990b5e7cc8b55b8", - "sha256": "1rv57wqr09vl0caz4wjr0kqvhgvl5y1x6818v8m55rm2z8rim11i" + "commit": "ada167954911bf1631ea73537b4b496f35f99a73", + "sha256": "0gc4c97s6y7al1777zmzvq1n30i532b4v8k2p7i71bzzijr97fml" } }, { @@ -11318,26 +11572,26 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20191229, - 1814 + 20200704, + 2124 ], "deps": [ "emacsql-sqlite" ], - "commit": "1e78f96dc976badb59067c986f7766cce89405cc", - "sha256": "03nknirj5jd3yf842amb274269fyiinr325g1x2snf1zgqfm3csn" + "commit": "c864c1fadfea4a05fff29cb60891b7a32ac88c78", + "sha256": "06j0sc6dx8f34wc8i7dzkp8jwvwnrpnl8i93vpc1qw0ih0jwa2zh" }, "stable": { "version": [ 1, 0, - 1 + 4 ], "deps": [ "emacsql-sqlite" ], - "commit": "92f8f2dba684b7c9cc60821aa5668d336544ab99", - "sha256": "0q8val0v4hryr0miliqjf38y4aybrihzncr0p1mwba861jlpy86n" + "commit": "c864c1fadfea4a05fff29cb60891b7a32ac88c78", + "sha256": "06j0sc6dx8f34wc8i7dzkp8jwvwnrpnl8i93vpc1qw0ih0jwa2zh" } }, { @@ -11501,17 +11755,17 @@ 20190710, 1319 ], - "commit": "135b5835a42d6e3c7efb85f80f3fe0885d45d644", - "sha256": "18mgkn5cy14f5l4qajhdphxvw66hhhw2yf12qfvpd2n5bx3b8dcs" + "commit": "92d724903192b98e42cc1048ca587207aa20043f", + "sha256": "1ig5wjiq31rgf57gkf37d2rzx4qkkif997w1dfllwc4w3svwykp0" }, "stable": { "version": [ 3, - 17, - 2 + 18, + 1 ], - "commit": "615129f3ebd308abeaaee7f5f0689e7fc4616c28", - "sha256": "1akclhrc9gx0asvmwcsbvw90wgazlyqd044wql7qj6vibv47cdjd" + "commit": "63a65baf4c343c73b2142078ef0045d3711dea1d", + "sha256": "1a3r119qca4sg83zchnsnmmq9k7ad8pljl5s24k00xbyyfs1wm7k" } }, { @@ -11525,8 +11779,8 @@ 20171121, 1115 ], - "commit": "d3f408f226eff3f77f7e00dd519f4efc78fd292d", - "sha256": "1r8a3arpkkn91k619z4b6ywnq15glc4n1ji33l0q2m59f5sfk8mp" + "commit": "a7cf9e4c01c4683e14b6942cc5cc5e8cddc98721", + "sha256": "0zff8705vllkmm112qm58q1af0x1rcra5yw4fi8m5q97kh0n77vn" }, "stable": { "version": [ @@ -11579,11 +11833,11 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20200327, - 101 + 20200819, + 543 ], - "commit": "d741332ad4bcd9a136d5dc4974a050da8ca28888", - "sha256": "1f2nrklzvm0b09d1s5rxvzahc32rs5qdqx910a45fj95hlw2w2wc" + "commit": "d4d303b0045b682b9e699e63fa3af4dd00daf878", + "sha256": "06gcm7wc1ayz0z2fqz3bqyfxqlgbx31z95gwbwjd9x2mqgkp02mh" }, "stable": { "version": [ @@ -11868,14 +12122,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20200129, - 144 + 20200705, + 2145 ], "deps": [ "dash" ], - "commit": "923ed4789c5ab66369ac4dda7eedb910951684a6", - "sha256": "1d502n6bpdscgpqfanax1h0iirgpq8x56vh6bbpzg9i042i3z7ls" + "commit": "dfca97595094fc192a04172d86cb4ba68cab984f", + "sha256": "1w9biijvqr7ig7l3j6axbnmdn44xvyj3m8yinx0d6qqyys98hgyj" }, "stable": { "version": [ @@ -11961,11 +12215,11 @@ "repo": "emacs-jp/replace-colorthemes", "unstable": { "version": [ - 20200315, - 929 + 20200729, + 921 ], - "commit": "40464198e7bf2121694a7e6d87588342140a84ff", - "sha256": "0fhr0rvfrb9fmbh9zgzxx2c2zl28v16hxmn9jx6k73nsfwpy498j" + "commit": "a996eca37f4df726eec95406deb76b538320771a", + "sha256": "1fgcd6vdqknqb1s1hwqqspk84a8xnxmrcnlic1j0x558i2yj4l2x" }, "stable": { "version": [ @@ -11985,14 +12239,14 @@ "repo": "purcell/color-theme-sanityinc-solarized", "unstable": { "version": [ - 20200304, - 2156 + 20200805, + 603 ], "deps": [ "cl-lib" ], - "commit": "c688337aaae9f47128a841479e4191858ac147f6", - "sha256": "0a16fn7h0yljlgg1scy82w5r6awd7gk6xf1qd83cx8kj2cg7k7vb" + "commit": "7ef39ac9d99bfb699903cfc3623521c0ceec7b86", + "sha256": "18x1hhq5v9agv2gvragwvxgzxfixfqy8pcbqhi63yqxmx30zlqj1" }, "stable": { "version": [ @@ -12011,11 +12265,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20200507, - 608 + 20200813, + 333 ], - "commit": "e4e577c24db6ad7f6940a13e1d58418d42ff0c81", - "sha256": "0363fi2q4wprnkrdlvvbsib42czsf4fwhy61c6b9bbj8fvmflzj8" + "commit": "b7e33d1ccb10a93d6a0393c43400435b70a48689", + "sha256": "1qg5wz04d7kq63zsjbhdcxn96j6x84hsbj7vbx6d051yql6l3m8s" }, "stable": { "version": [ @@ -12052,11 +12306,11 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20200325, - 1307 + 20200812, + 656 ], - "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37", - "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn" + "commit": "736f7a105535901b4783d19534e7855920e25115", + "sha256": "1wi7wxiyk0g3k0l60hdmcyvvxr1kaapbkxvkknwd9qvdsji0ng73" }, "stable": { "version": [ @@ -12099,11 +12353,11 @@ "repo": "jordonbiondo/column-enforce-mode", "unstable": { "version": [ - 20171030, - 1900 + 20200605, + 1933 ], - "commit": "2341a2b6a33d4b8b74c35062ec9cfe1bffd61944", - "sha256": "0rcxb7daxxrp5f1i5cbv25viwawbbsn4ij1mnlclp5wz7ilcy2rs" + "commit": "14a7622f2268890e33536ccd29510024d51ee96f", + "sha256": "1vxra5vk78yns2sw89m41bggczqg1akq6xvzfs9kylhkg5yz3g7g" } }, { @@ -12114,28 +12368,26 @@ "repo": "jcs-elpa/com-css-sort", "unstable": { "version": [ - 20190723, - 1714 + 20200717, + 338 ], "deps": [ - "cl-lib", "s" ], - "commit": "b0491d5340c5f5c516b44aa7bfef6f6cf2998484", - "sha256": "0d6pxwi5mbb98zzx3j55w221541674d69pxmf55yji6hly8yqavv" + "commit": "e12f77ad3a17a0d599ca802497086cd9155d451b", + "sha256": "1i0pg3hzw87drvfivr1355h3rfp409ak57bff9la8qlx1llynv5y" }, "stable": { "version": [ 0, 0, - 5 + 6 ], "deps": [ - "cl-lib", "s" ], - "commit": "e3c6a3a88c8f7e3ce7a5c6756b47a7aba7ffe149", - "sha256": "0c3pcgr95nhf2yx66hxiwwl6k2fqz8cpmr0y0fxzahkmvc4c9zi6" + "commit": "e12f77ad3a17a0d599ca802497086cd9155d451b", + "sha256": "1i0pg3hzw87drvfivr1355h3rfp409ak57bff9la8qlx1llynv5y" } }, { @@ -12162,6 +12414,21 @@ "sha256": "1hh1lkan1ch5xyzrpfgzibf8dxmvaa1jfwlxyyhpnfs5h69h3245" } }, + { + "ename": "comby", + "commit": "1173462e86ec0518cd6bab241fea3fe0342c4b41", + "sha256": "0wipqvdsmjhg4kvqcgarix955m9v8fs1lccs002f03rz4ckfdpxf", + "fetcher": "github", + "repo": "s-kostyaev/comby.el", + "unstable": { + "version": [ + 20200629, + 140 + ], + "commit": "928b8b8959a2556aba5526f2a25801341eb59dc3", + "sha256": "1f0155fyvh1m20ahl6wqask4qx6jp3lfwxj894cda9j4y8gnr5iq" + } + }, { "ename": "comint-hyperlink", "commit": "3c3bc7c897bfc5fafcda33d9837e6f3ff4da3692", @@ -12248,8 +12515,8 @@ "f", "s" ], - "commit": "c93985dc318fe89e5a29abc21d19fb41e2fd14d2", - "sha256": "0mlabiraagqwl17payils5589fr2mivvkzrfic6ndsipryab6rfc" + "commit": "9ba1456b0a389a2f7b42b6f42a4208ddd87ce609", + "sha256": "1kj7w8akrybr1y30lbhax8dnk5m4fg365ifxlyw766v69g5x7zd2" }, "stable": { "version": [ @@ -12394,14 +12661,14 @@ "repo": "ddoherty03/commify", "unstable": { "version": [ - 20161106, - 2334 + 20200812, + 1241 ], "deps": [ "s" ], - "commit": "78732c2fa6c1a10288b7436d7c561ec9ebdd41be", - "sha256": "1kb3cbjp69niq8ravh273dma0mnkf1v2ja372ahxfsq1janrkkm6" + "commit": "92514f071c667653f146629c0aec0ab4d3b78226", + "sha256": "1n6jpkhq0kncsszkkpfi923zq75h3d032vwmlz7pp8szs93w2308" } }, { @@ -12442,20 +12709,20 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20200510, - 1614 + 20200818, + 1753 ], - "commit": "1c7a87283146f429c5076e8ea0a559556a4d4272", - "sha256": "0dvvdyg8fc6jzcl1hgrh0cr3nz4vyw5i9xz5w3mc3mn7fixbdcr3" + "commit": "54f60ef523878c4d332f29df380f36cf2f165935", + "sha256": "08lbjvm97fh1bm5201ncbnr5b1456y9mwf6yhrrhg1rjqvcca74q" }, "stable": { "version": [ 0, 9, - 12 + 13 ], - "commit": "490d3e4e7ef3fbc90fb3e8747f902bf839a924cc", - "sha256": "0c31amc6gyfkmb1ii6mm56c75za1yxkj2iyhrjc45nn2mrh7yj7a" + "commit": "656ad10670512e135a0a5881f127bb7a789ef8ca", + "sha256": "1j5f8kqv36r18pg09a6139q7a0a39xdnc5nf6sv3c0pw3yfw1szn" } }, { @@ -12557,16 +12824,16 @@ "repo": "alexeyr/company-auctex", "unstable": { "version": [ - 20180725, - 1912 + 20200529, + 1835 ], "deps": [ "auctex", "company", "yasnippet" ], - "commit": "48c42c58ce2f0e693301b0cb2d085055410c1b25", - "sha256": "10qn7frn5wcmrlci3v6iliqzj7r9dls87h9zp3xkgrgn4bqprfp8" + "commit": "9400a2ec7459dde8cbf1a5d50dfee4e300ed7e18", + "sha256": "0x8qc63zn126hspcblwlihxfzs8kvcjb6cpj28ahsb0117j2i789" } }, { @@ -12616,16 +12883,16 @@ "repo": "sebastiencs/company-box", "unstable": { "version": [ - 20200511, - 401 + 20200818, + 738 ], "deps": [ "company", "dash", "dash-functional" ], - "commit": "452f083f6c11793a3723224bce42898a2bedc0e1", - "sha256": "07il7z52ywvkqy5zpkvzsaxsjqx8dqgd91cpba05vywpsl3lis30" + "commit": "20384f0e382c063173b9d863344b1b23bc1e4954", + "sha256": "0l66ajzh1x0gazmv9nzgcsy72kyja3yq4gmzgzpkgin5dxms33k0" } }, { @@ -12686,8 +12953,8 @@ "repo": "cpitclaudel/company-coq", "unstable": { "version": [ - 20200130, - 2058 + 20200729, + 401 ], "deps": [ "cl-lib", @@ -12696,8 +12963,8 @@ "dash", "yasnippet" ], - "commit": "f9dba9ddff7da99a93d8a6e26d9b1d813bc96b2f", - "sha256": "1hl8gr8afx2i5bia7vq3vn4shbaz8fps3h30ldvq141kfvmcp8jm" + "commit": "b096cb528de1e0bb31cc1059d0bd698b98a6cc6a", + "sha256": "0m70w4f0kpvk97nnnp1bfk191dhipv418fmcfqjw90sajknyhq6m" }, "stable": { "version": [ @@ -12724,26 +12991,26 @@ "repo": "redguardtoo/company-ctags", "unstable": { "version": [ - 20200407, - 803 + 20200603, + 438 ], "deps": [ "company" ], - "commit": "b159e45b38226e046cf6fb7d08a0cf864ebbf772", - "sha256": "0h0k06c9fabyz6akka1bpwkz69wzl7ajcm0p108xdf5lymc75v5h" + "commit": "ba4d2577fbbe5ad7bb978838e3e3177f8a56e8f8", + "sha256": "0cy48my9d02v7wa40dw5x6djyjjacddj9p0pgdvr1rg70lqxii45" }, "stable": { "version": [ 0, 0, - 3 + 4 ], "deps": [ "company" ], - "commit": "3d21eaa511b5f0ca55205f203d28fd10ea1d3b39", - "sha256": "0lj5gkj2dl0c7sva8bi3bng2gm90sjq15g7w8r9nz70666szdr1i" + "commit": "ba4d2577fbbe5ad7bb978838e3e3177f8a56e8f8", + "sha256": "0cy48my9d02v7wa40dw5x6djyjjacddj9p0pgdvr1rg70lqxii45" } }, { @@ -12860,15 +13127,15 @@ "repo": "dunn/company-emoji", "unstable": { "version": [ - 20191226, - 1915 + 20200612, + 1902 ], "deps": [ "cl-lib", "company" ], - "commit": "fc45b56f3e2081d794f243bce705e77d4e29fc06", - "sha256": "0r9zcbm3nb3zw5cwrkl098v5b49jbga5404bj7j55g6k4rwkjar2" + "commit": "5f2d10623c1e9f547d852cb13c7a391afbda09fb", + "sha256": "0b7hfcgmrkmbi138hjfc9jsgh84slw4fcizxss55b9j60xrzsc75" }, "stable": { "version": [ @@ -12962,28 +13229,28 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20190812, - 204 + 20200712, + 49 ], "deps": [ "company", "s" ], - "commit": "2af24f053465ab370566a49c231d541ca9509850", - "sha256": "0ki049jpd4xymagaxd4zvnj3bm7d7d797xa1bm8lfi701m2jjlgg" + "commit": "af017d00f4576fddee1d386f41c9ccebd7038d9a", + "sha256": "1a3317wzilp7z01j34rqg5khr77hqz9nxm930d16225gki98g9q3" }, "stable": { "version": [ 0, - 5, - 3 + 6, + 0 ], "deps": [ "company", "s" ], - "commit": "a97f55b60f427e536e637898d12792154d134aab", - "sha256": "1iw1vk1pgdacvfh17n45kk98rxml3f6kxnijmpp7fzz4q07yiv7w" + "commit": "af017d00f4576fddee1d386f41c9ccebd7038d9a", + "sha256": "1a3317wzilp7z01j34rqg5khr77hqz9nxm930d16225gki98g9q3" } }, { @@ -13226,8 +13493,26 @@ "lean-mode", "s" ], - "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c", - "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n" + "commit": "6b4377686128d5c2fb55d8fe61b92a9991d40fbd", + "sha256": "1zb3igic1i30mfbsx4k2sabhdpl58fsrl5c3fjvqrpn92ixi9vws" + } + }, + { + "ename": "company-ledger", + "commit": "546bc62530136a7fdf3886731e4316c6c8081ead", + "sha256": "0y54wbky6jq9r3h4ghpkjywj78hw8k83ri6szph6s8w5m6dkji82", + "fetcher": "github", + "repo": "debanjum/company-ledger", + "unstable": { + "version": [ + 20200726, + 1825 + ], + "deps": [ + "company" + ], + "commit": "9fe9e3b809d6d2bc13c601953f696f43b09ea296", + "sha256": "08cs8vd2vzpzk71wzcrghn48mzvbk6w2fzlb3if63klhfcfpngc8" } }, { @@ -13287,6 +13572,25 @@ "sha256": "0ny2dcc7c585p7v3j6q0rpkbj1qmf2ismy8a5020jpr585xvz0hh" } }, + { + "ename": "company-manually", + "commit": "a7cdcad45efa0ecb807645c597b6fc3be22899d3", + "sha256": "1ws4kgvjz8ff600rw4grgjq7s34233s9616jnyykjfdh18skssmi", + "fetcher": "github", + "repo": "yanghaoxie/company-manually", + "unstable": { + "version": [ + 20200709, + 913 + ], + "deps": [ + "company", + "ivy" + ], + "commit": "b922318da821fc3cf1d3155f21d543ea8470c881", + "sha256": "1s2bv040gg22qzjca39r32cz3qhairnvppk9wdp1hl52i6by57v9" + } + }, { "ename": "company-math", "commit": "fadff01600d57f5b9ea9c0c47ed109e058114998", @@ -13353,8 +13657,8 @@ "company", "native-complete" ], - "commit": "0f290514564d3733b35e4b48d70446c1a6eb4b41", - "sha256": "0i8bss7ipwsjfrgfri7d3f9pbpkdbfh8aqz8cawr2wvf4yayk8q5" + "commit": "be7ced29c5a86e29c364f19d248634b8b54d0e52", + "sha256": "1lyad89byq54fva58njf7wiq2rw3767fxif1ykijirzx7q14ahxd" } }, { @@ -13446,16 +13750,16 @@ "repo": "org-roam/company-org-roam", "unstable": { "version": [ - 20200511, - 743 + 20200711, + 355 ], "deps": [ "company", "dash", "org-roam" ], - "commit": "674c2bd493f571c5323d69279557a6c18ccbd14e", - "sha256": "1x88kvxawbpg4sagi0kh4y7inyhy05dxcg8hl0ih4x40cwxyxrs5" + "commit": "1132663bd68022aa7ea005ff53c7c7571890769d", + "sha256": "1xk53lyf5sn16cs2gv874sajs5jlsxbxpksbjx9nk8glzrq7r6r3" }, "stable": { "version": [ @@ -13492,16 +13796,16 @@ "stable": { "version": [ 2, - 2, - 2 + 3, + 0 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "4490d168778a61a4ee8623defe760164cd9745b8", - "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" } }, { @@ -13519,8 +13823,8 @@ "company", "phpactor" ], - "commit": "860d7e8784b261ee71deba354d01c3038cd777ab", - "sha256": "1d3fijh11g70xhx3a47l75mrp64bvkk7hh9lg83nl30qhn2vrbn3" + "commit": "62d2372ea55c0c5fb4e77076988472ebb5d85f24", + "sha256": "1sfrdap157zc7lk9vwsy91p813ip8dmazgfjwh7jwzyvcj7dsimc" }, "stable": { "version": [ @@ -13536,6 +13840,42 @@ "sha256": "0dsa1mygb96nlz5gppf0sny3lxaacvmvnkg84c0cs6x223s6zfx8" } }, + { + "ename": "company-plisp", + "commit": "bdd486fdb97b4954a881b6099704704829eb0058", + "sha256": "071h99nv6q3lrc6navii0dhzak28j3fqx4mwajyapzlcrrsdpp4i", + "fetcher": "gitlab", + "repo": "sasanidas/company-plisp", + "unstable": { + "version": [ + 20200531, + 1927 + ], + "deps": [ + "cl-lib", + "company", + "dash", + "s" + ], + "commit": "fc0b56d2a711340ca3e63119bfe692bb3e8620fb", + "sha256": "0xw475spfwq32nn5qz3gk22cggj1f5y245da9030vzi2jfb9vvid" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "cl-lib", + "company", + "dash", + "s" + ], + "commit": "0e6941e1832faafb2176238339667edd482acd95", + "sha256": "1ri022shrwiw10gdydm66c2xya1qxl449r5f8qadals7m4crczp2" + } + }, { "ename": "company-plsense", "commit": "9cf9d671d81e07c704676c557a9f0d686067ce5c", @@ -13584,15 +13924,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20200514, - 2116 + 20200812, + 410 ], "deps": [ "company", "posframe" ], - "commit": "4e506d661ed9cd2e4cf16281f3a11009210e9c30", - "sha256": "1h6pls6vg593cbmvq2kh5z67jvcyljvwbdxypqqsls5d22hvvbh5" + "commit": "4bfb8bccef4b64479f4147de6bf6fbd05df2a67e", + "sha256": "0k19gkh8xbap4j1jjqw6lnkp1v2q76fz3ryrns7kvbzmca3y5599" }, "stable": { "version": [ @@ -13616,27 +13956,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20200404, - 1550 + 20200716, + 1414 ], "deps": [ "company", "prescient" ], - "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", - "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" + "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530", + "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p" }, "stable": { "version": [ - 4, - 1 + 5, + 0 ], "deps": [ "company", "prescient" ], - "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", - "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" + "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc", + "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix" } }, { @@ -13666,15 +14006,15 @@ "repo": "company-mode/company-quickhelp", "unstable": { "version": [ - 20180525, - 1003 + 20200714, + 1611 ], "deps": [ "company", "pos-tip" ], - "commit": "479676cade80a9f03802ca3d956591820ed5c537", - "sha256": "0hbqpnaf4hnin3nmdzmfj3v22kk9a97b6zssqs96ns36d9h52xcp" + "commit": "5a86731de461142db3b7ca26b4681756edb4b773", + "sha256": "0n0pdcgql8hcipwacc60hk4ymp8ry6z9lm4p4wn8gmnb7km023qb" }, "stable": { "version": [ @@ -13698,36 +14038,36 @@ "repo": "jcs-elpa/company-quickhelp-terminal", "unstable": { "version": [ - 20200309, - 245 + 20200627, + 908 ], "deps": [ "company-quickhelp", "popup" ], - "commit": "0a7c86258b3069adbeb0889e21c6977390d00f4f", - "sha256": "0zbzbm4hchp1a8m0bdcp9d97i0yx3kkhp5vbs0m5pr2h13xdc7vj" + "commit": "e18b4cf309e2bbc63995ebc3c1230c8c865dd00e", + "sha256": "1ixl54wgynq0zzqr7cxphblwmxx5a9gs28rfyq5c2l499ja4r1k7" }, "stable": { "version": [ 0, - 0, - 2 + 1, + 0 ], "deps": [ "company-quickhelp", "popup" ], - "commit": "344e30202fb38e1947b8b17f403bb7b2208936fe", - "sha256": "1gzmx8zz93261m9kks2hdgdhfs9vz8gsdxx5xkldbnz4g1wbmh2a" + "commit": "e18b4cf309e2bbc63995ebc3c1230c8c865dd00e", + "sha256": "1ixl54wgynq0zzqr7cxphblwmxx5a9gs28rfyq5c2l499ja4r1k7" } }, { "ename": "company-racer", - "commit": "c4671a674dbc1620a41e0ff99508892a25eec2ad", - "sha256": "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4", + "commit": "b38908bc1b759b14173ffb49ddeb040a9892cc0d", + "sha256": "180851z4ngpfvib2rhr9dvc1kbqjn4flsibc9r382na8wnmmcx5j", "fetcher": "github", - "repo": "emacs-pe/company-racer", + "repo": "emacsattic/company-racer", "unstable": { "version": [ 20171205, @@ -13812,8 +14152,8 @@ "company", "rtags" ], - "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", - "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" + "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824", + "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b" }, "stable": { "version": [ @@ -13878,8 +14218,8 @@ "company", "solidity-mode" ], - "commit": "022b3159832384a7dcdc2168809e698600826047", - "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" + "commit": "d166a86b83907e0cfd64c191e9dfce4b44a9843e", + "sha256": "19hgvsrqch2vp49ag6m76bi5qxd20v95z0ib838rib9as15b17wq" }, "stable": { "version": [ @@ -13947,8 +14287,8 @@ "company", "stan-mode" ], - "commit": "599a0440086c660e6823622b35058f6d2d6d9637", - "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" + "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e", + "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0" }, "stable": { "version": [ @@ -14002,14 +14342,14 @@ "repo": "juergenhoetzel/company-suggest", "unstable": { "version": [ - 20180527, - 1631 + 20200804, + 1127 ], "deps": [ "company" ], - "commit": "e1fa663b48639c76d91d1f5ac3b23215aa3dabc3", - "sha256": "0jn7rx4m3121lx6hhabvnfq73vd0rj2364hbvza2myylw4f4qav9" + "commit": "7f4efb0e2577b7b34928db3dc71758ab6852f66b", + "sha256": "0hlvg11p4xkafqys322ablbld2v7fks924cpc3bs3wcipjjxl3cf" } }, { @@ -14246,11 +14586,11 @@ "repo": "paldepind/composable.el", "unstable": { "version": [ - 20190904, - 701 + 20200604, + 1156 ], - "commit": "46f82d86c285ceba3e0e46adf993a98cd8816390", - "sha256": "14n5sckdaxx291wmj7mnsn06sprpdxf6s44hgxdksv0pvln2m0wx" + "commit": "f6262e6d7380ce9d4eacd7127fe0d968325f347d", + "sha256": "0a2xfnd54pclh3qm1hwv867dpkhk6wck94092yyzapj7zxnfnr15" }, "stable": { "version": [ @@ -14270,35 +14610,32 @@ "repo": "emacs-php/composer.el", "unstable": { "version": [ - 20200214, - 1119 + 20200616, + 1717 ], "deps": [ - "cl-lib", "f", "php-runtime", - "request", "s", "seq" ], - "commit": "8b4867e30efcdf10c6d9a74822aa281404377818", - "sha256": "1605fk7nkzjshn6faxw0ycn45a1wbivpmlmyaxcqzjhmawavky6b" + "commit": "7c7f89df226cac69664d7eca5e913b544dc475c5", + "sha256": "0iyajdlp95mii462xqy6fqbv5q7vai3ya4jip8433zwwr2pkdbsr" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], "deps": [ "f", "php-runtime", - "request", "s", "seq" ], - "commit": "d88741009cf7cae0a75e3cc7a19dd9143fcc92f9", - "sha256": "0iqm8997pl3pni7a49igj8q6sp37bjdshjwl6d95bqrjkjf9ll08" + "commit": "db65d874d762f70558449a01bdac5361bf067c15", + "sha256": "1krfdc8xrkxl7mhldxhbf2lddyskvvrykrspkzvvwivc29dl0vmm" } }, { @@ -14357,8 +14694,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20200509, - 1836 + 20200818, + 1614 ], "deps": [ "dash", @@ -14366,14 +14703,14 @@ "pythonic", "s" ], - "commit": "8dad784b75a42d1cb6f7a6b8a2c2e39f589727f9", - "sha256": "1k1hsargcqciyz48zkdsnhinv8h4fr9786x8s7c63864fbxxby3v" + "commit": "9f7eea16e9ad3eb34fe3d1cbd9d6162b8046c2f8", + "sha256": "1151bk1fx8y8yql1sg9qqagxcbq57rz85gwnx0z2acfpljb2i7r7" }, "stable": { "version": [ 0, 0, - 10 + 11 ], "deps": [ "dash", @@ -14381,8 +14718,8 @@ "pythonic", "s" ], - "commit": "8dad784b75a42d1cb6f7a6b8a2c2e39f589727f9", - "sha256": "1k1hsargcqciyz48zkdsnhinv8h4fr9786x8s7c63864fbxxby3v" + "commit": "78e1aad076f6cefc6aa7cc77d08e174b13050994", + "sha256": "02l9m5wx0z865w3cdwbw7c22fmdjbsw4svivqg72nbl7yrq7rv5v" } }, { @@ -14658,16 +14995,16 @@ "repo": "emacs-php/emacs-auto-deployment", "unstable": { "version": [ - 20180604, - 1419 + 20200616, + 518 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "5af6d5fcc35ddf9050eada96fd5f334bf0661b62", - "sha256": "1q9liby1dmwwmg2jz13gx2ld47bpcqb9c7vx4qgky75wb5c2q1xz" + "commit": "811c8fe638c5616b6471525421e61a4470be3b52", + "sha256": "0j205ky9djlzhgrgjw4562lz2gnpi48las66w7ll8z20zkk4ylnm" }, "stable": { "version": [ @@ -14798,20 +15135,27 @@ "repo": "conao3/cort.el", "unstable": { "version": [ - 20200330, - 1641 + 20200812, + 910 ], - "commit": "eb94d2a5b3a048a495fb0218b2df9021f8c864f4", - "sha256": "0rc1jfqkc05ml41cp8dc8akrxx3ifziyjy1w4vvgpbb5z49m83ky" + "deps": [ + "ansi", + "cl-lib" + ], + "commit": "28c8422e84fd545f7a166f1904277b6b3f98398c", + "sha256": "06fcwadrn32i19qp30xw65976wplsw3xh2jm0zzsp9g0pir1snxb" }, "stable": { "version": [ - 3, - 0, - 5 + 7, + 1, + 0 ], - "commit": "1df178e296feaf4465967567b1cfdce1dda5a09b", - "sha256": "0y23w34dcifk6cxw2kcgwydqdc8hn0mj5129z560fm6iwxd6cgkx" + "deps": [ + "ansi" + ], + "commit": "a2d5ac5639e43dd73b5dbfa5bd011b7760b126fd", + "sha256": "03c223nczpbdkjmq69panhbsq2a0zj20w329jgj4c0zsj8m1a32a" } }, { @@ -14837,14 +15181,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200512, - 1130 + 20200818, + 1428 ], "deps": [ "swiper" ], - "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", - "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" + "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44", + "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l" }, "stable": { "version": [ @@ -14943,10 +15287,10 @@ }, { "ename": "counsel-dash", - "commit": "0f8af4d854f972bfed3d2122b4c089f72d8b5f2a", - "sha256": "0pzh8ww1p2jb859gdjr5ypya3rwhiyg3c79xhx8filxrqxgjv5fk", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1ya7mnxlgb1rwr8xlg17mqh25dbkr0v04wccg9l8hwl63m7bfzpv", "fetcher": "github", - "repo": "nathankot/counsel-dash", + "repo": "dash-docs-el/counsel-dash", "unstable": { "version": [ 20200103, @@ -14984,26 +15328,26 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20200514, - 1224 + 20200814, + 716 ], "deps": [ "counsel" ], - "commit": "362fc857a271e509d05fa190212629dc6b0778f2", - "sha256": "0c9p6pfnzdbxaib1vgm1npp8lgyw0hpczi210c26x8p9d8xx19lw" + "commit": "5ec1e422b47163e17d0d5c1cf732068f93ffc39c", + "sha256": "0zwyff7lamlpqd52ifspf6bb78cpanlsy5gccp7ms7mnj82zhfxm" }, "stable": { "version": [ 1, 9, - 8 + 12 ], "deps": [ "counsel" ], - "commit": "362fc857a271e509d05fa190212629dc6b0778f2", - "sha256": "0c9p6pfnzdbxaib1vgm1npp8lgyw0hpczi210c26x8p9d8xx19lw" + "commit": "9436bdbddc0deba88d97b5f31d62a2c95a52c400", + "sha256": "08glszh5y8y078vjrnmasxdfmxiics88hkva4nqq6spl0a0hrn9f" } }, { @@ -15132,14 +15476,14 @@ "repo": "akirak/counsel-org-capture-string", "unstable": { "version": [ - 20180816, - 724 + 20200810, + 1114 ], "deps": [ "ivy" ], - "commit": "0fd5d72397a9268a89dd26de2a6c355f127453ac", - "sha256": "19ijjiidxxysvkz9vnsgiymxd7w7zcs5bazn7dmahp5yaprlsjld" + "commit": "dbb7d95f99d7910d76ffc2d024580088a34ec444", + "sha256": "1pymgwvjiagsx9dh9678x3i8ds1s7l4s182dr2p9rpjiwya48l6x" } }, { @@ -15150,15 +15494,15 @@ "repo": "akirak/counsel-org-clock", "unstable": { "version": [ - 20190407, - 348 + 20200810, + 1109 ], "deps": [ "dash", "ivy" ], - "commit": "ddf6b89652e4dbc0be5e8719213e7673c83959f1", - "sha256": "1fd8ll7jcfmy2dhhhsqh1l6wqfklma54bqpb4jnxmdn2w9p3ndmn" + "commit": "c5f781f241f8b16b7c3b6fb3e56e2938ba1dd87a", + "sha256": "10img15z5lfn8ml8d6v5mjf1nr73i8mjn9xy23ydp16n2idshh3d" } }, { @@ -15187,15 +15531,15 @@ "repo": "ericdanan/counsel-projectile", "unstable": { "version": [ - 20200430, - 2133 + 20200522, + 1131 ], "deps": [ "counsel", "projectile" ], - "commit": "126e825bbab872b3befd9ef88660571391ebfdc3", - "sha256": "0shmndgr1plx8kzppn990ybb2144h8p49v4vd37099y5pj6w3zri" + "commit": "77392cbbc42e98fc137b43f1db1b111ba6e2dd75", + "sha256": "131pww7lf88az5bsnaza8i60p7xcic271wpdr870zan8z1jh69k3" }, "stable": { "version": [ @@ -15237,14 +15581,14 @@ "repo": "Lautaro-Garcia/counsel-spotify", "unstable": { "version": [ - 20200326, - 156 + 20200818, + 2055 ], "deps": [ "ivy" ], - "commit": "5d23a898483de19cb60773492c9846facb8ae281", - "sha256": "0k9m8xi9p5w2qnpz0zmdf52ip6viws06qq5rssgvb0cr888iqib2" + "commit": "2743ad52a9def53534fd505397fbe1ac49e53015", + "sha256": "1xrh06w3pszp4gygwsyjz7b5w2ffqmnh6rh891ydbhysp586hk0v" } }, { @@ -15360,16 +15704,16 @@ "repo": "AdamNiederer/cov", "unstable": { "version": [ - 20191004, - 36 + 20200630, + 1942 ], "deps": [ "elquery", "f", "s" ], - "commit": "9e6f4af7a07e281913f9f50f20dbbf6f26807563", - "sha256": "1w27hi64wcd86pw4ds2w4yldfm0wsk15f9mpcinyb68sj1p7sn9y" + "commit": "8b9c7d7f4e53ab3a66cc4d9c88ac07fa57c7a5fe", + "sha256": "17msfsl7q78cs065a28z95hgcqvhbddlg9qwgldc1v62lgpqfd7a" } }, { @@ -15393,14 +15737,14 @@ "stable": { "version": [ 0, - 3 + 5 ], "deps": [ "cl-lib", "ov" ], - "commit": "c73d984168955ca0f47f44b0464aa45282df42b6", - "sha256": "1kn61j91x4r4kc498y2jas5il4pc4qzhkj8392g2qiq5m3lbv4vl" + "commit": "6e3c6f2dcb759a76086adeeb1fdfe83e4f082482", + "sha256": "1l2vpyv22f77r2nd1bxf4mggmarb621dl7fnskp5hizhc5sfxi4f" } }, { @@ -15493,30 +15837,6 @@ "sha256": "0yspf51h5b7wbqvi9lbd22chyw799n5d05xdzl5axg0i33lzk7bq" } }, - { - "ename": "cpp-capf", - "commit": "7a456977e00708d2a0b764553048f3be11d96ebc", - "sha256": "0gc5grf9viiqsjwydyv3q3qgjwkla4n54d48dc7m6mq6fl8f3p23", - "fetcher": "git", - "url": "https://git.sr.ht/~zge/cpp-capf", - "unstable": { - "version": [ - 20200405, - 8 - ], - "commit": "0a4fd531e9e47369ff29d9f8583efd0bacd6bc50", - "sha256": "0q6kgh2mdx3pr8ywr3fhn96chvrf6zx6xxs2lyfviwmfq2c3pyph" - }, - "stable": { - "version": [ - 1, - 1, - 0 - ], - "commit": "bee4a7d5e9a52d955325396121a901a7679295b2", - "sha256": "0lk6q8jy53iqn9gzh7nd1qpfn5lmsc1h1qn8b6br82v0i1wd96gb" - } - }, { "ename": "cpputils-cmake", "commit": "9b84a159e97f7161d0705da5dd5e8c34ae5cb848", @@ -15789,14 +16109,14 @@ "repo": "bbatsov/crux", "unstable": { "version": [ - 20181108, - 827 + 20200817, + 1534 ], "deps": [ "seq" ], - "commit": "903db7b1a2052f4959d934cae26ec40a3f323ed4", - "sha256": "15wq0z9mnx60mi9xfkvgfgsfxdbiigwxr0wqabv3n2091dbzfas4" + "commit": "139eb6f1504b6885c86c658fd33c6d59bfac0a8c", + "sha256": "1889cn6pb8j55mi606nm1r6yywg64xa89s0hfbiksl4gx03yk2ip" }, "stable": { "version": [ @@ -15846,8 +16166,8 @@ 20191121, 1447 ], - "commit": "2428b016243e78a0312cf6b3ba6939e7169a1405", - "sha256": "0al65ldsbmm15h4y79i8avk63qq1y7fqzzad8p327z6d42zfm1qj" + "commit": "f9e4db16ff9fdc6a296363aa35d19cfb4926e472", + "sha256": "1x0lmb48bza2w52s15288hpbipafs87lj5lv0ldd1q4r9yv0i102" }, "stable": { "version": [ @@ -15900,11 +16220,11 @@ "repo": "josteink/csharp-mode", "unstable": { "version": [ - 20200402, - 919 + 20200728, + 1113 ], - "commit": "31124dba6833a4de144ca508edb90d5adfeec209", - "sha256": "0jrj2ayna8bzhi441hhszhch3na08iciqnd7fsqrm8xbwlrq7l2x" + "commit": "48851778e0f01a2b0395e054e418a1d8a1687a06", + "sha256": "0nikm2sn59ichbd3ikyhdn696fqj5ikzh79iniylza8gzmhxgddi" }, "stable": { "version": [ @@ -15924,8 +16244,8 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20200402, - 1509 + 20200518, + 1546 ], "deps": [ "dash", @@ -15933,8 +16253,8 @@ "multi", "shut-up" ], - "commit": "81bec1a71934a56f677f442e2c22fb6336b366c4", - "sha256": "1cxg2c8sz76b3ml8blb4f268xl6ql959p2hi5i4llil4fggw6df2" + "commit": "b6e8167c927c400c291daaa46a8aea132834b07c", + "sha256": "12k3z7azwbg11gs8sc8j6h0rb3zy3kw19z6l9ynxys4vzm9ln7dm" }, "stable": { "version": [ @@ -15959,11 +16279,11 @@ "repo": "omajid/csproj-mode", "unstable": { "version": [ - 20191012, - 49 + 20200801, + 1732 ], - "commit": "95e797af7cc30d4675247b64496c39b77b82e18e", - "sha256": "08cxkvq7k14lixavv7nwi5kmmxqvkgmqr4i46ihsgv7jcmxyy8gx" + "commit": "a7f0f4610c976a28c41b9b8299892f88b5d0336c", + "sha256": "0j8m7rhkf98zqkg6zydcks6qs4msw6vz51nbqya23hka2wpz7f81" } }, { @@ -16119,19 +16439,19 @@ "repo": "raxod502/ctrlf", "unstable": { "version": [ - 20200417, - 1549 + 20200802, + 1422 ], - "commit": "0bf26a5688b7f34695310100dc8c28381bfafe34", - "sha256": "1rknqa4qj3gfhlxfb8fqhdcy936sr0a2vi89rcqh5izl76zynisr" + "commit": "5a13161bb2ef2908dd5a00b3b6aa7b8dacfecd8a", + "sha256": "09gd2zi3wvg9vhaxz6y1zii0n8nxhffp9qyjsgswyzaa1j7dzv2i" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "41eecedf44f2235ce13e021906c4ce92deddefdc", - "sha256": "10gnhafas54zj3z9173h1g7b519ac4i26afclmw3w1pk6qyyb03z" + "commit": "b91f88a24c05408757ae9c9b5ce74d46d6ce20d8", + "sha256": "1ffcjf0ff0748gqipkklz6jmcj4f3blgzdcax93ql9ws8bmvlsdc" } }, { @@ -16301,6 +16621,21 @@ "sha256": "1yk5j8sb1li2zh1w5awwn83rhcwr1g492an4ajxkyikj3b7ljyfv" } }, + { + "ename": "currency-convert", + "commit": "cc9d610a29376bb1c24f77669ee6a05bcf60023d", + "sha256": "1i7hs3c7lwfnp7d9ql6bl5l0s9byfnc3n68gkk57zl5imsfhbgg1", + "fetcher": "github", + "repo": "lassik/emacs-currency-convert", + "unstable": { + "version": [ + 20200611, + 815 + ], + "commit": "a8bd12654c34380b87ac6ffece32f43b723b6f0f", + "sha256": "1np43lwrwfwnnff98230ahaqdifiq2nzd361ypsg8cp8qja4zwwi" + } + }, { "ename": "cursor-test", "commit": "6439f7561cfab4f6f3beb132d2a65e94b3deba9e", @@ -16369,19 +16704,19 @@ "repo": "n3mo/cyberpunk-theme.el", "unstable": { "version": [ - 20200115, - 1720 + 20200601, + 1632 ], - "commit": "07edefdec3956fba9076fe98cdc33df7bf617afc", - "sha256": "0swjbc61ii88j4myxfl5inn2j46jpf7giqd1kf0rjdyrc8zmj08h" + "commit": "cbd0d7193e69ff9e98262eb06aee3d27667ff5f5", + "sha256": "16nd57rwld78brcwx6vjib2v3l9xsiv7bxhbn2kilg1p75m3ngpx" }, "stable": { "version": [ 1, - 21 + 22 ], - "commit": "17f68f8ac70b712d2870ecb6adb3841b992074fa", - "sha256": "05mfgr9aj7knn7niadv9p6z3qrfpq2lbbi2wxxx62xywim9maw2y" + "commit": "81004fc774d373777d426926fc11abcf1e7ab334", + "sha256": "06nff38pcy5rgz13svkajsg0jjk73qy4a8m7p9f76yxcywxlgxlc" } }, { @@ -16443,8 +16778,8 @@ 20190713, 1339 ], - "commit": "78e3705cca65e1456ce26221690dca74c71735c1", - "sha256": "1mr0q76p7yw9wv48qwp66nw95c1k3x2yly1vfvdq3phbb8xr6g4q" + "commit": "763531d077d02a4a45c58332b8a8b8300c090678", + "sha256": "0q0wjybmasrv04r09linnb3n1m7g7qylaynzmmsdrk59fwzda3c2" }, "stable": { "version": [ @@ -16482,25 +16817,25 @@ 20190111, 2150 ], - "commit": "d6e6de9237bde72e7878f7b1fe0e58fdccd36dd2", - "sha256": "0lac5lqina90w8mdjkqa9qk4b52lmh6kibcph1xcjghqlw7agjfn" + "commit": "fcfd16c7467c31f255287a73f36cf66b32bc096c", + "sha256": "1yscd5q1qqw8xx4ds2pifpiyzhdnx0la5n50mxqjb3hlky7p48wh" }, "stable": { "version": [ 0, 29, - 17 + 21 ], - "commit": "b648b65ac39291aa546b58e44c8576869c351b66", - "sha256": "1kc172hh7nj8vlf781rr8jal4f7nl7dbh6csxj0qz4h4cyxrsl6z" + "commit": "976f5483c6df8570f34076ef25af7e7512dd9347", + "sha256": "1951kwfnngy2k7m3adqi17rb7f17yrr5n9zpvvmw7vxpfmca66ka" } }, { "ename": "czech-holidays", - "commit": "7224fd77b3d8a37fac2fe0cf832e3487513afd8c", - "sha256": "10c0zscbn7pr9xqdqksy4kh0cxjg9bhw8p4qzlk18fd4c8rhqn84", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0yp04d7czypxd22mvd84n4mgm6f4mfwmbzyfjiiqc7va60bbsis0", "fetcher": "github", - "repo": "hydandata/czech-holidays", + "repo": "chkhd/czech-holidays", "unstable": { "version": [ 20160113, @@ -16634,11 +16969,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20200507, - 2144 + 20200724, + 1525 ], - "commit": "06bcd1c00397a528cf8863b08e93e9a4b1032a57", - "sha256": "1y3xnya33qszxnn2kyzgk339gfxxq485b2fydhc32ayfav6hjfn7" + "commit": "5b458ce976acf948aa101a05994b68baf9b01846", + "sha256": "16496dr846whv056xq2y994csr55zjd8906brkav2zjhj7qy0w1r" } }, { @@ -16661,8 +16996,8 @@ "lcr", "s" ], - "commit": "7411904bfbde25cdb986e001ec682593dcb7c5e3", - "sha256": "0dhkp9g1cc1vlfk1fjncl3x3s7zd9a633ya85pjyxl70kky2qhnz" + "commit": "c516bc9e8f09e0f928de9a93e82acfb382636f5c", + "sha256": "16msp36vflq10w0h1hh6fy7z9gmqzhr61w0xali2jkb203v1pi6d" }, "stable": { "version": [ @@ -16690,8 +17025,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20200514, - 1655 + 20200814, + 1819 ], "deps": [ "bui", @@ -16700,15 +17035,16 @@ "f", "lsp-mode", "lsp-treemacs", + "posframe", "s" ], - "commit": "86fc65d525e30c0249e7ec6acac5e4e55cd7c3e2", - "sha256": "1jfrjrbjscjsa52wjvvmhcl4cqrw43wz4f34z8yzsxmsalgpf0nw" + "commit": "0c11dd205152f3b8712362e4bc8919def7f312a4", + "sha256": "1j7vxf42icl4nsnza91lp8l3lgrhn6y11xi9ql5lji5vfgj94mk6" }, "stable": { "version": [ 0, - 4 + 6 ], "deps": [ "bui", @@ -16717,10 +17053,11 @@ "f", "lsp-mode", "lsp-treemacs", + "posframe", "s" ], - "commit": "6cbf83784788dc2bba85a2baa1492b276252680c", - "sha256": "0w0a9x8lp1z05jv50biidj7vh4yfwkzfkmzwv04il028cy509yh0" + "commit": "35db94e81c592246675f300aaca4a70966b8a5fc", + "sha256": "1d4hdydfk86d4slibigyhwng8wx3vzyap8hp5iv0h7wr6868m4iv" } }, { @@ -16844,11 +17181,11 @@ "repo": "sjrmanning/darkokai", "unstable": { "version": [ - 20190603, - 1919 + 20200614, + 1452 ], - "commit": "a53815fbfb06604d7f51519c62cc11e507204a70", - "sha256": "01jd3y3kr4fplvdv32smbaxqa2dafs8vvp967jma7xm7r1frnbdw" + "commit": "5820aeddfc8c869ba840cc534eba776936656a66", + "sha256": "1bj7l5sh6nzxcw575kjcscjpjqmwlxhvi30qviqg4d6aymzkgr53" } }, { @@ -16955,11 +17292,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20200426, - 2244 + 20200803, + 1520 ], - "commit": "fe9bbc2414af645d255de68cd59cf0edd5d8548b", - "sha256": "048yglafray643mbjggcf516rymbckn5ypnkiq390h9bd0hz7qy8" + "commit": "b92ab5a39b987e4fe69317b9d9fda452300baf20", + "sha256": "0qxjl10883l5xq56d474visrp0m3hapj4qqvrpqnanppx22499mh" }, "stable": { "version": [ @@ -17003,21 +17340,21 @@ }, { "ename": "dash-docs", - "commit": "2f597ec52f4bf55a748231751b6e51328e8f6f59", - "sha256": "0vms4yr67l95rybvavd34a9gm57j7524swlf1c0rj8fff1wrmhn0", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0y5mq4cy9swp0xb51n3h57ra0ln3k0i6q2j7sslmwvaxi9a12zkg", "fetcher": "github", - "repo": "gilbertw1/dash-docs", + "repo": "dash-docs-el/dash-docs", "unstable": { "version": [ - 20190516, - 1702 + 20200516, + 1943 ], "deps": [ "async", "cl-lib" ], - "commit": "111fd9b97001f1ad887b45e5308a14ddd68ce70a", - "sha256": "0sckb7z0ylflva212bns7iq9mfnffgjghi0qspsbfwra35zb9xng" + "commit": "dafc8fc9f1ddb2e4e39e0b8d066c42d5d7ce8d06", + "sha256": "0n6d3mm43gj16v8kjjradcfik93wb89dsqnfcbskb28bvcamafid" } }, { @@ -17028,14 +17365,14 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20191109, - 1327 + 20200617, + 702 ], "deps": [ "dash" ], - "commit": "fe9bbc2414af645d255de68cd59cf0edd5d8548b", - "sha256": "048yglafray643mbjggcf516rymbckn5ypnkiq390h9bd0hz7qy8" + "commit": "b92ab5a39b987e4fe69317b9d9fda452300baf20", + "sha256": "0qxjl10883l5xq56d474visrp0m3hapj4qqvrpqnanppx22499mh" }, "stable": { "version": [ @@ -17245,26 +17582,26 @@ "repo": "doublep/datetime", "unstable": { "version": [ - 20200208, - 1629 + 20200621, + 2103 ], "deps": [ "extmap" ], - "commit": "0ae7addb2c46133393f59011b2aecc08de49b8d1", - "sha256": "1df6c5wsn6nwqvfx11d7x3wkjazri3946fwy0m9i6mx18yac38h0" + "commit": "c51eeb6df180f6c7d1676d1c0af78255bb0fdf95", + "sha256": "11w32jnkc596ybbhqih5d4rbvqk50cc6yyc9759acnzlqfd188xs" }, "stable": { "version": [ 0, 6, - 5 + 6 ], "deps": [ "extmap" ], - "commit": "4a480b66179f016100a582af170a76cda19c980a", - "sha256": "0j7k6157fvzl1395ybnrgcz697h6cjk9v445nnfi7q0l8vylbfvm" + "commit": "55297bf409f35dbc4bcd26b458b83e349ed11452", + "sha256": "0a3q667pybpmsjkbgf6287jwgpnx8brp5314wb8zbczw6ncygnbi" } }, { @@ -17367,15 +17704,15 @@ "repo": "matsievskiysv/display-buffer-control", "unstable": { "version": [ - 20200331, - 1826 + 20200527, + 1040 ], "deps": [ "cl-lib", "ht" ], - "commit": "17c6640a409424ec32fdb6bfd6065562e726bf1f", - "sha256": "18mamp8j3lmmcpcyfrwrqppxvyx7zirn30rwp4wndczpyapkwv4n" + "commit": "8aa8982e6afbe3820f60c3defbb3c8037e04eebe", + "sha256": "1zwxn76zh0ba5pa821g2aaqa1niz2l0g3wvnngspw04fla2scjb4" }, "stable": { "version": [ @@ -17398,15 +17735,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20200403, - 1308 + 20200816, + 1809 ], "deps": [ "ccc", "cdb" ], - "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", - "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" + "commit": "275a831be77573470309a78967734d2b6d10f218", + "sha256": "1a25aybavi6p7ijc4rbd8zyzgiim1m2xwm7yqfmsvrfzwgb29xal" } }, { @@ -17417,15 +17754,15 @@ "repo": "conao3/ddskk-posframe.el", "unstable": { "version": [ - 20191123, - 1632 + 20200812, + 917 ], "deps": [ "ddskk", "posframe" ], - "commit": "8a37953b37d397ba406bc308eb908bd966d34af6", - "sha256": "0qm2hb2m3gqzqblgy3d5krxkjbwyhiivzbjfiq9yygh5v729d3as" + "commit": "299493dd951e5a0b43b8213321e3dc0bac10f762", + "sha256": "1rsy0wjncxzjhis8jrxpxjh9l9pw0bngg1sb4dj5qvhsgszhawpn" }, "stable": { "version": [ @@ -17448,29 +17785,29 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20200411, - 652 + 20200803, + 606 ], "deps": [ "dash", "s", "spinner" ], - "commit": "bdcdf138cd71b0a5a80ca64b3bd68b7355084757", - "sha256": "1f0gbl2s6h945h1d4pg6cms3w2jwppqiddy3ja9b02ckcld1c227" + "commit": "9cd79e0d5dd6b77abca3e84e17d3e4e2e9aa5695", + "sha256": "1xq06af3lib8i2l0619ggzkzf00pb39pk0pd97i6dv7593y82c94" }, "stable": { "version": [ 0, - 8 + 9 ], "deps": [ "dash", "s", "spinner" ], - "commit": "094ad453e8bc0451a2c062d06db3079f003566d2", - "sha256": "18prsg8kyngz8f0l9kjhaz23al9fna2naazy324bjj0sn9yiqgd4" + "commit": "411a6973580b3503535ba58e405035bde2392903", + "sha256": "05xsf2axlxdsv8aivd7qyb0ipf9cp95y9f0sf0kaqpc1rn6i79ps" } }, { @@ -17812,25 +18149,26 @@ "repo": "liblit/demangle-mode", "unstable": { "version": [ - 20190528, - 306 + 20200621, + 2344 ], "deps": [ "cl-lib" ], - "commit": "06903d731dfde110e10b979dcc7624ef6dbb5ac8", - "sha256": "1j0fszql941kmbd3sf3rjynm4g01cgpkq20lvy9ayj3f2cy46ad4" + "commit": "697c1dbde93f164eac7ea0dc530d7e8b799272d6", + "sha256": "1ycbggyljbm5iawhk6i1cm21a3gzz1javab99c3abprkgmldmd5l" }, "stable": { "version": [ 1, - 3 + 3, + 2 ], "deps": [ "cl-lib" ], - "commit": "06903d731dfde110e10b979dcc7624ef6dbb5ac8", - "sha256": "1j0fszql941kmbd3sf3rjynm4g01cgpkq20lvy9ayj3f2cy46ad4" + "commit": "697c1dbde93f164eac7ea0dc530d7e8b799272d6", + "sha256": "1ycbggyljbm5iawhk6i1cm21a3gzz1javab99c3abprkgmldmd5l" } }, { @@ -17848,6 +18186,54 @@ "sha256": "1fcmrhm6h0j7jjw6kijrcacv628fy80ssxn6h5bilwmw0r4c7wm6" } }, + { + "ename": "deno-fmt", + "commit": "d6c3171a30886ecc4427938d847924023d1171ae", + "sha256": "15490s5xx58jc0irras3yaczx9s0v93fp7dnd6pba7zq149nqpy7", + "fetcher": "github", + "repo": "rclarey/deno-emacs", + "unstable": { + "version": [ + 20200520, + 1838 + ], + "commit": "3b193eef576e2c14fdcf350495955e6e8546dddd", + "sha256": "19fl389rgi6k8w84ggin54p9lpngwah96fxa6qf86y4rf9r2s9sh" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "ccae334361b9f83b687f040bcdfdc2a58c78059f", + "sha256": "1fm2ym36gv4p4i27hln706dnwr6rvrkkfgggbcz9rqfbphrsfqyx" + } + }, + { + "ename": "describe-hash", + "commit": "8c6c5cd96acd3deeb86503341dd9cd729e20185e", + "sha256": "0a26d46p46fypq3snh52grnjcgp6isb5k4qv2fm2m6ha2n7jdi5a", + "fetcher": "github", + "repo": "Junker/describe-hash", + "unstable": { + "version": [ + 20200718, + 1556 + ], + "commit": "18e69a932d5495c8439571ba8f2d2ee123d434b1", + "sha256": "1z2msiqwq7lqvyz6b2szyx1kpb6rv6irvwdcv36519mda0smhjlv" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "20dbbbea630055b2401f13a55fbb21216960dc46", + "sha256": "1mz5951yr27jnncz3c080jri7h3pb1k07i6w7wx5aj54kwpsg1d8" + } + }, { "ename": "describe-number", "commit": "d5ed9063f7e9f540bc90c1df4e3604d4af9bcfe5", @@ -18010,14 +18396,14 @@ "repo": "psibi/dhall-mode", "unstable": { "version": [ - 20191006, - 2324 + 20200716, + 2147 ], "deps": [ "reformatter" ], - "commit": "ef4d33debe224c6ba37e51a29b9dc8b74f20f1c2", - "sha256": "1232y2k4l3bsz90pgis78zxmrw7jv09dfaip21yc1w4vpxfyr384" + "commit": "484bcf8f78f1183ef45c3b04a362bb73690c6b9b", + "sha256": "1wggg8jlzg9rph4jhxp6yiri178rnasbv38838i973kjgqjxrl76" } }, { @@ -18197,14 +18583,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20200510, - 1540 + 20200701, + 2141 ], "deps": [ "cl-lib" ], - "commit": "ab2f4f0db9b0c3484db837252ce2dc75f4696b1d", - "sha256": "1pb1hp79b3r0nn7dclk3x0d0yrvx6nasgzwi1f918k9n7kzz7n4g" + "commit": "2281a89a3ddc6616073da6f190dda08d23b18ba6", + "sha256": "0lyx0hnc45k2f154p81dyjxrv5r53bwb6nfyhmy5avmp9cqdjd4d" }, "stable": { "version": [ @@ -18299,20 +18685,20 @@ "repo": "retroj/digistar-mode", "unstable": { "version": [ - 20200322, - 2109 + 20200819, + 1316 ], - "commit": "567fff3933f80f00f53610e7b08f75bb636b12c0", - "sha256": "0252lhkv2r8gy4512frhdh381xrf64nspvfm2hp7bkhz47dlrs7y" + "commit": "7f89372f27eff9e4db55bcf39f9cce3693d95bb2", + "sha256": "0s9q9f9bqr4w9ll0im65h95hxki3svanlikwxgq6m7p493s1q5j0" }, "stable": { "version": [ 0, - 6, - 1 + 9, + 0 ], - "commit": "8b350b7a143219b3f927cb3a1aeb16a299363f05", - "sha256": "1sxfzirl8kgzmq8l9l868yl92mz1r8yk58fnxf7p6z4y0pdlcqfg" + "commit": "343de0e0fe408f422a32e1bda22cafc2cc9900bb", + "sha256": "1cg38x7zd1n9zqsyg47famss91nqs7giqpgsi5qy10zp8y3i3l2c" } }, { @@ -18448,20 +18834,20 @@ "repo": "jcs-elpa/diminish-buffer", "unstable": { "version": [ - 20190921, - 1647 + 20200712, + 1355 ], - "commit": "0b1262f947b3ce03dca17879caec808a7d091bf4", - "sha256": "0yrzp7jdw04hj3ag3379l6kb9vpd1vcvqqf4z5yb3i28b5d7s136" + "commit": "2ef1e03458b9528a737814546aaee66067db649e", + "sha256": "0xlbgxl44iyffpg5r7md3a3l1b7gdj1vsfajww8g3rsna7d7n2wp" }, "stable": { "version": [ 0, 0, - 3 + 7 ], - "commit": "e137baa5e258a7938c713253fc9cc63f8674f841", - "sha256": "03068nyfb3cz0lz8z3qcwjlsvqaw9dfg3g8w13gmpwsmxaxlbv3i" + "commit": "cef452767c16c564dabc819b234fd3236fa97a51", + "sha256": "1hz3b44pbsy6ybicjs6i1fm2lai1ccxk46dk6fyd5bcb66s2lxzy" } }, { @@ -18554,8 +18940,8 @@ 20181228, 1422 ], - "commit": "09dbb769fe02f546da470369a12468ab4a0cceb2", - "sha256": "0j2dz4vy4i22185hhlwg2kprpis97xb12qvfdhvdcnz2vwy61sxa" + "commit": "52ce4ac88fa39a0ebdf732435fd831ea9a8d0764", + "sha256": "00br8f8rw0rrzmi3nvacwn14d122jw243z1izlsm8h8q95hh8f6l" }, "stable": { "version": [ @@ -18741,8 +19127,8 @@ "repo": "conao3/dired-git.el", "unstable": { "version": [ - 20200130, - 743 + 20200527, + 732 ], "deps": [ "all-the-icons", @@ -18750,8 +19136,8 @@ "async-await", "ppp" ], - "commit": "11938721f7202aa784cc493027e3a0ec2c0d39b5", - "sha256": "1b5vc9hc26cs1dq7lmvm5gly4h6ahpp0dnlbxi8p4mza12yhnrwi" + "commit": "82c93bdb2fe392b122f79d2e425c632f1c69ede3", + "sha256": "134f97zk7q2fvqphfgbjdbwlgrrnq51v0zrv6aw8c8n7fln5ap93" } }, { @@ -18880,6 +19266,30 @@ "sha256": "0rz8d9lj2zbipz6cwrlw2a3z9y4rybbmz73h73l1i7fjg9q1kqm4" } }, + { + "ename": "dired-lsi", + "commit": "b38502c7c37658b369ae004e1ce8a21c16d9e6de", + "sha256": "1q84krip2814b726ni4q2c8mhqqhr39wgvi6881mg96h624v9bxm", + "fetcher": "github", + "repo": "conao3/dired-lsi.el", + "unstable": { + "version": [ + 20200812, + 929 + ], + "commit": "0f4038c8b47f6cfc70f82062800700c14c9912c2", + "sha256": "1bb46cla9pa4697njyqlycjjxf63i0nsxppg9sb0762xsashyz9s" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "8170d7711254af18cbf1397d681fd331363a17d8", + "sha256": "1wgvd229cirfgn2vkjqwam4gnhs7jnp05c73vh8sckrzs3z51zc9" + } + }, { "ename": "dired-narrow", "commit": "8994330f90a925df17ae425ccdc87865df8e19cd", @@ -18918,6 +19328,36 @@ "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs" } }, + { + "ename": "dired-posframe", + "commit": "33ce7b7ad21c774ce7f1222af5a7d87219072fc1", + "sha256": "0jzbkafv0hv107412szs777ni3zxpn8fwlr5xm8pb89q3q5v7bcx", + "fetcher": "github", + "repo": "conao3/dired-posframe.el", + "unstable": { + "version": [ + 20200817, + 420 + ], + "deps": [ + "posframe" + ], + "commit": "1a21eb9ad956a0371dd3c9e1bec53407d685f705", + "sha256": "0k633fz5gccza5l3dydn55yg4r1a50bgcmxwxn89qc7cd8dck75v" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "posframe" + ], + "commit": "1a21eb9ad956a0371dd3c9e1bec53407d685f705", + "sha256": "0k633fz5gccza5l3dydn55yg4r1a50bgcmxwxn89qc7cd8dck75v" + } + }, { "ename": "dired-quick-sort", "commit": "4d278178128deb03a7b1d2e586dc38da2c7af857", @@ -18993,11 +19433,11 @@ "repo": "Vifon/dired-recent.el", "unstable": { "version": [ - 20191004, - 1500 + 20200712, + 716 ], - "commit": "5c799f96da08a0a3200cb5f609baf6c184f558ea", - "sha256": "0kc97v80rh10ksfw49pp551ay0b1apwi6ba66rwbyix50d7drimw" + "commit": "860e70b15983ac7164648de8148a529bdcdb8833", + "sha256": "1558cdinig8kx2hx2hkl3zxk001ijx53n5rjdm3367wllp0icyzf" } }, { @@ -19077,14 +19517,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20200409, - 801 + 20200711, + 2031 ], "deps": [ "dired-subtree" ], - "commit": "6e569c851418890c21fd37d03a62f85343aa0900", - "sha256": "0jxljpmzncbh9xb22y4xr9bzcxwijy68pn8chqsvqmivss5py7n9" + "commit": "da77919081d9a4e73c2df63542353319381e4f89", + "sha256": "05h56wdl2xvc8davnx83ypg20fl7wlks97cafa4r2yf141xjc05h" }, "stable": { "version": [ @@ -19200,8 +19640,8 @@ 20191227, 2028 ], - "commit": "83567d00affce66a4e501563eddd0bd436ac48d0", - "sha256": "11xkvywcfv27gr0dpgprmmnjqfxmxdmcpa2kq0vqnxrblg6ijwbr" + "commit": "cd052dfef602fe79d8dfbcf9f06e6da74412218b", + "sha256": "1zhnr4wkb0gifhf1gfssipanifaiixvz6wqlmscxyp7hdm8xjvad" }, "stable": { "version": [ @@ -19243,14 +19683,14 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20200319, - 2357 + 20200529, + 1305 ], "deps": [ "dash" ], - "commit": "1daf479b9b7600ce9681f2a980deae7fcb2f3d59", - "sha256": "08hwjd1xmq6hxab537zm11kwqhwnc1dfznfqzy66c4agl9z9a7vx" + "commit": "f5484b0fc33d4e5116612626294efb362ff9ecd4", + "sha256": "0772z4v2jjinqlqhrdcsvk912gdi0dkxag7q5nm0rnkx2pyk7ynw" }, "stable": { "version": [ @@ -19922,6 +20362,24 @@ "sha256": "1nz71g8pb19aqjcb4s94hhn6j30cc04q05kmwvcbxpjb11qqrv49" } }, + { + "ename": "dmacro", + "commit": "26d2f0ed0013dc0c03db5bae3119ae3522181ed2", + "sha256": "1n2gsml4ypasakxvq9q3h54kj5pl87m796si73700n5m4pgpp4hq", + "fetcher": "github", + "repo": "emacs-jp/dmacro", + "unstable": { + "version": [ + 20200803, + 633 + ], + "deps": [ + "cl-lib" + ], + "commit": "3480b97aaad9e65fa03c6a9d1a0a8111be1179f8", + "sha256": "1vb2jz4z4z9bhw76b1l08jf8gd3kq6c8zsxxvmlan87nwkj211wz" + } + }, { "ename": "dmenu", "commit": "98bcdd71a160b9c04f83cc5b939031c9e7b5eb59", @@ -19975,10 +20433,10 @@ }, { "ename": "docean", - "commit": "d4827fa337d7d25f2aaf67aca3081fbdaeacbcbf", - "sha256": "1mqmn2i9axnv5vnkg9gwfdjpzr6gxx4ia9mcdpm200ix297dg7x9", + "commit": "b38908bc1b759b14173ffb49ddeb040a9892cc0d", + "sha256": "0y45gk3jvjqpzk51098qbnrvhbvg0rzsdhd3fnw7pblsgzzqn9w6", "fetcher": "github", - "repo": "emacs-pe/docean.el", + "repo": "emacsorphanage/docean", "unstable": { "version": [ 20180605, @@ -20000,8 +20458,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20200508, - 1956 + 20200610, + 715 ], "deps": [ "dash", @@ -20011,8 +20469,8 @@ "tablist", "transient" ], - "commit": "01a04d0a295f3396833d0b6fa60cf24d52e1a89f", - "sha256": "0gh0h64dwn8v67q5569gifdjhzz5g4hfnsiqmg1nyq0nhvpp2b1c" + "commit": "3773112eea3fc99704b5ca50c1e9a3db2cb8e4f3", + "sha256": "0gi86ggjyfmfas7pswj7wirn5n7zs6rvb5b95nchnf4xf0nzwia1" }, "stable": { "version": [ @@ -20084,15 +20542,15 @@ "repo": "meqif/docker-compose-mode", "unstable": { "version": [ - 20180324, - 1752 + 20200730, + 1258 ], "deps": [ "dash", "yaml-mode" ], - "commit": "c9f131d2c90d652435d407fd36c40feebfed1dad", - "sha256": "0d5d46i6hplmy7q2ihbvcrnk9jrwa2mswgbf8yca3m4k44wgk6la" + "commit": "4c0c897fb0572e6b026b2a5ab9f2c76174be7a14", + "sha256": "01fj856511qjn5zw370axyz4imdnq3j5sqvbm8nkd71z1mz3dyv1" }, "stable": { "version": [ @@ -20171,11 +20629,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20200514, - 2215 + 20200815, + 2139 ], - "commit": "1bcec209e12200c9b93b0d95f61b964b5de4439c", - "sha256": "03lbsww77vq1wrpj94jdx62zmjjhir9i50g85l8yadlp9696zh3s" + "commit": "89eb2e6f1c2630c980bdf4c0430ba54722c9ee00", + "sha256": "0210jwk19b59hx7gi2ddy5ja9jndvmwmip8bh16g35qiscn2jwml" } }, { @@ -20290,16 +20748,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20200513, - 1103 + 20200819, + 117 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "2b308857677e983ca4eaedc36438ed94aadf9e65", - "sha256": "1c7mk26drz9yldy3kvcxxnabg8ph900pj1g029xhd1407x417vqc" + "commit": "ffbaaee832f1c97ff608bc4959b408997d959b7d", + "sha256": "0gvdlwa4w7s1igy8hqapng2s1k9ca6f76g68m5wzrfnx1z0zf7xl" }, "stable": { "version": [ @@ -20324,14 +20782,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20200514, - 2115 + 20200816, + 2044 ], "deps": [ "cl-lib" ], - "commit": "95463eac68fe88535d9342c7b4c2cbaae3c80950", - "sha256": "0ccq6gzahpsxsgmmd9dl16mfnz1n9sgn0ns62n03s3xgmf4ay3ap" + "commit": "24023de3c80c9f3afc3d012762d1ef0f8dbd326e", + "sha256": "0dwwpdwi0722xyap3xnm7034syb2fssfm4c6k5868k0344rvdkr8" }, "stable": { "version": [ @@ -20394,11 +20852,11 @@ "repo": "julienXX/dotnet.el", "unstable": { "version": [ - 20190415, - 1237 + 20200803, + 1032 ], - "commit": "932d776ed739d20d57dbd6ba49f61d1b450571fc", - "sha256": "1h7y9vz64bv4slz9mpd7cjyyaxgqk92jn11y5ycfyncq70wyd3j4" + "commit": "83ba1305d7895b03f3dffb2d3458b7ec75e6909f", + "sha256": "0x3kaq06wbrhqanfzj0m6yb5x1mvcjz3xg52kk7a7d4mr1h9xlip" } }, { @@ -20433,14 +20891,14 @@ "repo": "zk-phi/download-region", "unstable": { "version": [ - 20180124, - 133 + 20200816, + 1009 ], "deps": [ "cl-lib" ], - "commit": "bbba3ecd80818d5d940d41fe89a6e2ec5dd2c53c", - "sha256": "1cwlbdmdils5rzhjpc3fqjmd3dhalk6i7bxskpahbrr9xxfq0iw4" + "commit": "0dca3b224649bba80a7e9ecbf1d1b6f6be962455", + "sha256": "1yka864dzz8nxskcllqyxk04313hlyfc9a4p0apmk56q19fcpwgn" } }, { @@ -20466,6 +20924,21 @@ "sha256": "13czcxmmvy4g9ysfjr6lb91c0fqv1xv8ppd27wbfsrgxm3aaqimb" } }, + { + "ename": "doxy-graph-mode", + "commit": "4727d492a4867fc58bfdb8f57fff9313710bada8", + "sha256": "170r39cq25qkbng4i1rlpj3y7cvdqc0wxxr1rcxy15szjf7qw2dl", + "fetcher": "github", + "repo": "gustavopuche/doxy-graph-mode", + "unstable": { + "version": [ + 20200807, + 646 + ], + "commit": "2685c28e7a725614c23345195c3b85e505be2a1b", + "sha256": "0a4kil5v88wkki3r4jjc9ackv2z7ik0qgn4bdv75baskig8f8qjy" + } + }, { "ename": "dpaste", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -20560,11 +21033,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20200514, - 1527 + 20200814, + 1717 ], - "commit": "c162aff5025a7e9f55785d7177d59f4a3aa60183", - "sha256": "11wlrvrz3q054nqkdbd4525kh50cspszrgmqd74plah6jc95wpa3" + "commit": "3b7c2905d249f47bc9c09d304c16f72f217df2e0", + "sha256": "031c2md9zxk8bhb8v6s6i5s3qmlfxf5ks0nl7n6kyw1w31h6pww9" }, "stable": { "version": [ @@ -20772,8 +21245,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20200315, - 1931 + 20200816, + 2055 ], "deps": [ "cl-lib", @@ -20781,8 +21254,8 @@ "s", "seq" ], - "commit": "d21a5b7958da058bb53d36fe9234089409f62c5e", - "sha256": "0w46yr5d108z2pipvh449p15qnm6mnix21pbnq3alczilzxzf9lw" + "commit": "a0e789919f71ff4ab752432fe9e295f9f44c7b12", + "sha256": "029xsdasbrvkg8w2ykgy6iq618cdjkr4gkp4l094na35jpv96yca" } }, { @@ -20890,16 +21363,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20200513, - 2014 + 20200815, + 1537 ], "deps": [ "dash", "popup", "s" ], - "commit": "194bfdbe305e21d8e6d29893d449686c85273207", - "sha256": "0lz5kajhkqh18xyg07bshvl0v5j5g5xj4q8p6min1mapm8shnv2i" + "commit": "0d74b2f2aa834b602e91d99e9cb23197a389f042", + "sha256": "01jwyridywbihspan8zrrfpxl4gl275z8l23swhczg0bcjq1x8g8" }, "stable": { "version": [ @@ -20943,17 +21416,17 @@ 20191016, 1241 ], - "commit": "e5bec1a57fd4ebeedc848e76e0cf991db7e22fd0", - "sha256": "091z6p93sv3aqf7bcw41nwh4kvvpsfncjny2fwcv3vv7zlyj2px2" + "commit": "26078df94ea16e2fc9221a84c5d42f2fe024074b", + "sha256": "1pvqrijx5bmnbvwk4pz6j1ldir5zi95ixbfrqki284qcgq28krd1" }, "stable": { "version": [ 2, - 5, - 1 + 7, + 0 ], - "commit": "4d1ef91df8c732d516ddea4a953f5956e99692b2", - "sha256": "1ljhwsyl277lvmii4v439dafyc0y2l2jf2ds5zivpbrh168851di" + "commit": "85b4e16bd6c310811fcc206d3d0cbb391eb8b81c", + "sha256": "19fn7ywx13j1hc600pccyghz2izjy26bzwaqjynn7swlbkc96ymz" } }, { @@ -20994,14 +21467,14 @@ "repo": "harsman/dyalog-mode", "unstable": { "version": [ - 20200301, - 1149 + 20200817, + 737 ], "deps": [ "cl-lib" ], - "commit": "5dceeefaed6fbedb680bb6cc9aba14fb5f890310", - "sha256": "137kgixsdkw2rqj1402gc31gd6hdbna7bx5j1xxhyiig2x2b3aqx" + "commit": "5d703d91f90ddebdfb4cae1b45c476aec5976313", + "sha256": "1vf88vywb4cjfndc4jd185fdqjydd7ckbf1n2qsi9w3k8940q2pq" } }, { @@ -21012,11 +21485,11 @@ "repo": "dylan-lang/dylan-mode", "unstable": { "version": [ - 20200425, - 1347 + 20200607, + 1911 ], - "commit": "64f3aed546315c766331c69be3c7e78c7da6c333", - "sha256": "1r63gxy1hlij1ck570agvj39rynby6kna5kcfhrr0imi7hl98mzz" + "commit": "bdccb252dffa99a3a55dce446cc4a7ff4a8dc089", + "sha256": "09dgjwdsni936chj2b8r607bqa2vcav66mb49j5vi2lxiw60sg8m" } }, { @@ -21053,6 +21526,21 @@ "sha256": "1ppwlill1z4vqd566h9zi6zx5jb7hggmnmqrga84j5n7fwqvgz7f" } }, + { + "ename": "dynamic-graphs", + "commit": "8c0101a98dcddd7135478a218f4b0a5fd6d4fe0c", + "sha256": "188w7srdrfzri1l7y68b6vhrwn0yxx8578v6p234p8bsgmlwzan9", + "fetcher": "github", + "repo": "zellerin/dynamic-graphs", + "unstable": { + "version": [ + 20200818, + 442 + ], + "commit": "10dffcbc4011647c16e8d65d05856e043de1865d", + "sha256": "08f3f4bwryyhvj8yp2y2v3fppl6drd4rq3wyx48mxwkiw6z1db4r" + } + }, { "ename": "dynamic-ruler", "commit": "926c43867120db429807ff5aaacc8af65a1738c8", @@ -21196,28 +21684,28 @@ "repo": "aki2o/e2wm-direx", "unstable": { "version": [ - 20170509, - 1301 + 20200805, + 1414 ], "deps": [ "direx", "e2wm" ], - "commit": "b47f19d15436cc28233a812a1150689f61d11046", - "sha256": "0lihc02b0792kk61vcmhi0jwb7c4w2hi19g6a0q1598b3rci82nf" + "commit": "5672bc44d8e5cea6bc3b84c3b58e522050ffae0e", + "sha256": "18fj8qn4b6f13vb3n6j5cwcgdh2ypnvaqyjszmh321zmwxq08nd5" }, "stable": { "version": [ 0, 0, - 5 + 7 ], "deps": [ "direx", "e2wm" ], - "commit": "f319625b56c44e601af7c17fc6dbb88e5d70ebae", - "sha256": "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia" + "commit": "5672bc44d8e5cea6bc3b84c3b58e522050ffae0e", + "sha256": "18fj8qn4b6f13vb3n6j5cwcgdh2ypnvaqyjszmh321zmwxq08nd5" } }, { @@ -21279,26 +21767,26 @@ "repo": "aki2o/e2wm-sww", "unstable": { "version": [ - 20140524, - 858 + 20200805, + 1339 ], "deps": [ "e2wm" ], - "commit": "1063f9854bd34db5ac771cd1036cecc89834729d", - "sha256": "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g" + "commit": "8926d0c70be05c7b4ef821e22e411e8813973687", + "sha256": "0941mfz6a398jq5cb8kgr5cikzkzrpjnfbbx2f9c1yy9wj1awklk" }, "stable": { "version": [ 0, 0, - 2 + 3 ], "deps": [ "e2wm" ], - "commit": "1063f9854bd34db5ac771cd1036cecc89834729d", - "sha256": "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g" + "commit": "8926d0c70be05c7b4ef821e22e411e8813973687", + "sha256": "0941mfz6a398jq5cb8kgr5cikzkzrpjnfbbx2f9c1yy9wj1awklk" } }, { @@ -21343,26 +21831,26 @@ "repo": "redguardtoo/eacl", "unstable": { "version": [ - 20200407, - 756 + 20200612, + 736 ], "deps": [ "ivy" ], - "commit": "47b839f305e63e119b6a554497cd4b99512e8e00", - "sha256": "1gdppgjdapjx25ns5ja1lnnypq26m8w9s5vbnfg7p0j64kd2mdwh" + "commit": "0517e60d8d36838df1a90498f2d75ded814d75e4", + "sha256": "0vri0dmq6w58crjwhpi9r1r2i6nqr2q69arqagbwvs4hrxm79z1k" }, "stable": { "version": [ 2, 0, - 2 + 3 ], "deps": [ "ivy" ], - "commit": "e074682aa18bed4fd68068a48ccaa970ae6d4e33", - "sha256": "1kb14p8004kaqxq765nv5rn8xniw53g4zafcy9wkv9b88bixb7q9" + "commit": "0517e60d8d36838df1a90498f2d75ded814d75e4", + "sha256": "0vri0dmq6w58crjwhpi9r1r2i6nqr2q69arqagbwvs4hrxm79z1k" } }, { @@ -21403,28 +21891,28 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20200427, - 1901 + 20200811, + 842 ], "deps": [ "popup", "request" ], - "commit": "2dfdcdbcd8eb81c3fd631372d7dceb4f432d5f1e", - "sha256": "19j7r14qxh2cl4zi4vssbbqjhp6r53gjavnwyihk52llxcgrxrr7" + "commit": "cc4ba71c07dd8b3a66c996e7b31fa7e3e9870ce2", + "sha256": "1haias0k1gia0jfjiviy222jmbv4zf1ddsv00z9h476g8h303w7b" }, "stable": { "version": [ 3, 9, - 46 + 47 ], "deps": [ "popup", "request" ], - "commit": "9e923e32f21134bb89196a169f5a3f2aecfe45cb", - "sha256": "1r8s83dc3ibp687fywfsgs2kc95j2s153ncrgxldqvsp24k1wm8x" + "commit": "cc4ba71c07dd8b3a66c996e7b31fa7e3e9870ce2", + "sha256": "1haias0k1gia0jfjiviy222jmbv4zf1ddsv00z9h476g8h303w7b" } }, { @@ -21435,26 +21923,26 @@ "repo": "masasam/emacs-easy-jekyll", "unstable": { "version": [ - 20200506, - 117 + 20200811, + 859 ], "deps": [ "request" ], - "commit": "d114ed4ef4470ea429d2dd291a409bc406d0dda0", - "sha256": "11wkvrl19c0z2icig2a7i6ccplzgx7j4jjlx97lq41vx679xxiwp" + "commit": "8ecdb70a4f957fbd0b81dc0c5726edc136513b34", + "sha256": "15ps0b8ik3bsxv96jb0cbbgiwx0z601m56cj83yp7r5zyphbm2n5" }, "stable": { "version": [ 2, 4, - 26 + 27 ], "deps": [ "request" ], - "commit": "d114ed4ef4470ea429d2dd291a409bc406d0dda0", - "sha256": "11wkvrl19c0z2icig2a7i6ccplzgx7j4jjlx97lq41vx679xxiwp" + "commit": "8ecdb70a4f957fbd0b81dc0c5726edc136513b34", + "sha256": "15ps0b8ik3bsxv96jb0cbbgiwx0z601m56cj83yp7r5zyphbm2n5" } }, { @@ -21540,36 +22028,6 @@ "sha256": "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq" } }, - { - "ename": "ebal", - "commit": "629aa451162a0085488caad4052a56366b7ce392", - "sha256": "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg", - "fetcher": "github", - "repo": "mrkkrp/ebal", - "unstable": { - "version": [ - 20180101, - 616 - ], - "deps": [ - "f" - ], - "commit": "1740118125ae7aa6ba82d36e1fe0e69065a6fcaa", - "sha256": "1i5r8m34zf7ya1kzgm8hsx707phq5smf2x6y2a1ykbnfkk39gmbf" - }, - "stable": { - "version": [ - 0, - 3, - 1 - ], - "deps": [ - "f" - ], - "commit": "4d19565516785348894c4911e757e33a270b3efd", - "sha256": "1wj9h8ypi70az387c7pcrpc59lpf89dkp2q4df2ighxw3l648mb7" - } - }, { "ename": "ebf", "commit": "22e2f6383f2a7a01778c0524af19a68af57796ae", @@ -21612,26 +22070,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20200513, - 2326 + 20200628, + 2157 ], "deps": [ "parsebib" ], - "commit": "6499e4a67f2772a29128864a8f7606a78fb73b45", - "sha256": "0css7pfyqz834f8awc632mwlfcph3mrsqwbxvrlaw59bc3hgxjdv" + "commit": "805c2e30e30f9f211f4aa443263d1c3971935295", + "sha256": "0kgw049wph40kk0kin7zxj44ghd1s1pr8zpl1gli4zic02vzcaga" }, "stable": { "version": [ 2, - 23, + 25, 1 ], "deps": [ "parsebib" ], - "commit": "6499e4a67f2772a29128864a8f7606a78fb73b45", - "sha256": "0css7pfyqz834f8awc632mwlfcph3mrsqwbxvrlaw59bc3hgxjdv" + "commit": "bd258c1f364a8c96b0026fdc3de75117ca4e324a", + "sha256": "1mvsa2a761va74ybxprdvmhkzhjl6axn1ngjfhrrljqgsvqgyjwk" } }, { @@ -21979,20 +22437,20 @@ "repo": "Fanael/edit-indirect", "unstable": { "version": [ - 20191103, - 1013 + 20200805, + 1840 ], - "commit": "935ded353b9ed3da67bc61abf245c21b58d88864", - "sha256": "0yghm0l4wickhqc29ykjjg98xb91djr1f6n6ihc7ymsv0yhw5wc4" + "commit": "bdc8f542fe8430ba55f9a24a7910639d4c434422", + "sha256": "189nvmlkki1jfszm9i0crbb1p4nzgmbly0wpvpg0i8vmw7vrpl40" }, "stable": { "version": [ 0, 1, - 5 + 6 ], - "commit": "032ac0ec690d4999d564fd882588c7a197efe8dd", - "sha256": "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r" + "commit": "bdc8f542fe8430ba55f9a24a7910639d4c434422", + "sha256": "189nvmlkki1jfszm9i0crbb1p4nzgmbly0wpvpg0i8vmw7vrpl40" } }, { @@ -22048,8 +22506,8 @@ 20181016, 1125 ], - "commit": "43f180809fcbc7e104f96f95608a97c4c2a2c8b3", - "sha256": "0v9nn85pw7lll516p8bb9y6dk44rj2h88ky4zz9wgkrppjs7qdb0" + "commit": "5f6352f98f9795ea0423cb46e9b01dc54e523ab1", + "sha256": "0khf51sbjkqij36l00lby004ca9nb67xvksjnbafzp2bvwcs356j" }, "stable": { "version": [ @@ -22086,14 +22544,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20200212, - 739 + 20200730, + 1329 ], "deps": [ "cl-lib" ], - "commit": "19de0ec1bac67c5a76a4dd3d8ffe6c5411ace1af", - "sha256": "187vcflpbv4zpbzdsxw5i6c9j6dva7v3d3skh3b6wybjzh6ib4jf" + "commit": "9bc1343ce8bd2cc84bf04b58a053b7ec700244c0", + "sha256": "10zaxq356fq6y4h1g9gxj8sja4k4g5z9g2xggw0yy4dbx1mmw7n1" }, "stable": { "version": [ @@ -22232,8 +22690,8 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20200413, - 1929 + 20200710, + 1424 ], "deps": [ "auto-complete", @@ -22244,8 +22702,8 @@ "popup", "s" ], - "commit": "e797eb57ede8332205b3abd7d7adeccbb319ad29", - "sha256": "1101yx1dg82msw0bbji9hpnzq029ghh9ca4a6588fik8sn3v786j" + "commit": "eda93f89c198db6aa3590d8e812ed797c9b3e305", + "sha256": "0vpvil86j6ahfq9f123ampba93h7pgnlvg14y9a9fpwig1hvqm60" }, "stable": { "version": [ @@ -22408,17 +22866,17 @@ 20200107, 2333 ], - "commit": "1809fd4c001a4ae2fa5e2b721b67c1059fb8e9b8", - "sha256": "0ssh0chavas524jwj3r9bywkd8rgnbjz4xcgxhbnjfcl786pmyw7" + "commit": "54b0f51a103e4c12515cd814e3bc6be67c3da966", + "sha256": "1yvf4qns69smcg6vbb6l25g8dnai5da827qpd8f6pg3qp8w1q5wc" }, "stable": { "version": [ 4, 0, - 0 + 3 ], - "commit": "400465de0ece5b03607895bd1c83b1cfae34079a", - "sha256": "196jn2cmyjvjai3nbij5kk64djz908ch4kddi4qdpkighwslkh2i" + "commit": "64665dba315f5b70b3ce2045a42f6059d7b858de", + "sha256": "0z41p0aqz4bqvx885vy7hqny8ni8q2nrk7bhwazwymnhnzq52bjp" } }, { @@ -22429,18 +22887,18 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20200516, - 1013 + 20200816, + 1810 ], "deps": [ "eldoc", "flymake", "jsonrpc", - "package", + "project", "xref" ], - "commit": "bf75312b8e7ea5136905d7a55a6d705b51b2b6c9", - "sha256": "1xbisdraj04jns0vcpcvnqqiwib3b8jpbian1nnmllvscfdz6c7l" + "commit": "5f873d288e1c5434c1640bef03555ed056cb0d35", + "sha256": "1rdfrw6qcbkl7bnjsfrzz6ndbr6lk0s4ldyqwv48k1nvlk9jc796" }, "stable": { "version": [ @@ -22463,28 +22921,28 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20200514, - 2034 + 20200726, + 741 ], "deps": [ "eglot", "julia-mode" ], - "commit": "844f12d881a3305d319e959b032e01501be1e8ae", - "sha256": "0na70zn0s09nihzki6kfnb5hc2j2wqfffj50kwdzjfs53m4sl1s7" + "commit": "84cff9d6ef1643f3eac6c9d620cc1e380a9847d9", + "sha256": "1g3k3ym0hx97dk3sv1kz3vq0p1s1zw6r34ynhwm31y954miwyvm4" }, "stable": { "version": [ 2, - 0, + 1, 0 ], "deps": [ "eglot", "julia-mode" ], - "commit": "844f12d881a3305d319e959b032e01501be1e8ae", - "sha256": "0na70zn0s09nihzki6kfnb5hc2j2wqfffj50kwdzjfs53m4sl1s7" + "commit": "84cff9d6ef1643f3eac6c9d620cc1e380a9847d9", + "sha256": "1g3k3ym0hx97dk3sv1kz3vq0p1s1zw6r34ynhwm31y954miwyvm4" } }, { @@ -22495,19 +22953,18 @@ "repo": "emacs-china/EGO", "unstable": { "version": [ - 20180301, - 104 + 20200803, + 1101 ], "deps": [ "dash", "ht", "htmlize", "mustache", - "org", - "simple-httpd" + "org" ], - "commit": "719809679c1a60887735db41abae53b61f08ef59", - "sha256": "10f179kl53la4dyikzl1xysccx4gk04skzwaw3w1pgr8f5fjppxc" + "commit": "211c4cb2af2582849d9df984fb2346deecaf79be", + "sha256": "0sk3mn1gxb826x69s6hlkrzgj8irs9sh3anfazryibw7i61p9cbj" } }, { @@ -22518,11 +22975,11 @@ "url": "https://forge.tedomum.net/eide/eide.git", "unstable": { "version": [ - 20200507, - 2238 + 20200702, + 2009 ], - "commit": "f5f858e238c279a134d34a4ff334428dd811ca07", - "sha256": "1y87cbzngn29svx94mqvsk74j7vk912fx29b4fi26hj6myvki1nx" + "commit": "b1dfdaf06b00409250135cb1000beac60c7f659b", + "sha256": "17wzffhqnd65c94qcxlwmb4qyw44kq39hvkqlwpxx8g4wj0lql3j" }, "stable": { "version": [ @@ -22557,8 +23014,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20200514, - 2040 + 20200812, + 230 ], "deps": [ "anaphora", @@ -22567,10 +23024,11 @@ "exec-path-from-shell", "polymode", "request", - "websocket" + "websocket", + "with-editor" ], - "commit": "ec3aa36bf37a78e99723563e38f81ee24b855524", - "sha256": "0pr14dv4bbxgpki8kd1z9i07x1khb0v2wr82483qf3hhqafv6lrm" + "commit": "99a4718f50538a439a2a3f2011d1aa97246e259b", + "sha256": "0qi012pbyj1zdj7h0y3r26ijf80046827ln079v1q9hgkz9ipaam" }, "stable": { "version": [ @@ -22644,34 +23102,32 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20200516, - 1604 + 20200809, + 1221 ], "deps": [ - "auto-complete", "clomacs", "dash", "direx", "spinner" ], - "commit": "b02e0bbc6df08a4ae44d16ac57886e56cfb8095d", - "sha256": "0vs4kcdval7klzbs21jq2rcxs013r7rskpxgjc7lrq1qrsgyyq9d" + "commit": "c99825ce67c142b38a8d3edec444593e29d48b44", + "sha256": "0fwkaz5cacfmgchl0xyb82bqc20fbvl1kk14m5mvydhjqaam7r45" }, "stable": { "version": [ 0, - 3, - 3 + 4, + 1 ], "deps": [ - "auto-complete", "clomacs", "dash", "direx", "spinner" ], - "commit": "ad6473ba40bcc0b300baa83eda13523b9cd2cd2c", - "sha256": "18ik1r18yc904048l1yalqm9m7ll4vln73q483yqqywda9hm8saq" + "commit": "ddbae7be2aed9c273d9d570c542936f1faa3088f", + "sha256": "1gvbw4iqnsbs6fj713gjd9s0l1xxqmvq98ixsh59p0wh68a1nhhl" } }, { @@ -22738,8 +23194,8 @@ 20181006, 225 ], - "commit": "3f746410a9024af60a1368d02c2c0d9edd93ab66", - "sha256": "03zvxdbqjzkr6js8g21dzdiqsbmbhphij8jz98ian7gvzi8ady23" + "commit": "3b5e48ba4a4dca5c91610e2eb607a8bbb725a6ab", + "sha256": "1kx0c3wgij66hhryb9ggf8c975406vb9a9m6z4yrsrrisyc2ljgk" }, "stable": { "version": [ @@ -22765,8 +23221,8 @@ "anaphora", "cl-lib" ], - "commit": "65c48ec47fea84d16ff2d1ef7015b4d220fcf5ff", - "sha256": "0awx7ry9xnzw7n9aqiy7i2lfj453jkj15wfy38nlgw9qxv9bri9j" + "commit": "747acd434aa6f50a599efe5f6e96dea2dfed79d6", + "sha256": "0nyllimsrghwd1vkmal1c58g1nx4djyvjfmylhqidx4h79gkryxm" }, "stable": { "version": [ @@ -22800,8 +23256,8 @@ "dash", "el-init" ], - "commit": "8a2ab457586962bde0da2a1c56a37ce6363ae690", - "sha256": "08ni8hmszryf75h1c13q3yrrxgh41as6r8r4vq4gih0jbiz0wx8w" + "commit": "7c0169d356d6c007317e253e5776e1e48a60d6ad", + "sha256": "0w2mxppkx6306kyxaw00fzv8q745iklcm41iswmflr2585h2adnq" }, "stable": { "version": [ @@ -22852,37 +23308,20 @@ "repo": "raxod502/el-patch", "unstable": { "version": [ - 20200404, - 1548 + 20200716, + 1428 ], - "commit": "46d22e7dfc7f9d8e9cbf5042d365f60b1fc7da0f", - "sha256": "1xjnzy7gp4sqd0mj3zkw741bj7kbpbdgcqxs6ppvlmr5i0adx2hh" + "commit": "ff1951d776f80d2fd4a0cd9a0c930182fbb57b3c", + "sha256": "1f783xapqa6zigg0gqayxsf8lfkldng8r4ns9x04rqg9vmhkxmk0" }, "stable": { "version": [ 2, - 3 + 3, + 1 ], - "commit": "278a27477a4d7032fe06bb56ab01701cb10df808", - "sha256": "15bwjl6377ngg3qwn1g8wc2wi61pcm6xlhjzj28ap5vz7y7zxps2" - } - }, - { - "ename": "el-pocket", - "commit": "ef362a76a3881c7596dcc2639df588227b3713c0", - "sha256": "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw", - "fetcher": "github", - "repo": "pterygota/el-pocket", - "unstable": { - "version": [ - 20170922, - 1249 - ], - "deps": [ - "web" - ], - "commit": "a80abfb67efe68ada1d7d0a73aecee57e763baaa", - "sha256": "0q4nsgqpjmmxml5pcb6im1askk6q7c3ykzv6fgf1w8jgkvdifa6f" + "commit": "ff1951d776f80d2fd4a0cd9a0c930182fbb57b3c", + "sha256": "1f783xapqa6zigg0gqayxsf8lfkldng8r4ns9x04rqg9vmhkxmk0" } }, { @@ -23080,11 +23519,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20200322, - 2027 + 20200611, + 2314 ], - "commit": "94b0afb9bac32fa72354517347646166d6bec986", - "sha256": "11gj67d83hx9wfjf4j277jy8jxf97i6bd9r8r057v4i8301qh91p" + "commit": "01b26d1af2f33a7c7c5a1c24d8bfb6d40115a7b0", + "sha256": "1lj87zfcvmzm34rlq5s4y4x2nwckwg5qxlhlgl4qry3bf16bmkcf" } }, { @@ -23128,20 +23567,20 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20200515, - 1905 + 20200815, + 2332 ], - "commit": "a76712621a4851fdb0bc3d76f454898afefedf6e", - "sha256": "1jc6l0pcsyv9wgp58ij9wvjj4x4a3zz4svsna2aq86pf8bbbyng9" + "commit": "ae353301c15b15930b0a83807275ed58a3be82e6", + "sha256": "0l1ac2ll2127wn6nlrpvxzk38xb74rb8bmp6c5sjh79hnjr04zh5" }, "stable": { "version": [ 0, - 3, - 2 + 6, + 1 ], - "commit": "f345065592b4bc9a5173b44e12a74400335d4e49", - "sha256": "0gf7sfdrnyndgbkpm2pz3056y0d06iy6pwhr63sbm7g4x79j9yjd" + "commit": "8440e797f0dcaf7bf6da2a7573a7b07c4ea9da82", + "sha256": "16g68lgd5lp3rdskym4xnkvsm6953xgx48yah8zs5fpk4qny212r" } }, { @@ -23214,15 +23653,15 @@ "repo": "stardiviner/eldoc-overlay", "unstable": { "version": [ - 20200328, - 619 + 20200715, + 1214 ], "deps": [ "inline-docs", "quick-peek" ], - "commit": "ec318acb564ac5679285b51b7d979410d393fac9", - "sha256": "0dx1b9d7zyqcwsnhl18hyrkmrc0zy68zwhp81d43fw84gjb4jcx8" + "commit": "563ca285a510d1cbd5129cc3a8f8a3cdded065de", + "sha256": "1llh93rlvzsl9m2f7gprb5rbbf2ghysyn1balb8clb64hq98gjyb" } }, { @@ -23239,8 +23678,8 @@ "deps": [ "stan-mode" ], - "commit": "599a0440086c660e6823622b35058f6d2d6d9637", - "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" + "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e", + "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0" }, "stable": { "version": [ @@ -23309,11 +23748,11 @@ "repo": "xwl/electric-spacing", "unstable": { "version": [ - 20200223, - 838 + 20200607, + 1405 ], - "commit": "83568a7f2f0e2f0983e348b6e4adc0fc75b98adf", - "sha256": "03710cr8jvr22c9j3c266460aln26j7y9vqj6qm3mmzhsr3v7q2c" + "commit": "f039011edb922cdc56c1d2bd0e49bb4575c35ab3", + "sha256": "1qfjk928y8bnx2ksciv0f0ackahj78x3qsr84m9qcvsvlg9cql5p" } }, { @@ -23363,11 +23802,11 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20200209, - 1942 + 20200716, + 1921 ], - "commit": "af31f80552f7d081b985d729143a804ad47c0734", - "sha256": "13n0yhw9si1cp31m15andwkqan7vmmny5mxzj09cykjd1bk2rpan" + "commit": "8fb09ad75f2ff7d6f7d8b8d1ac65b9be873cc31d", + "sha256": "0rs32xvpwky37y18wr6maqbkncijia7yvmbrsngbhgdpzdvijp7v" }, "stable": { "version": [ @@ -23432,28 +23871,28 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20200503, - 304 + 20200526, + 341 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "2df5237dfa8c51a151bcf9d8fb6746447a8aa3d0", - "sha256": "0n4f621787v3gqfyqg7f37z6nxjqxl0bxxnl5j3gxqrif0ml2725" + "commit": "c5a928d4217060a49444d80d2fd54282d32a12a5", + "sha256": "0zky2iqkpckaq8c1fyhw9drdnmnyapix8jw46p6jvspljb9vwzkb" }, "stable": { "version": [ 0, 7, - 6 + 8 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "fc0beb392386b8ed387e52e7e100354b8549fd7e", - "sha256": "1kh524fkhsq3l9w0dv12b8shdyqfvnkhdr19xzfbhzw10hfdl5js" + "commit": "c5a928d4217060a49444d80d2fd54282d32a12a5", + "sha256": "0zky2iqkpckaq8c1fyhw9drdnmnyapix8jw46p6jvspljb9vwzkb" } }, { @@ -23464,15 +23903,15 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20200328, - 1855 + 20200810, + 1547 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "916c47b3590b2ff3c5075dcc1def4b36a4b14947", - "sha256": "1vhchbyy3c79cgvdz12wnryklr5g1bwh02d604zj2wca3b0199w4" + "commit": "0551993338c5d41386eccd47cc2f1b382a1b29c3", + "sha256": "0hgdsvi4l9k978kcx8gmbqkdi7q3qj70cg697fqky0cmcpykhcbq" }, "stable": { "version": [ @@ -23503,8 +23942,8 @@ "elfeed", "simple-httpd" ], - "commit": "af31f80552f7d081b985d729143a804ad47c0734", - "sha256": "13n0yhw9si1cp31m15andwkqan7vmmny5mxzj09cykjd1bk2rpan" + "commit": "8fb09ad75f2ff7d6f7d8b8d1ac65b9be873cc31d", + "sha256": "0rs32xvpwky37y18wr6maqbkncijia7yvmbrsngbhgdpzdvijp7v" }, "stable": { "version": [ @@ -23573,16 +24012,16 @@ "repo": "Wilfred/elisp-def", "unstable": { "version": [ - 20180806, - 723 + 20200528, + 633 ], "deps": [ "dash", "f", "s" ], - "commit": "368b04da68783601b52e3169312183381871cf9e", - "sha256": "0l1kj7xd4332xk821z24c14lhkpcmca5gmivpb8shlk10cvjvxjw" + "commit": "da1f76391ac0d277e3c5758203e0150f6bae0beb", + "sha256": "17zpil3zgi2j7a63lv5vas3ad6bvh45d9vnf2nb37z3id62rjdkd" }, "stable": { "version": [ @@ -23606,11 +24045,11 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20200427, - 151 + 20200606, + 949 ], - "commit": "4cd55a30d5dbd8d36a0e6f87261c4fef17fc6db0", - "sha256": "0g1wnx37pdl3zxmym4fnqvhlw9hj6aw51vpxa18fpsh7fadfjjdp" + "commit": "8c9748134f7c017ae1536dbd0b76434afb52e64d", + "sha256": "15gyhqnlppsswmmcknc3yfm6p7s2y06r2py656vh5vwhah7pcqxj" }, "stable": { "version": [ @@ -23645,14 +24084,14 @@ "repo": "mtekman/elisp-depmap.el", "unstable": { "version": [ - 20200413, - 1215 + 20200714, + 1630 ], "deps": [ "dash" ], - "commit": "e47616c968dd82e30cb10961452e2b46c7900163", - "sha256": "1jpqdi15lvyd48jsbndlallnjc8bkmv0mxwyf51m483vz9v8nn2i" + "commit": "98676e6ffcc4efb70cc991e659c79cb599b01bc7", + "sha256": "0ybqbyv1jnjk25z6ys90d5lddd4qxqspn2xppkzvby21x634s2ry" } }, { @@ -23725,16 +24164,15 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20200428, - 1707 + 20200815, + 2357 ], "deps": [ "dash", - "loop", "s" ], - "commit": "0e7ea1574717108ddc2eda5e1bc883d44cd28257", - "sha256": "0qkgsac3g02p4w8rkkmwv0p0brmi3rb1yijq45nvyy8kkf331g0g" + "commit": "b3634a4567c655a1cda51b217629849cba0ac6a7", + "sha256": "1zy629gavyrwx5gmpz7l1a86hbrxjrfqik398v3ja8vg8bj9d6nq" }, "stable": { "version": [ @@ -23802,14 +24240,14 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20200121, - 623 + 20200723, + 1750 ], "deps": [ "pkg-info" ], - "commit": "231291ecadc479295d83fee619049030940bfbe5", - "sha256": "0lzzgdd1fkswij0d9rh6gyyvhf6z5m0az1hhvyighi45al3mj78s" + "commit": "01b332495d3f44addeb236428041c4ffa0c2ca3b", + "sha256": "0qzzrvzpzj8vpdm8fw3sagp7bfps28l615hi67vnwp2car9a7f2y" }, "stable": { "version": [ @@ -23881,8 +24319,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20200406, - 214 + 20200602, + 500 ], "deps": [ "dash", @@ -23890,8 +24328,8 @@ "reformatter", "s" ], - "commit": "7782be0814b52f7c35a09b21a4839c1502a4707f", - "sha256": "0g3mxp80hfjwf3adaslwykk01w5fh5y6nwj4687wbm5dldvhr42i" + "commit": "363da4b47c9de1ff091a8caf95fccc34188d59a3", + "sha256": "0nmhf4vql0nkc4igd9mp9v77cb0rsxfawb160f9mcgkdd6ahn3xj" }, "stable": { "version": [ @@ -23982,14 +24420,14 @@ "repo": "leoc/elmine", "unstable": { "version": [ - 20190212, - 1740 + 20200520, + 1237 ], "deps": [ "s" ], - "commit": "2f020e41940b182deeca39786a3092a2d68b5eb7", - "sha256": "0x2av6zjd4kkyzxm2hcwjx9x8j2fzqg85pka57hqpk2fhfhsmy3s" + "commit": "c78cc8705c2dffbf649b858f02b5028225943482", + "sha256": "05z9v3lcc0mm40k0y08v8mhnlxb4krlgj6zghfavwwz6nhxn61g3" }, "stable": { "version": [ @@ -24180,20 +24618,20 @@ "url": "git://thelambdalab.xyz/elpher.git", "unstable": { "version": [ - 20200516, - 1232 + 20200628, + 2255 ], - "commit": "bea10793f68037947b6fec30a86316ca2123bbfa", - "sha256": "0n5z9vf5yzmdccmzfvs7xb6gxvlvgsfcdfw8m25zi1lajpjajhq6" + "commit": "b4450244a5e23605f80b2179ce7d4dbaff56d927", + "sha256": "0fjqdp4xh9q50rdxg20il1y6wwn5l1af7139f4613z4j5ha3zxxg" }, "stable": { "version": [ 2, - 7, - 1 + 10, + 0 ], - "commit": "bea10793f68037947b6fec30a86316ca2123bbfa", - "sha256": "0n5z9vf5yzmdccmzfvs7xb6gxvlvgsfcdfw8m25zi1lajpjajhq6" + "commit": "b4450244a5e23605f80b2179ce7d4dbaff56d927", + "sha256": "0fjqdp4xh9q50rdxg20il1y6wwn5l1af7139f4613z4j5ha3zxxg" } }, { @@ -24219,8 +24657,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20200510, - 1559 + 20200805, + 1736 ], "deps": [ "company", @@ -24229,13 +24667,13 @@ "s", "yasnippet" ], - "commit": "6b7db2f23a9f248fd756e0bc537fd8d53d98eb96", - "sha256": "044qm7kgdnsh4yipxklyfvkrvzgw4abn6gjawkkvgniii2pf39hj" + "commit": "c766feb5c34dd17b7afba480ae9e90a08d75012c", + "sha256": "13z21jfvinjxyyi37xvx12gbr28fbr0g43x0nsip270dz797ls0v" }, "stable": { "version": [ 1, - 33, + 34, 0 ], "deps": [ @@ -24245,8 +24683,8 @@ "s", "yasnippet" ], - "commit": "b69ae7652e5efdda2e3dc650cd425b987ddd65ad", - "sha256": "1g9x67dvg5al6i9hnjcyi0zjsz71iv2jbinpzj7gcx77d0dn3cpk" + "commit": "980705c0b23aead72d7d6711008b1fb1706a45c2", + "sha256": "1x1z298axbh4xalssnq9nkf2z1sdgmx839vb01xz18kr9lfavx1x" } }, { @@ -24275,15 +24713,15 @@ "repo": "AdamNiederer/elquery", "unstable": { "version": [ - 20180917, - 2217 + 20200628, + 1756 ], "deps": [ "dash", "s" ], - "commit": "eac429d8550fbf1582c57d5e16fed9f320d6eb30", - "sha256": "1jkbrv5r5vzqjhadb4dcgks47gaj7aavzdkzc5gjn5zv5fmm1in2" + "commit": "cba7629ad886c4e51d66f8b509aad48bdfe100cc", + "sha256": "119g9ca40rg0aam7i2n4jhjzjzm8r7bg6q0yjaw5x1j7ywks5af6" } }, { @@ -24437,14 +24875,14 @@ "repo": "wamei/elscreen-separate-buffer-list", "unstable": { "version": [ - 20161107, - 358 + 20200807, + 1324 ], "deps": [ "elscreen" ], - "commit": "7652d827aa1b8c1b04303c5b4b0bda5e8f85565e", - "sha256": "1cpmpms3r9lywmxgciz4xq7vjw2c1mxmpd89shssqck16563zwxf" + "commit": "88d8850108947949431425a2d938a09d941454e8", + "sha256": "0c18w11wy3bnxhf109dbr01fcv3y9fg4jx5nkjx2gaf0kl0d7nfi" } }, { @@ -24532,20 +24970,20 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20200422, - 1352 + 20200728, + 819 ], - "commit": "d5ebd8ab6439fea3dcae0bcaece6e914f4ee1f6c", - "sha256": "1h1dx6dpwr4cml2a57mz3lq4f746cja007ckrpk3vii9ap413hf8" + "commit": "f9f810ffcd3cce7ed15848c72ce299609ec09414", + "sha256": "1p3zpg4p4a1cn13sg3hsa33gs1bdra1mlmxkagx883p3808i5qha" }, "stable": { "version": [ 1, 3, - 0 + 2 ], - "commit": "4cbdcd79524db4a71abbf761a3945617086f5d09", - "sha256": "1gb2sh2mcx8va8lgyc46pch9fswfm761935806myi9fl1v67ayk6" + "commit": "f9f810ffcd3cce7ed15848c72ce299609ec09414", + "sha256": "1p3zpg4p4a1cn13sg3hsa33gs1bdra1mlmxkagx883p3808i5qha" } }, { @@ -24595,11 +25033,11 @@ "repo": "skeeto/emacsql", "unstable": { "version": [ - 20190625, - 1859 + 20200714, + 28 ], - "commit": "a118b6c95af1306f0288a383d274b5dd93efbbda", - "sha256": "1qz74rk2pskpc1k6kdpqv823i5zc39i885rww05n8lrqw456cpn0" + "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", + "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" }, "stable": { "version": [ @@ -24625,8 +25063,8 @@ "deps": [ "emacsql" ], - "commit": "a118b6c95af1306f0288a383d274b5dd93efbbda", - "sha256": "1qz74rk2pskpc1k6kdpqv823i5zc39i885rww05n8lrqw456cpn0" + "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", + "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" }, "stable": { "version": [ @@ -24655,8 +25093,8 @@ "deps": [ "emacsql" ], - "commit": "a118b6c95af1306f0288a383d274b5dd93efbbda", - "sha256": "1qz74rk2pskpc1k6kdpqv823i5zc39i885rww05n8lrqw456cpn0" + "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", + "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" }, "stable": { "version": [ @@ -24685,8 +25123,8 @@ "deps": [ "emacsql" ], - "commit": "a118b6c95af1306f0288a383d274b5dd93efbbda", - "sha256": "1qz74rk2pskpc1k6kdpqv823i5zc39i885rww05n8lrqw456cpn0" + "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", + "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" }, "stable": { "version": [ @@ -24709,14 +25147,26 @@ "repo": "cireu/emacsql-sqlite3", "unstable": { "version": [ - 20200117, - 1922 + 20200718, + 614 ], "deps": [ "emacsql" ], - "commit": "82b90d493dba404473b515ffd670e0dd0dba1248", - "sha256": "1azv9mllvyjzqjkjw9n5rmdj79fa8srbpmx61w6vm25bl9f62vpf" + "commit": "e920671872cd8e0ef9c3646e6f0fae331bf8a7df", + "sha256": "1yy9y27rckm776jnl2rh1fz3bh09690xwzq7102vlw7xkb9s7jhj" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "emacsql" + ], + "commit": "e920671872cd8e0ef9c3646e6f0fae331bf8a7df", + "sha256": "1yy9y27rckm776jnl2rh1fz3bh09690xwzq7102vlw7xkb9s7jhj" } }, { @@ -24961,20 +25411,20 @@ }, { "ename": "emms", - "commit": "caaa21f235c4864f6008fb454d0a970a2fd22a86", - "sha256": "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94", + "commit": "4caa7403144670c07e326ed3a7d982c427d4a254", + "sha256": "0ml66fgzxl4wsk5g7d78mqhr9gqmbld6qh31nfc6z19c8107jrd5", "fetcher": "git", "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20200508, - 1955 + 20200716, + 1815 ], "deps": [ "cl-lib" ], - "commit": "64b9ee9c86067118b2d0055f467e60bc211aa59d", - "sha256": "16h9hb6d621mfi7805p2iaw814n2pm2g659wcjqxpvm5x5hpn55v" + "commit": "36d760e2bd7e5376aff3f03456fa6445833242ad", + "sha256": "0xgshxdd5zmy1c7sxvrmw0wkqwhwaccqf93zwz98gb9gsfabyxd8" }, "stable": { "version": [ @@ -25296,15 +25746,15 @@ "repo": "iqbalansari/emacs-emojify", "unstable": { "version": [ - 20200513, - 1627 + 20200812, + 628 ], "deps": [ "ht", "seq" ], - "commit": "dfa3c6d060914c6082d6837da32df0c337330ee4", - "sha256": "0m963cn916m0xa8cb1yslkcla86a34dchwy3ism62a2r9swa7p6s" + "commit": "d886069974d05c8c15654204f9afeaee962f3e7d", + "sha256": "00s6vzziiym4bqh91c1k55qjihpmqs7w6kcxnwms8mx92w40hlw2" }, "stable": { "version": [ @@ -25435,14 +25885,14 @@ "repo": "hrs/engine-mode", "unstable": { "version": [ - 20191105, - 750 + 20200611, + 1825 ], "deps": [ "cl-lib" ], - "commit": "96b3488a6de2f50b8ba3a101e04ebcbe9821a989", - "sha256": "1xka8i4cdvp5r2v2mkli1zz17x1sdsnmszbhqav2rf94v656d91i" + "commit": "e0910f141f2d37c28936c51c3c8bb8a9ca0c01d1", + "sha256": "15zx4a8gvgk077pnj7wr78nfjrzrj2i9ma6cj6jj6i8ikz6wyvjz" }, "stable": { "version": [ @@ -25465,11 +25915,11 @@ "repo": "zenspider/enhanced-ruby-mode", "unstable": { "version": [ - 20191111, - 2243 + 20200729, + 634 ], - "commit": "732331b99a0884dd7fc0149658d4090886857656", - "sha256": "12wip0l6xyqgvxvjvid1rh61yizk1r9y7xl1jz2sjds7kv6aw0kf" + "commit": "f0bffbe4b32bb59680f897731169442cce5a1eec", + "sha256": "0zjx6mz8kql9d09rzqircbqd9rcpfsn1k7nz9vwijp59m6mnjw1h" }, "stable": { "version": [ @@ -25546,6 +25996,35 @@ "sha256": "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5" } }, + { + "ename": "envrc", + "commit": "f66883b0d6a49decde7d438d9d4bdfa107a3554e", + "sha256": "1hkz0a7rs2yqapv3asmqr9pb8r8jk5hlmrpp8ab5l7qsdjm7xn63", + "fetcher": "github", + "repo": "purcell/envrc", + "unstable": { + "version": [ + 20200714, + 201 + ], + "deps": [ + "seq" + ], + "commit": "1dc5aad14d2c27211c7c288d2d9dffeb2e27cb2d", + "sha256": "11ad4i1cyz6cfsckm4jf10w0570sd2fcrji87sf5052csl4ril2h" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "seq" + ], + "commit": "a15003d6b540b1b07847310d5ed4c39046336a7d", + "sha256": "1sspy227b733dxx6czml5lmx9g7nsxwgnazk1b9ip81q0cm0dv55" + } + }, { "ename": "eopengrok", "commit": "2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545", @@ -25640,14 +26119,14 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20200503, - 1214 + 20200817, + 1145 ], "deps": [ "closql" ], - "commit": "d987af46d9d763946fbf2930cacc9d6906df4382", - "sha256": "1jyb9m6nx91dn4isai36v1yc7shrpgnk76kpkamavrvwqdzvw6nv" + "commit": "ac6e85e11f0e071911279f3f0a4ea7bff35b68cf", + "sha256": "1g5g8rs4zpwlxmkmnml34hy0arbhq8fsmyxqjq0h1l1xxbwscdl4" }, "stable": { "version": [ @@ -25781,15 +26260,45 @@ "repo": "emacsomancer/equake", "unstable": { "version": [ - 20200429, - 209 + 20200805, + 2110 ], "deps": [ "dash", "tco" ], - "commit": "7e8ef8627151748156e7a4a384b6e8c6c344261b", - "sha256": "1ds89jk4d7j89mgfkqqc92lizh6fwwr338imzvby1lb8i17nww40" + "commit": "85fe1033e3aa64986d297bf1fde2d172827309cc", + "sha256": "0w3yp9ixdwcm3fl8104yb3rxp1h8z6i6msd95b48jia52dbajzcj" + } + }, + { + "ename": "eradio", + "commit": "b5c8621acac2bfb7859bf0b830994fc867ecdaa2", + "sha256": "0kan4ia1g9xsb53gkj43c6sn2009a9cm49x2c30ccj2gl999szq2", + "fetcher": "github", + "repo": "olav35/eradio", + "unstable": { + "version": [ + 20200729, + 1817 + ], + "commit": "5e257849113b70b2b42a999994d89ec8abadf253", + "sha256": "1nni4yyvhqg4dscgn1xlbgh073lwjff5mqw8zxwyiahfsdi0z9ca" + } + }, + { + "ename": "erblint", + "commit": "5c65941ad1afd57d633f8586e9034c5e14acfa18", + "sha256": "1m2w8krg59x5pvbmdnnf9iglx2191hhdpxmfd0ww4bgnf1pf0gn4", + "fetcher": "github", + "repo": "leodcs/erblint-emacs", + "unstable": { + "version": [ + 20200622, + 5 + ], + "commit": "89af42f776d8dc656104322edaace2ede7499932", + "sha256": "1s3fcic42wlab3vnwdakvy7268cr19j5rd2ajr18qkr0vibj7xxj" } }, { @@ -25815,14 +26324,14 @@ "repo": "atomontage/erc-crypt", "unstable": { "version": [ - 20200511, - 2235 + 20200516, + 2054 ], "deps": [ "cl-lib" ], - "commit": "6d158b39ea2833b753858153eb110da9b8a40fc4", - "sha256": "0pj330x5j9rnwcv2la2yc6w3vsg53c9ij0f3q9zi2psxbr268xi0" + "commit": "be87248435509f83c56a7f08ac9bcbbd3b20d780", + "sha256": "1d8wfa4rgwv41kmw1kpp90r8371n1l7lfx3k79k2psppvrf72xbf" }, "stable": { "version": [ @@ -25928,14 +26437,14 @@ "repo": "drewbarbs/erc-status-sidebar", "unstable": { "version": [ - 20171223, - 2124 + 20200811, + 136 ], "deps": [ "seq" ], - "commit": "ea4189a1dbfe60117359c36e681ad7c389e2968c", - "sha256": "1hwlhzgx03z8891sblz56zdp8zj0izh72kxykgcnz5rrkyc3vfi3" + "commit": "b589b74245591257c9e666bd5cd25812e04b7a34", + "sha256": "08fvr5ba6gb3y52sypbdj236nxr5rl95zgz1b120scz6xal7mysy" } }, { @@ -26182,15 +26691,15 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20200319, - 1250 + 20200526, + 18 ], "deps": [ "cl-lib", "undo-tree" ], - "commit": "4a6ba06d9c618e9380d059fa25ed677b45d134a7", - "sha256": "0wgdzxla6kz1zfc3vfd8wc2j40kq023z7b83m2k435hcqdffark8" + "commit": "6a3214e1a892a45f575604f0bc4bb83175142aa4", + "sha256": "1n0ki4214c53ax3r54gg303kawyqivwcciyhvrgqa1y0kk093982" }, "stable": { "version": [ @@ -26234,19 +26743,20 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20200313, - 1030 + 20200519, + 530 ], - "commit": "e5d476b5f22927d341caf1774355d9e69e390cfa", - "sha256": "1kcdl56qybvq4m5dp65n3nbg6xijb793xi25yckk5nc17n1nwrzb" + "commit": "d9bc7858e985143a433953ba286422511b466a0c", + "sha256": "0ik1hhmw4xsmny9j5gbz7lr73jsvdd79xb3ygcsi8jkwz7lxi3v1" }, "stable": { "version": [ 23, - 0 + 0, + 3 ], - "commit": "7a8d04dbcb388a5d837a213ad249c1b96e19e998", - "sha256": "0hw0js0man58m5mdrzrig5q1agifp92wxphnbxk1qxxbl6ccs6ls" + "commit": "44b6531bc575bac4eccab7eea2b27167f0d324aa", + "sha256": "133aw1ffkxdf38na3smmvn5qwwlalh4r4a51793h1wkhdzkyl6mv" } }, { @@ -26388,8 +26898,8 @@ "repo": "rejeep/ert-runner.el", "unstable": { "version": [ - 20200321, - 2158 + 20200704, + 1048 ], "deps": [ "ansi", @@ -26399,8 +26909,8 @@ "s", "shut-up" ], - "commit": "1829f05c46b0baaae160d900f89c8881f4fcdbcc", - "sha256": "08gygn9fjank5gpi4v6ynrkn0jbknxbwsn7md4p9ndygdbmnkf98" + "commit": "59a0f07f4f6b7c4757768309e8a47cec983e862a", + "sha256": "198bc526s6sw8qqsbmw4wgz5m97n6kf9002f2bgg9phms7a8if4s" }, "stable": { "version": [ @@ -26467,8 +26977,8 @@ "s", "spark" ], - "commit": "9e5bcb290b38d5bd143e0ee480ed49147cfd3504", - "sha256": "13f7s8hk5d3psxp4qzzsqnwawsjj59cmjhmg1zi2c90qhvna78vn" + "commit": "3aacf72daf6a2b4104914dd40e5f33e78fb084ac", + "sha256": "1ki839cfsn2xr2d8a2j89llbl452d45x3y5jiaiwkcmfhf7xadcb" }, "stable": { "version": [ @@ -26791,14 +27301,14 @@ "repo": "4DA/eshell-toggle", "unstable": { "version": [ - 20200107, - 2230 + 20200528, + 1124 ], "deps": [ "dash" ], - "commit": "ddfbe0a693497c4d4bc5494a19970ba4f6ab9033", - "sha256": "0xqrp8pwbmfxjdqipgpw5nw633mvhjjjm3k3j9sh9xdpmw05hhws" + "commit": "aeb7c121e4518c0edd1d2972851502303a299984", + "sha256": "12w38h438bg2vm8najsqizcdfyr1px5h1gba68x4mzyv2bcll2qx" } }, { @@ -27036,14 +27546,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20200516, - 522 + 20200819, + 1030 ], - "deps": [ - "julia-mode" - ], - "commit": "8f04fa92a11cdb4a3777755fdbaaa65e076f04ef", - "sha256": "10cg90aqlr5y3vmp94zhkwj3l178l9f32igpl38bzxm9hmdgikfr" + "commit": "1baf8bf1403fe5956a25475b03be0d8f02b3f3ca", + "sha256": "0asyd67krsq3xx7kk770x1f70j33bga8w0i7l4089a1jqzmpn3kx" }, "stable": { "version": [ @@ -27178,14 +27685,15 @@ "repo": "jschaf/esup", "unstable": { "version": [ - 20200318, - 2256 + 20200814, + 1400 ], "deps": [ - "cl-lib" + "cl-lib", + "s" ], - "commit": "c9c95e245068d15d8e2732098af9a5d2bc8ec931", - "sha256": "0i4cwwvs5zs8g2ajrrkqgrpxzywsa255rc1g7a6bxzvg9hk77f4k" + "commit": "0de8af8233d9ce1b67f05a50f25c481c4f1118d8", + "sha256": "01khb3xyj0ylwib6ryzzvqmkh5wvzxiq2n3l0s3h9zv7wx849bzv" }, "stable": { "version": [ @@ -27243,6 +27751,30 @@ "sha256": "0k0g58qzkkzall715k0864v3b7p5jnfwxqgmkj087x34frcf388k" } }, + { + "ename": "etc-sudoers-mode", + "commit": "e665f3b7fd75544c174ac3da9e0a498ceb694f5a", + "sha256": "01sn1pd6s4blf6dk3vvi70sr1mgcfsigb1qvxk3dsggf1ng2rhsk", + "fetcher": "gitlab", + "repo": "mavit/etc-sudoers-mode", + "unstable": { + "version": [ + 20200608, + 1555 + ], + "commit": "52d5be9214185cfbba56e0b39bc4af474fc95f45", + "sha256": "1ff4dpwr0127mziwafxry5a9iyw8lbm4z8bdlim81p4pyyll7vx6" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "8d3805d8b8e016278204d727f6b97913ea0e5079", + "sha256": "0cg0l8ksqrxy0clzj5x8l891873zcxwwzziv1mvwf8i618w2sjss" + } + }, { "ename": "eterm-256color", "commit": "e556383f7e18c0215111aa720d4653465e91eff6", @@ -27492,16 +28024,16 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20200516, - 1740 + 20200816, + 737 ], "deps": [ "cl-lib", "goto-chg", "undo-tree" ], - "commit": "3f3b2fea87172f155e5f91d75f0fb69d8648acf2", - "sha256": "0ihb42v513c9jrh8d0v5a76ykhqi408cdnfpilrwq9499qr22jdg" + "commit": "1e7aa5bfbd86feff0ed5982e487070352d326b90", + "sha256": "1vb7np6yzv8iqblxg0yi1ac080k2bn7n8wz6wj8vkm080zmfwfb0" }, "stable": { "version": [ @@ -27645,15 +28177,15 @@ "repo": "wbolster/evil-colemak-basics", "unstable": { "version": [ - 20170425, - 1209 + 20200630, + 1936 ], "deps": [ "evil", "evil-snipe" ], - "commit": "7844079b47f47bb1dc24c885b0ac2e67524fa960", - "sha256": "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2" + "commit": "dcdf5c3e844f6eef2bf9d6a502cf8c81b3edaff2", + "sha256": "1g9li89kg3wgpm39prz9xra12vw7mhrnjl9wqqkvj98fx6dxsdr7" }, "stable": { "version": [ @@ -27695,16 +28227,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20200513, - 804 + 20200808, + 850 ], "deps": [ "annalist", - "cl-lib", "evil" ], - "commit": "e998952dfe73d296259905e1bd8f96659bfe2661", - "sha256": "1r896jbshniaxxh15iw87yklnr2hq5as3a8w6xb202gxz5pvc4ym" + "commit": "c136589d9584e5d01a4b3f2e4cf8ac5f5a23be63", + "sha256": "0kbv4p4v5mgjk2hbrg0c5p29yd74s4xaa8z6c8f2h6l5p28dsk4j" }, "stable": { "version": [ @@ -28229,15 +28760,15 @@ "repo": "emacs-evil/evil-magit", "unstable": { "version": [ - 20200409, - 1909 + 20200604, + 110 ], "deps": [ "evil", "magit" ], - "commit": "253c644807013fe92429acdef418748794b8f254", - "sha256": "08mh7phxsdb9w4dfs0pmr4l4fdzzr2rm88z2s8karfi5j5ik2ag5" + "commit": "88dc26ce59dbf4acb4e2891c79c4bd329553ba56", + "sha256": "0vh872rpxfwqj7m77l12czknddmz7aijk30vwb1l08yi9309cdsf" }, "stable": { "version": [ @@ -28261,26 +28792,26 @@ "repo": "redguardtoo/evil-mark-replace", "unstable": { "version": [ - 20150424, - 718 + 20200630, + 940 ], "deps": [ "evil" ], - "commit": "56cf191724a3e82239ca47a17b071c20aedb0617", - "sha256": "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv" + "commit": "d4fec7b10e93cca149163324cd2b2b2dcc211047", + "sha256": "0v08jwb92igd8cxbb1nxjdzwymppcaar9mf89dmbk7jkqif2q72z" }, "stable": { "version": [ 0, 0, - 4 + 5 ], "deps": [ "evil" ], - "commit": "56cf191724a3e82239ca47a17b071c20aedb0617", - "sha256": "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv" + "commit": "d4fec7b10e93cca149163324cd2b2b2dcc211047", + "sha256": "0v08jwb92igd8cxbb1nxjdzwymppcaar9mf89dmbk7jkqif2q72z" } }, { @@ -28291,26 +28822,26 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20200502, - 1140 + 20200812, + 1050 ], "deps": [ "evil" ], - "commit": "943bf5fb2b04e077a797cf192fd7650b41e3c3e4", - "sha256": "0iryzs12nn20pj5zcyhdk4mpgyrlah0pzbjawmj0l91clmhwbvhb" + "commit": "574d3c4e4517d3bb10bf652cacf459376ae401fe", + "sha256": "12c7y8dmkpqlak733cak6274fxzrk1hpywj7ky6nkfspqdvc2xz8" }, "stable": { "version": [ 2, 3, - 4 + 8 ], "deps": [ "evil" ], - "commit": "5e92e374e6b46176d46323b884c25c44063331da", - "sha256": "1nflkmx08n3ya5vaipy1xg19hnqcp6f7ddsx9xjh5gl6ix2iz0az" + "commit": "8fba4f12e1bbfdbf25a8ed2a5308840f104bc7c0", + "sha256": "04s650hz6aa4ld3xqa272a2jsw9j1scnn5qkhpgis0w2d3gpwvpa" } }, { @@ -28426,11 +28957,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20200417, - 59 + 20200630, + 911 ], - "commit": "1bd2de52011c39777a3e8779b14cee2790dc873b", - "sha256": "0h8hzqjh6qq4fj0imrb5ic5m4zn3ig6s3b7b2x9r6ig9m15jpg6n" + "commit": "87734b9c7fcd047f73a072b9d03ec05f786eeb03", + "sha256": "15dahrvary0ahyzg83jxdhf00pd2231rr628nq9fl0dl54laixsd" }, "stable": { "version": [ @@ -28520,14 +29051,14 @@ "repo": "Somelauw/evil-org-mode", "unstable": { "version": [ - 20200101, - 2017 + 20200601, + 1855 ], "deps": [ "evil" ], - "commit": "2d70c981587187f4fb7d72b9c5b368e6f7c1460f", - "sha256": "1v20iba2b6dwr01zm69ix23xrlkm1ig8n9zn13nkna9iawafqrq9" + "commit": "4b23116a6ecfa687819050e5a9a419cf08d5ba90", + "sha256": "0r3b6j0ywkz8wggzyfnvqwwrd7ir317njdwldcdncirfwy603337" }, "stable": { "version": [ @@ -28591,6 +29122,25 @@ "sha256": "0b08y4spapl4g2292j3l4cr84gjlvm3rpma3gqld4yb1sxd7v78p" } }, + { + "ename": "evil-pinyin", + "commit": "640f1cd1b05d7a806404ffbc2c1a95a10ed63a55", + "sha256": "1gd9fdmm0fdscc3cw5c8sc1sg8yhsvrlnj3kyyj6jjbrz6s96xni", + "fetcher": "github", + "repo": "laishulu/evil-pinyin", + "unstable": { + "version": [ + 20200726, + 546 + ], + "deps": [ + "evil", + "names" + ], + "commit": "ee4ea5a297fb8a445e0c886f9d20bbd4e94c00df", + "sha256": "1g1v0513ypq4kax56rmq5dvf8yf9absvfls6zadhniwjzmdh68ii" + } + }, { "ename": "evil-python-movement", "commit": "130e6d17735ff86b962859528d7e50869f683251", @@ -28838,15 +29388,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20200422, - 519 + 20200531, + 1008 ], "deps": [ "cl-lib", "evil" ], - "commit": "2ba6353bb9253dbbc4193f1d35403e7dcc1317b1", - "sha256": "1sqbwg41by88qq7npsw7w9q3zmfk5adzqpqh2m84zk6fd64mc6h2" + "commit": "6dcac7f2516c6137a2de532fc2c052f242559ee3", + "sha256": "1faimkch2s08kbrwh3j77y0n5inrjr7vphy0xdl402bv0d20h8nq" }, "stable": { "version": [ @@ -28907,21 +29457,21 @@ "evil", "string-inflection" ], - "commit": "6913de02a210487c063cd63ecf27b17a24797870", - "sha256": "1wyd903yvp8lxbhavsr4grn79hkxcsz71mcvy3hrvnf7ifhw514a" + "commit": "d22a90ab807afa7f27f3815b5b5ea47d52d05218", + "sha256": "1vwch4kwwh82k1rlc9qsg74zbghn6vkgch5xb1wz0dmbv4id06l5" }, "stable": { "version": [ 1, 0, - 0 + 1 ], "deps": [ "evil", "string-inflection" ], - "commit": "f6a3eca0f0fa8e56e6938e1dd48537eef1fae05f", - "sha256": "1akk0yylwcw4f91hprrrsijhbdcmrx1nnpgfyzpl4k5d4b30y8d5" + "commit": "d22a90ab807afa7f27f3815b5b5ea47d52d05218", + "sha256": "1vwch4kwwh82k1rlc9qsg74zbghn6vkgch5xb1wz0dmbv4id06l5" } }, { @@ -28932,26 +29482,26 @@ "repo": "emacs-evil/evil-surround", "unstable": { "version": [ - 20191217, - 1131 + 20200603, + 2216 ], "deps": [ "evil" ], - "commit": "9b0b17f06cef9bac81ee4800d121265e54718a17", - "sha256": "15v2spg5rhddr97pxjfvxj36sh7knp753a9qpw8v5zjnp65kf2kn" + "commit": "346d4d85fcf1f9517e9c4991c1efe68b4130f93a", + "sha256": "1gfgmr4909m36gknprcam6q4rkcqfbi6w43ky7x6jnlmgb6mxggg" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "evil" ], - "commit": "9b0b17f06cef9bac81ee4800d121265e54718a17", - "sha256": "15v2spg5rhddr97pxjfvxj36sh7knp753a9qpw8v5zjnp65kf2kn" + "commit": "346d4d85fcf1f9517e9c4991c1efe68b4130f93a", + "sha256": "1gfgmr4909m36gknprcam6q4rkcqfbi6w43ky7x6jnlmgb6mxggg" } }, { @@ -29023,14 +29573,14 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20200304, - 911 + 20200816, + 737 ], "deps": [ "evil" ], - "commit": "3f3b2fea87172f155e5f91d75f0fb69d8648acf2", - "sha256": "0ihb42v513c9jrh8d0v5a76ykhqi408cdnfpilrwq9499qr22jdg" + "commit": "1e7aa5bfbd86feff0ed5982e487070352d326b90", + "sha256": "1vb7np6yzv8iqblxg0yi1ac080k2bn7n8wz6wj8vkm080zmfwfb0" }, "stable": { "version": [ @@ -29045,6 +29595,38 @@ "sha256": "17xrn3s6a4afmls8fw8nnxa1jq9dmj2qqrxa2vngh50hxpz8840p" } }, + { + "ename": "evil-tex", + "commit": "2b8ead8c7b1b7cdaefd35e9622fbb99307715e08", + "sha256": "1aph898q7mkw5vgwd1c7fh8vrgmarrbbkglgdfnawg8jycxac6sp", + "fetcher": "github", + "repo": "iyefrat/evil-tex", + "unstable": { + "version": [ + 20200818, + 1628 + ], + "deps": [ + "auctex", + "evil" + ], + "commit": "03c014d63373c21c511506f36763a355e566eb01", + "sha256": "096im6yld0bqkdrb3ywxiabv55l8qdvg10887iwq86zprj89igmf" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "auctex", + "evil" + ], + "commit": "bb01576e4cf9cc10c529621ced3ef3a7eb5ab376", + "sha256": "1d4s9f0p8bmch3kv7zh5fcv1y6nxza9kfcrjrdvmflz1nb96sy6g" + } + }, { "ename": "evil-text-object-python", "commit": "0d0893b07bc4a057561a1c1a85b7520c50f31e12", @@ -29569,20 +30151,20 @@ "deps": [ "evil" ], - "commit": "d5daea30176d48e74c9d063ac9bfc240ebeb97d0", - "sha256": "18mb7ik15yygfyjr5y2awbn5lrr3b9z1f31gnfslvrlav2nl1m7d" + "commit": "aee7af7b7a0e7551478f453d1de7d5b9cb2e06c4", + "sha256": "0m98bwj8dy90ifck8rsda6zfgbjrv5z0166pp7qzvwls9rqa695m" }, "stable": { "version": [ + 1, 0, - 0, - 6 + 0 ], "deps": [ "evil" ], - "commit": "70f7ca2a4c6de0392e5e54ac4f16c96daa106be6", - "sha256": "0ns43whqcq3cv9vh8wbakj5fgs0lsn8f3q1rgl4rw4mfgbvv85pm" + "commit": "5e7b5721bf48aa49c6cdb5d41b908ef7d513b2a8", + "sha256": "0xia8dvpz294pqc3zdr0knhdlw251dhkdm69v1005674kd15259w" } }, { @@ -29593,11 +30175,11 @@ "repo": "purcell/exec-path-from-shell", "unstable": { "version": [ - 20191229, - 112 + 20200526, + 324 ], - "commit": "2d152d17814c6d551d525d83201da72c4047c1de", - "sha256": "129iccdddpz0hhb25v63a8pk76ayx67jn47rwd3x6wzsnhsg3pp6" + "commit": "e5647b910900972bc59acea7b74e932ba0a94ce2", + "sha256": "18awpmyrvcw6yckms8wfgyh5kfyva1w7vpvclqa655l22brbvpph" }, "stable": { "version": [ @@ -29783,11 +30365,11 @@ "repo": "extemporelang/extempore-emacs-mode", "unstable": { "version": [ - 20200408, - 2253 + 20200518, + 1043 ], - "commit": "09518ae6650d7be33a4633a4c0f31b7130d04c6e", - "sha256": "0hfza9lzdsz94gxhmzyp9fwviscv19rmnjgd0q613faayn11sjsp" + "commit": "7d0ca861e6b483be1f4a08e63c5ade9cd07b4799", + "sha256": "0mw041jccyn8s1n3wpas397k2vrp9ryq9lfj16ipk9iqs4la6hlx" } }, { @@ -29821,19 +30403,20 @@ "repo": "doublep/extmap", "unstable": { "version": [ - 20181028, - 1645 + 20200617, + 1905 ], - "commit": "187f621cb2d9413595cb47917641e5692e3b37cd", - "sha256": "1h9d7fgvy9xz9rw6kf5q606j2k54xqmvva028d929h8aibb6pch2" + "commit": "2a6373d4fad1a5ac95272cabb6f5e4af89233d67", + "sha256": "0n0hz93x7mbf95mf8vvc6cam7qbzwj4kskbbws07km2av7jsi166" }, "stable": { "version": [ + 1, 1, 1 ], - "commit": "1139b57d8f4276fe56b8416fdaf4745f2cdfe7c3", - "sha256": "0jgyscjfparnby0whrmbgvsab2a7qkaqhysmh3s3jh635fndm253" + "commit": "341e3e16e217da5a006c0859cb3a59cbc40cfb84", + "sha256": "09kia3mr4si8kn46kyiza9nl669b22vmgc70ng3mqz742lph5siw" } }, { @@ -29863,11 +30446,11 @@ "repo": "agzam/exwm-edit", "unstable": { "version": [ - 20200126, - 27 + 20200728, + 8 ], - "commit": "bc25ba094b383be3c650ca0b7e1534efe2bb154f", - "sha256": "1z1ya9xgknka3dy3b3x8zzfkxdx5jqsi8q5aqkvxjxa6n7mmqdwv" + "commit": "2fd9426922c8394ec8d21c50dcc20b7d03af21e4", + "sha256": "1gwqwj50ch8iib5yqbyvski7vxiwid6s49lj2xcy5kksnx1a2410" } }, { @@ -29916,14 +30499,14 @@ "repo": "ieure/exwm-mff", "unstable": { "version": [ - 20190810, - 1744 + 20200516, + 2335 ], "deps": [ "exwm" ], - "commit": "a6a4b3dda01cbcf411fc2824981eaa9e85199a52", - "sha256": "1f4yr4q5dayxmyvrdxbbviks6l02amqhgfa97k7cz9rwscsavg6c" + "commit": "81fbbea495e32aef2e2d86c097cb586422d8822c", + "sha256": "0c3k2cs57iahm5dc1i3h05kiz4fjh7l2675im8kh91jx7lk27vb5" }, "stable": { "version": [ @@ -30623,11 +31206,11 @@ "repo": "yqrashawn/fd-dired", "unstable": { "version": [ - 20200428, - 332 + 20200713, + 243 ], - "commit": "001cc95effdd5c4d9974b3f2c40b2ddf1f0e3de2", - "sha256": "1ab03jn1kg4bq97d7dzinpxlyg3wcx4cha0a7ibqdbqrci3znigc" + "commit": "5622041068d5fa2f299dbc8aa91fece0ba260086", + "sha256": "028qm0snna2w8wrgx988nhw3sdid5n3nr01hvavnzyhadha1j6fc" }, "stable": { "version": [ @@ -30656,8 +31239,8 @@ "page-break-lines", "ppp" ], - "commit": "529b7ec69f1694d7dc8aacb5066cf4ddcf24cc58", - "sha256": "0flph6yv5fj5ladksjqfpj9j8p2jcc102kbc833bvx1cnmjx7qk4" + "commit": "3f19293dada8bf368e9f86f783610e7ca0a51ecb", + "sha256": "11ml9n4bkm0150ifyx3igx55hnnrhbg04q8sb15v734xi29swp6z" }, "stable": { "version": [ @@ -30677,11 +31260,11 @@ "repo": "michaelklishin/cucumber.el", "unstable": { "version": [ - 20190801, - 1137 + 20200815, + 1617 ], - "commit": "11ae1671629bfedaa553c7b819676d64eb320992", - "sha256": "0yd4gkxz9xcbgibfgr8apsid3f83nmg5jgqk5nql0linj5gymc28" + "commit": "8e1464113b489b54067294cd988ff6a11a423fdb", + "sha256": "1lmfksx49ig4b7nqg0mmaalz08b280iaqgsc0x9i471m9kvbisp7" }, "stable": { "version": [ @@ -30707,6 +31290,36 @@ "sha256": "0f2nynx9sib29qi3zkfkgxlcfrwz607pgg6qvvk4nnads033p1yn" } }, + { + "ename": "feed-discovery", + "commit": "eaea977d51dd55a0dd2bfdc2f7cff822ed4053d7", + "sha256": "0yd8hsc6dqipmqh7ahbmr16gj5p4lh8a55652x1lic3q4ssah1ql", + "fetcher": "github", + "repo": "HKey/feed-discovery", + "unstable": { + "version": [ + 20200714, + 1118 + ], + "deps": [ + "dash" + ], + "commit": "47692787326a14c06dab6815bb18caced59a5bf0", + "sha256": "1mj86p4zw73c1n6nqv35zhgsqrmcmgvi07q60dahs016bwdzc6jb" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "dash" + ], + "commit": "3812439c845c184eaf164d3ac8935de135259855", + "sha256": "0v0xcy81a0kysycm3p8rl64vrsc9ph3d4yqzxp7kik9rmkgrp89w" + } + }, { "ename": "fennel-mode", "commit": "cda0732050a17b2dc70b80afd6fc6bb9cf8bb60f", @@ -30715,11 +31328,20 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20200405, - 1935 + 20200714, + 237 ], - "commit": "7fadf2580c3afcae3f6ebc54dad0e519b7600f1d", - "sha256": "1qpfpfdm2d8bdqm7h62y3hgbip67yqmblhg66zlmfxfdnsad5ls6" + "commit": "a39543750ba337b9327108ba17ffb0cdb18c7f9b", + "sha256": "0p9n0plb1ry6r8i09if6mzhhk4gs1saxm05msq8sgwdjs6r1ra61" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "ae4634bef12f66a1d4721ab74c5bf8dd29d710d2", + "sha256": "15b5zb66dzszpdiqkwgxqv434kqgpk1l065ic4lbj3y3krm2snbg" } }, { @@ -30745,28 +31367,28 @@ "repo": "jcs-elpa/ffmpeg-player", "unstable": { "version": [ - 20200224, - 554 + 20200720, + 1028 ], "deps": [ "f", "s" ], - "commit": "9a80e1d42a4b01879a7585485384af6431b34651", - "sha256": "129mfslbp15d9z83r38lcqxnfx3n5jldaja5qbdgrmlw14irgx0r" + "commit": "164fb15d70adbc186eb2d987f5c5143aa7336659", + "sha256": "0i6r2mlpahrnszr9vk476iqvc1c8cpp6wn6fhlnz6vw4dybpw5p5" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "f", "s" ], - "commit": "214c08b362daa138d2e17883a6b4d096f22f5ebb", - "sha256": "0w2afgdd3pasrqi9apnmp0qqg4qvd0skizybrnyi9abnc0bp9v7x" + "commit": "164fb15d70adbc186eb2d987f5c5143aa7336659", + "sha256": "0i6r2mlpahrnszr9vk476iqvc1c8cpp6wn6fhlnz6vw4dybpw5p5" } }, { @@ -30850,17 +31472,17 @@ }, { "ename": "fill-column-indicator", - "commit": "4ea0c00a7784621fcca0391a9c8ea85e9dd43852", - "sha256": "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1fd9l7idzn9vwcy3v80fnn2d8g4c9g3rc505sapc5wgkn8in0p6d", "fetcher": "github", - "repo": "alpaker/Fill-Column-Indicator", + "repo": "alpaker/fill-column-indicator", "unstable": { "version": [ - 20191109, - 10 + 20200806, + 2239 ], - "commit": "3d88b8a4a3eeabb8d1c9ef27d3c6f5d98517be77", - "sha256": "1rklnjsqz8krqjll35xd5xwg79xqwh0sldwbcnymkjwywbky8yhh" + "commit": "c35f9de072c241699b57bcb46da84bed5af29cfe", + "sha256": "1q682bn6wgvga8arv4xfmr4nnw8nhw7qkjrlp5crpyv42x9yqr73" }, "stable": { "version": [ @@ -30902,11 +31524,11 @@ "repo": "snarfed/fillcode", "unstable": { "version": [ - 20171029, - 1625 + 20200524, + 2226 ], - "commit": "d0a9e20f5fcc24a786d09ea19bfb9237681ba823", - "sha256": "1mf2gfcjaqbw523vkfbzs2nl1y9bn9gbgmbvn2phbyj78gzq18za" + "commit": "501468082e46bd0975ef4d8765363fd564338099", + "sha256": "0z18x3gxh004nd648hwqdlb60a6ss61pkkqg30xpdmsrj8darf5q" } }, { @@ -30987,8 +31609,8 @@ "deps": [ "ivy" ], - "commit": "acedab403f69f242fa41012c20078500d46aa9e8", - "sha256": "0p21vm6xz6093nic2wwgly18a85xki3wp0a2vy4hgy0dl7qici86" + "commit": "506f35e91e06463cca7390da6ebffc411b8c220f", + "sha256": "1iwfhymbmlmakbga1jlp7w6jlnj0jbb0zs1yxxg8mmj7k9ss2xjr" }, "stable": { "version": [ @@ -31128,8 +31750,8 @@ 20200415, 2356 ], - "commit": "a61d7fce35eadba39236a6a3e9aa301e161d147b", - "sha256": "1bn81qwkvhznc5pi6bq08kp83208pj09vknfszx152r72sv5fpmz" + "commit": "c6945a005b9a581c81e2f3560eab4bd629967364", + "sha256": "1ylndx5n433zy9y7n79xhl7p0g1f4c0y97ha50d8fqm451jm0569" } }, { @@ -31298,20 +31920,20 @@ "repo": "marcowahl/fit-text-scale", "unstable": { "version": [ - 20200315, - 2120 + 20200701, + 2239 ], - "commit": "387acab18f9f4064c051771cf666b8550718dc27", - "sha256": "0mrl112vjsl6ddjv0j2pg97s6zk8c2qb92wqsq775ahr1cbhvbw7" + "commit": "a87341d4fb2077076eb83af0fb510112900aaebe", + "sha256": "1ayswmb99mimsg6b05nnvm15yg8w2512sv1mjk1nbifz627vgq2x" }, "stable": { "version": [ 1, 1, - 3 + 4 ], - "commit": "75f74aa14bb38ab00f184ae0a51262eaab07a27c", - "sha256": "1nc1p4qbpvnqq2vi7pck3zygahhippvy2xgqmha4lpq5f996lmyx" + "commit": "ba63f0591c3be1644ee7ee972430c74b5d346579", + "sha256": "014vbzxz1jmm83a5mg4zsyxm8nw96n8s2l7h3myhrn880d9xnqgg" } }, { @@ -31325,8 +31947,8 @@ 20190713, 1349 ], - "commit": "d3e17161d137fb75baf1449741ccaadb949e127a", - "sha256": "18yk3vs4v7n8zmxv80ss7bd94zmr14nring0d5bavax65b4wqk59" + "commit": "7aef6fb29840a2f3c7e3c01eeeb7838a0e702050", + "sha256": "0hf4x16fr5z5l2ypp41sw78dz5qpi14pphpbh8zdg4ky5sa8d4fd" }, "stable": { "version": [ @@ -31375,8 +31997,8 @@ "deps": [ "cl-lib" ], - "commit": "8d023f13710a90ae4da644d5485bf2be2646b6a1", - "sha256": "0pb5sd5cpz4173xi9kzgl9jx69169aymk94kdr6xgzhqda7iwy7p" + "commit": "46487e5279a3079730e2d7146ace7c8ad42371ac", + "sha256": "0ij0bjrb446h07lyhflfk06sk802jylgdl11ib00r89zai8sq8r7" }, "stable": { "version": [ @@ -31499,11 +32121,11 @@ "repo": "seblemaguer/flatfluc-theme", "unstable": { "version": [ - 20200419, - 1033 + 20200707, + 630 ], - "commit": "f81bb130be69e9f321e2085b627387074d23a253", - "sha256": "17z5bmcd2c4k26w9xd8npaqwk9wwr2nf0d6vikzj0mxg0pdlbaz2" + "commit": "5a30b1cd344ac0d3c3bf9dab017805ab96897b54", + "sha256": "0vcinly3lrrkbihafgxcv084zn8fhw94wc8qjjq2lwcc1db7lfjc" } }, { @@ -31662,11 +32284,11 @@ "repo": "IvanMalison/flimenu", "unstable": { "version": [ - 20200415, - 2353 + 20200810, + 1510 ], - "commit": "f110bc77415a7594742f3b12551571c4069c9157", - "sha256": "1y832w4n10k9lfi90lhq8l9s56zcg24j9j8jklkzby1vf34vq0ql" + "commit": "4c0ff37cf3bd6c836bd136b5f6c450560a6c92b9", + "sha256": "1z57vm8pgxfhklzz4gpyqy8wwv3dzl76dzgilx5pfkd69m2jrijg" } }, { @@ -31796,11 +32418,11 @@ "repo": "MetroWind/flucui-theme", "unstable": { "version": [ - 20200204, - 1930 + 20200815, + 2103 ], - "commit": "01a3df3530474da7b4303e4eea2ed1fae00d1776", - "sha256": "1bfnpligs32mpizrz9fb1pyp1zxq2rmympcg9pqrgpkdlxvs6xrf" + "commit": "6591b5093e6e8f0e720e3995a16a91835b2e7a48", + "sha256": "1lrpx1y103655xwaqkvn7i2zvkzbsf5bm7zndaj31rpm917xcm3i" } }, { @@ -31811,11 +32433,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20200508, - 1252 + 20200718, + 1434 ], - "commit": "8818bc07727fe748edf4aea629b510b7ada680b3", - "sha256": "05pl4w3zmfg24fk1pj053r0f8sx3m1zacfymvpya022y1ggpvnh6" + "commit": "78b3c572584c95220a40934bd67fd5e3fb096f96", + "sha256": "1vmm1d5sviwwvhm6cbr3sirfhqxa04d0s62a8vsiydb1q7868g2s" } }, { @@ -31833,8 +32455,8 @@ "flutter", "flycheck" ], - "commit": "8818bc07727fe748edf4aea629b510b7ada680b3", - "sha256": "05pl4w3zmfg24fk1pj053r0f8sx3m1zacfymvpya022y1ggpvnh6" + "commit": "78b3c572584c95220a40934bd67fd5e3fb096f96", + "sha256": "1vmm1d5sviwwvhm6cbr3sirfhqxa04d0s62a8vsiydb1q7868g2s" } }, { @@ -31944,8 +32566,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20200516, - 1719 + 20200610, + 1809 ], "deps": [ "dash", @@ -31953,8 +32575,8 @@ "pkg-info", "seq" ], - "commit": "309d37286729994094b931344c9a664dd7c6c08d", - "sha256": "1gsa4lik5f0dzn897lh369nmcn7n61if80ll5jc5qiymm1fx16cr" + "commit": "c02cd773dded0215f9417ec04dfe8dabda63ef43", + "sha256": "15w2b98zylppbfvy653i3a5jrxqvbrz8lqs4pzb39w2mbf8nxibx" }, "stable": { "version": [ @@ -32056,14 +32678,14 @@ "repo": "alexmurray/flycheck-bashate", "unstable": { "version": [ - 20160630, - 440 + 20200625, + 642 ], "deps": [ "flycheck" ], - "commit": "77fa03dbc578c34fe71ca44926bac2aff8f2b021", - "sha256": "1jcay4gncpr0fap6qlm6k4r5b94s18zj8j56w462hvxydaxxiql6" + "commit": "5e673c591d017329d0a07a61dc1223fa98639ee2", + "sha256": "1gaih50mkyby0r4qnmc03dy111ik4and5p6r3lvsflpvd3hcxjn3" } }, { @@ -32313,15 +32935,15 @@ "repo": "flycheck/flycheck-color-mode-line", "unstable": { "version": [ - 20171122, - 707 + 20200528, + 416 ], "deps": [ "dash", "flycheck" ], - "commit": "cc474804d4e8088a627485faaf4217a5781aec7d", - "sha256": "0lk8p0wb7g9lvxjv9rl59hd9f0m0ksw9rgspis8qshpz8pj5785f" + "commit": "575b604cfe21f65fb07c134392c382c163c87739", + "sha256": "04wc61my2p6zbq22nh6yvap5aww9lfr5zgd7mf0l1chbvi9scdn0" }, "stable": { "version": [ @@ -32381,14 +33003,14 @@ "repo": "crystal-lang-tools/emacs-crystal-mode", "unstable": { "version": [ - 20180627, - 242 + 20200805, + 2344 ], "deps": [ "flycheck" ], - "commit": "2428b016243e78a0312cf6b3ba6939e7169a1405", - "sha256": "0al65ldsbmm15h4y79i8avk63qq1y7fqzzad8p327z6d42zfm1qj" + "commit": "f9e4db16ff9fdc6a296363aa35d19cfb4926e472", + "sha256": "1x0lmb48bza2w52s15288hpbipafs87lj5lv0ldd1q4r9yv0i102" }, "stable": { "version": [ @@ -32495,24 +33117,6 @@ "sha256": "1ffpxnwl3wx244n44mbw81g00nhnykd0lnid29f4aw1av7w6nw8l" } }, - { - "ename": "flycheck-demjsonlint", - "commit": "9a15a17a5aa78aed72958b2a1bde53f0c0ab5be7", - "sha256": "0bcfkc9fch1h6gva64j71kb9l8fc9rz6wk0s9w1c1chx1z4nlill", - "fetcher": "github", - "repo": "uqix/flycheck-demjsonlint", - "unstable": { - "version": [ - 20161115, - 718 - ], - "deps": [ - "flycheck" - ], - "commit": "a3dfe1df8ecdea76c076c0849901427567356228", - "sha256": "0zra3rl0kn70kn30wx1lqh9218k06mq3j8jadax61nnynw7bzsa5" - } - }, { "ename": "flycheck-dialyxir", "commit": "fa49551b8f726c235e03ea377bb09a8be37b9f32", @@ -32635,6 +33239,37 @@ "sha256": "1qkzir3lzz4lc5kn55qb52cm5y7iy8w1ljq6xxzcjxfbk9980y0y" } }, + { + "ename": "flycheck-eldev", + "commit": "170b59e0f97ea8a27910efc1de3c82ee188a3fe5", + "sha256": "0z83w4gd34g4kgdfc46c5zkhm0awa1hhi9p600k3sd4n8ac2ms4m", + "fetcher": "github", + "repo": "flycheck/flycheck-eldev", + "unstable": { + "version": [ + 20200614, + 1904 + ], + "deps": [ + "dash", + "flycheck" + ], + "commit": "c2e2bea1e69fe5f50a9629dec1d9b468ee92de54", + "sha256": "0rkzjzghfgypplnsx4w4ih9dh8xyysy9wb0jqmbg13zvc3jcb600" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "dash", + "flycheck" + ], + "commit": "1bddbfaa1de22879ea2b900c9f8d6f16940ee9fb", + "sha256": "0ma26gk9a3lw60i172wcwdsyfa19j7fj579b4yb7gf9ibca2hs5m" + } + }, { "ename": "flycheck-elixir", "commit": "da2ab73ab1426f71ea2b2bea2b418941856b3454", @@ -32850,30 +33485,59 @@ "repo": "jcs-elpa/flycheck-grammarly", "unstable": { "version": [ - 20200203, - 446 + 20200720, + 951 ], "deps": [ - "cl-lib", "flycheck", "grammarly" ], - "commit": "72425743364f4fd9516f94546a7432457e1e7df0", - "sha256": "17dl0g9f58gc9rkk87kg1bqy6qqz225ng7ymdg2ikhd8i2pd2zkw" + "commit": "698b82936f6b592591f7ed9cc3e3cdf0099e8d96", + "sha256": "14lp2js3vlwj2wd8l38bkg4q3dgp4n51smfi70isg3rpi8i0csxy" }, "stable": { "version": [ 0, 1, - 4 + 5 ], "deps": [ - "cl-lib", "flycheck", "grammarly" ], - "commit": "1bcb11c3c7878c1b0d73318399e572e9a15587b1", - "sha256": "1daw5mmif1nzg4yr5zm42bzzfg1n4qxps3pkcisga11mbp9g553r" + "commit": "698b82936f6b592591f7ed9cc3e3cdf0099e8d96", + "sha256": "14lp2js3vlwj2wd8l38bkg4q3dgp4n51smfi70isg3rpi8i0csxy" + } + }, + { + "ename": "flycheck-guile", + "commit": "e94519d09e86af65778a7b81877e21d139c9a529", + "sha256": "1jxdqn3smpd9vf26y24m35yg60xjkqcazlj18q0vrf4ib188d36c", + "fetcher": "github", + "repo": "flatwhatson/flycheck-guile", + "unstable": { + "version": [ + 20200721, + 103 + ], + "deps": [ + "flycheck", + "geiser" + ], + "commit": "2940f1622fa352e7ca95a9e4ad65958c5575da02", + "sha256": "0cs5r0ik6a3bl1k3imjl0r8y1i69kx9x9m9cgxj470qk34brwyj5" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "flycheck", + "geiser" + ], + "commit": "2940f1622fa352e7ca95a9e4ad65958c5575da02", + "sha256": "0cs5r0ik6a3bl1k3imjl0r8y1i69kx9x9m9cgxj470qk34brwyj5" } }, { @@ -32958,8 +33622,8 @@ "flycheck", "indent-lint" ], - "commit": "23ef4bab5509e2e7fb1f4a194895a9510fa7c797", - "sha256": "00ipp87hjiymraiv6xy0lqzhn9h3wcrw7z4dkzb2934d7bd08j29" + "commit": "c55f4ded11e8e50a96f43675a071354a8fb501c3", + "sha256": "0d7vkgzsx6ka4zliscsg6drqhg2bj16i911ryzmsp4v6hj294jrc" }, "stable": { "version": [ @@ -33042,14 +33706,14 @@ "repo": "flycheck/flycheck-inline", "unstable": { "version": [ - 20190320, - 1611 + 20200808, + 1019 ], "deps": [ "flycheck" ], - "commit": "cf9eceabff8370f3b834b943a5777b9f914583f9", - "sha256": "1sk8r90iqxpzrg0lpq4vd8ywdi08i0bbmgdivmr510jw2bpi3wp4" + "commit": "0662c314bd819f9b46f8b2b13f0c650445b3a8c5", + "sha256": "1wlvwi8y5pb3gy3j061v7krxfb1766yw5iika5ymk4zjg9g057vn" } }, { @@ -33162,6 +33826,25 @@ "sha256": "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576" } }, + { + "ename": "flycheck-keg", + "commit": "bbf222afada736c149ec91d148c25aad5e077c95", + "sha256": "1kyf3fimdi3kbg9simkn0gqmqd8i5la26p7xrhhg34am5n6wm3g6", + "fetcher": "github", + "repo": "conao3/keg.el", + "unstable": { + "version": [ + 20200726, + 218 + ], + "deps": [ + "flycheck", + "keg" + ], + "commit": "fea2f831d84d7642c35820bb63250487e46683e5", + "sha256": "062lnv7g9ixs6d0qzp6py9ajd2rbrk7l2yrz3dn5zz8lx06hbaga" + } + }, { "ename": "flycheck-kotlin", "commit": "f158727cc8892aadba0a613dd08e65e2fc791b48", @@ -33228,14 +33911,14 @@ "repo": "hinrik/flycheck-lilypond", "unstable": { "version": [ - 20171203, - 1332 + 20200614, + 2104 ], "deps": [ "flycheck" ], - "commit": "cc1b7677a932c42e5dab1661ad7b923d4aae744c", - "sha256": "1yfsg52z4nhbh33fbsig24c9s0mc4xm72ll36h6ibld9fvqsgv6k" + "commit": "17133911b519be76365103dec8c10cb2f3729f1a", + "sha256": "01486ch8vsq7kcfdpggvykbdangv2pvq2v4g9npr9izlja2kwpar" } }, { @@ -33276,38 +33959,6 @@ "sha256": "15pjqglpcwm4wy0cxk1man3ar0n56qi1bjrr1fxfjq2xwsgsfagh" } }, - { - "ename": "flycheck-mix", - "commit": "fd2a4d71b7f4c0082b687a23fd367d55186625a9", - "sha256": "1wp8lp45lc519w3xsws2c91jlbfmc0pc8764kxsifk74akwcizfl", - "fetcher": "github", - "repo": "tomekowal/flycheck-mix", - "unstable": { - "version": [ - 20200211, - 1414 - ], - "deps": [ - "elixir-mode", - "flycheck" - ], - "commit": "d3c075f61ace6695919e90239cee6567cce09638", - "sha256": "19bvnryfxz4idw1dgp90mpjbp3512423m3xqgczskv4csns4hw1q" - }, - "stable": { - "version": [ - 1, - 0, - 0 - ], - "deps": [ - "elixir-mode", - "flycheck" - ], - "commit": "c565ebb12a48fcd49cc65656d79295c3288fcb84", - "sha256": "1yncail979sfljmib7b1m9aw376xd4b76apz4d50hj83lrfy169c" - } - }, { "ename": "flycheck-mmark", "commit": "2fd10423ab80e32245bb494005c8f87a8987fffb", @@ -33322,8 +33973,8 @@ "deps": [ "flycheck" ], - "commit": "f8fdd59ccb9ddc7d81efbf3dde096dc66e3f9fa1", - "sha256": "08rwmvddla2h0wjiljl8qab87chsyc42hzap2mqih2n7finvzj4f" + "commit": "a285d849e6e227b79bef98f575ecfa43a70661da", + "sha256": "1wdv7iv3lmrpxxdas1p3grkpi08c4ipjfg170nfd2fy9nhr8iy38" }, "stable": { "version": [ @@ -33484,8 +34135,8 @@ "flycheck", "package-lint" ], - "commit": "caea75f77dc7668c7aa0ebcd48f677e3522b5d77", - "sha256": "1x63rwpyzcn99jzhyxh91l3hp2j55wspxdv5rhvnpbar5nlqlbz1" + "commit": "64cf27d69051e02a32e3c517cbfea23f9d2d7557", + "sha256": "0m2bmdwrj7ccf6ndv089qbbrz1msbcgls0ckbbhzpxxq39as2rpv" }, "stable": { "version": [ @@ -33552,8 +34203,21 @@ "flycheck", "pest-mode" ], - "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023", - "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih" + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "flycheck", + "pest-mode" + ], + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" } }, { @@ -33571,8 +34235,8 @@ "flycheck", "phpstan" ], - "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", - "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" + "commit": "e675cf0881408e10b76f2e70c6158237cb94671e", + "sha256": "11qd0mpcvc56hghwv60a57d5pap19s7yvlvi6827wnrq35cyzh7f" }, "stable": { "version": [ @@ -33728,15 +34392,15 @@ "repo": "alexmurray/flycheck-posframe", "unstable": { "version": [ - 20191214, - 1109 + 20200817, + 412 ], "deps": [ "flycheck", "posframe" ], - "commit": "2b3e94c2e427ec9831c513007460c5ea9e2225a3", - "sha256": "1hmplb61xvz6p2b2pv6pg5bv7q7mirmgr0n1by1hj1w479g8rps3" + "commit": "c928b5b5424fe84a0b346e28bd7d461c80b27482", + "sha256": "1prjqqhzzaznbsysdipgvcinl3zkbgf19rb061h5mrqbgjw1l8f4" } }, { @@ -33757,6 +34421,38 @@ "sha256": "00jlw18y68yq0fyvfzhvw89a4nmv1ah4c8h4d6g79rl5djnb48hk" } }, + { + "ename": "flycheck-psalm", + "commit": "148d9b28e683a6602bb18eecaaf3cbc8dede65b1", + "sha256": "1a8mvf268bbfg6f557xdmhwa8ihi2misy8ps30kkia9asb176smz", + "fetcher": "github", + "repo": "emacs-php/psalm.el", + "unstable": { + "version": [ + 20200510, + 1540 + ], + "deps": [ + "flycheck", + "psalm" + ], + "commit": "b2a1e8a9524b0004e62996c70da5536f86e56182", + "sha256": "0r0qz5bdznzdj7zxq6a6fz7fwn2c978bq57yywj3fcy8f5vh8jcf" + }, + "stable": { + "version": [ + 0, + 6, + 0 + ], + "deps": [ + "flycheck", + "psalm" + ], + "commit": "aaa77b4ceb61d41a520baa0b84b9b236c99c4156", + "sha256": "1fnr8sbx74c4mdz91y6b4m0n6njjb0qa01r4i9975q197vwzni48" + } + }, { "ename": "flycheck-pycheckers", "commit": "af36dca316b318d25d65c9e842f15f736e19ea63", @@ -33765,25 +34461,25 @@ "repo": "msherry/flycheck-pycheckers", "unstable": { "version": [ - 20200428, - 40 + 20200807, + 610 ], "deps": [ "flycheck" ], - "commit": "dcf5b097b7c1206f6325547f5cf37b867a6a5ffb", - "sha256": "16fwk1prq7gyhs0yk4bmr9j3wxnznjj9ppbxwidnmpbhdis2f0sv" + "commit": "055830b67cd0f0d7196a5b71bd5cce3197a557a7", + "sha256": "1zw6993a8l7yf3j8dbagmj051m1z8cdax2pzm0l2p2dxvkm0h4s2" }, "stable": { "version": [ 0, - 14 + 15 ], "deps": [ "flycheck" ], - "commit": "c5349c0fb3b719469b7e66dbdfbe58d0813f6a74", - "sha256": "02886xggdb09880jp57cah3fmf1nm77gvb0aaws8j4abl278g7x5" + "commit": "44b11b51c97fd334ecdce74169c0e65123ef5991", + "sha256": "08wsr0hrmbh24bzsd2ghc82mp4m31ms3aykv0x68vpspzm06yyi3" } }, { @@ -33831,27 +34527,27 @@ "repo": "purcell/flycheck-relint", "unstable": { "version": [ - 20200320, - 2223 + 20200721, + 2217 ], "deps": [ "flycheck", "relint" ], - "commit": "296cf8e2f9e85ab0c1c591816b50ecd7c766060c", - "sha256": "148xh1alng4s3ydnhwjjrcmq1390pn6ymjszaamrzljwfqzh85ky" + "commit": "86ebb4dac919eda01341b15b9c896742b9d17c30", + "sha256": "1k638y125xyb0bc5i2zrkypwb770jn1ndky6qak31n4ws41xynbd" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "flycheck", "relint" ], - "commit": "296cf8e2f9e85ab0c1c591816b50ecd7c766060c", - "sha256": "148xh1alng4s3ydnhwjjrcmq1390pn6ymjszaamrzljwfqzh85ky" + "commit": "d1e54d4bfdb12d0b60a1b9a8c2b11799426ddc57", + "sha256": "095vxjy6aacvmav86sg8b43svlnad7h8a83nl830v4nynpmx3183" } }, { @@ -33869,8 +34565,8 @@ "flycheck", "rtags" ], - "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", - "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" + "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824", + "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b" }, "stable": { "version": [ @@ -33920,25 +34616,6 @@ "sha256": "1fh6j5w2387nh2fwwjphkhq17cgj5m2q5k0fhidvgc2w65lzbr1r" } }, - { - "ename": "flycheck-stack", - "commit": "b77f55989d11d1efacbad0fd3876dd27006f2679", - "sha256": "1r9zppqmp1i5i06jhkrgvwy1p3yc8kmcvgibricydqsij26lhpmf", - "fetcher": "github", - "repo": "chrisdone/flycheck-stack", - "unstable": { - "version": [ - 20160520, - 944 - ], - "deps": [ - "flycheck", - "haskell-mode" - ], - "commit": "f04235e00998000ee2c305f5a3ee72bb5dbbc926", - "sha256": "139q43ldvymfxns8zv7gxasn3sg0rn4i9yz08wgk50psg5zq5mjr" - } - }, { "ename": "flycheck-stan", "commit": "e1d19cd6b80080aad5eff159c1bc7f7585bcd655", @@ -33954,8 +34631,8 @@ "flycheck", "stan-mode" ], - "commit": "599a0440086c660e6823622b35058f6d2d6d9637", - "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" + "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e", + "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0" }, "stable": { "version": [ @@ -34089,15 +34766,15 @@ "repo": "nhojb/flycheck-swiftx", "unstable": { "version": [ - 20200504, - 1345 + 20200814, + 845 ], "deps": [ "flycheck", "xcode-project" ], - "commit": "1b9174fb37498dc3a3cf8bbbfbb4f0470e8ef139", - "sha256": "1qiddgrrf2d0sjmikd9yy53v5vxfh13j1m9qq40ap9vz7x4661va" + "commit": "84f42393dea362d3bdfc9253a205a17ec7a12a76", + "sha256": "0v5km3hf58xysal526l4l2jpyibh0l6f367vwmn4zi64cl5hvf3p" } }, { @@ -34813,6 +35490,24 @@ "sha256": "0rzlw80mi39147yqnpzcvw9wvr5svksd3kn6s3w8191f2kc6xzzv" } }, + { + "ename": "flymake-kondor", + "commit": "ca065538aa80cd33b08092d7787c6b4a1754fb31", + "sha256": "1wgd42g3rfdrf93isfk0z5r6naxibripad3ds08iv20qqcdryasd", + "fetcher": "github", + "repo": "turbo-cafe/flymake-kondor", + "unstable": { + "version": [ + 20200714, + 646 + ], + "deps": [ + "flymake-quickdef" + ], + "commit": "530bf3e6c401d17f6b4f784a1f2524d5ba2d3414", + "sha256": "06adysd3q1gh92y0cdsnlmb588gdax85ad7pkmi324bixck5ggqx" + } + }, { "ename": "flymake-ktlint", "commit": "7b2e630e5e16044fb8ffe251f4fa58fb8f3d6bb9", @@ -34917,8 +35612,20 @@ "deps": [ "pest-mode" ], - "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023", - "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih" + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "pest-mode" + ], + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" } }, { @@ -34982,8 +35689,8 @@ "deps": [ "phpstan" ], - "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", - "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" + "commit": "e675cf0881408e10b76f2e70c6158237cb94671e", + "sha256": "11qd0mpcvc56hghwv60a57d5pap19s7yvlvi6827wnrq35cyzh7f" }, "stable": { "version": [ @@ -35314,11 +36021,11 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20200215, - 1408 + 20200601, + 944 ], - "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", - "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" + "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83", + "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x" }, "stable": { "version": [ @@ -35345,8 +36052,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", - "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" + "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83", + "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x" }, "stable": { "version": [ @@ -35377,8 +36084,8 @@ "flyspell-correct", "helm" ], - "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", - "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" + "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83", + "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x" }, "stable": { "version": [ @@ -35409,8 +36116,8 @@ "flyspell-correct", "ivy" ], - "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", - "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" + "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83", + "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x" }, "stable": { "version": [ @@ -35441,8 +36148,8 @@ "flyspell-correct", "popup" ], - "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", - "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" + "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83", + "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x" }, "stable": { "version": [ @@ -35714,21 +36421,6 @@ "sha256": "0ghj0nw2zlrppsgl6x2nda9fj4w04rz6647v9823wxhfirrgnd5z" } }, - { - "ename": "font-lock-cl", - "commit": "b7a2635ceb34f49f84f35e11c14521592a9d330f", - "sha256": "1d8r3d558ipk324hpgfm4fv4kxk6mhvkka3aqd4kcv8zv0k79iq3", - "fetcher": "github", - "repo": "font-lock-cl/font-lock-cl", - "unstable": { - "version": [ - 20200321, - 533 - ], - "commit": "9f82d31f9f0fb06bbc2ce18e21e79d1eabbe6c5e", - "sha256": "0b6g36frvp1i92qn8rv3dcm8sxiw5yvbvhl7j58x2xwvawn79nfd" - } - }, { "ename": "font-lock-profiler", "commit": "b372892a29376bc3f0101ea5865efead41e1df26", @@ -35930,8 +36622,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20200425, - 2225 + 20200725, + 1419 ], "deps": [ "closql", @@ -35943,8 +36635,8 @@ "markdown-mode", "transient" ], - "commit": "e2da80660a0550f613400ce3b238025589800417", - "sha256": "0m80w0qh6icj365pcg9d0kb2nvmv48c3874wy15mjcilzb6i97av" + "commit": "feee7e2fce3f87f7aa113c5edcb1896127ee9d12", + "sha256": "1nn73hxhp7rziwdnnvz6avn1gkax531f4l72sk0v4ywdwjhnnlgs" }, "stable": { "version": [ @@ -35975,11 +36667,11 @@ "url": "https://depp.brause.cc/form-feed.git", "unstable": { "version": [ - 20200506, - 1300 + 20200527, + 2152 ], - "commit": "b5dbfd8b90e72de84ae7b6667947264fe655c163", - "sha256": "0n2k0ki6k1pgni907fvz09z3hbfbchnv1q80j42w23qam2hp7a3f" + "commit": "fc06255e185d32b1616bd86b69b55c1daabbe378", + "sha256": "05yqyp20bvfk5n1nqyffv1k8l1zl1bpz8q32kzqarm9fim2wv23n" }, "stable": { "version": [ @@ -35999,15 +36691,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20200513, - 1930 + 20200804, + 1822 ], "deps": [ "cl-lib", "language-id" ], - "commit": "0227e1aadeb18db397f03368d54cbefe4afd6112", - "sha256": "0p04xgswp269a17jpiwpj8qfj3c2zvkmr4vn0wa1dfrw5f5bfj2x" + "commit": "ccfff41a200e16e3644c2531e984959392e3341a", + "sha256": "0wqq86gfilrg9jf9yls9wcxy926j44lvzafj92kdmmyzbas1nm9k" }, "stable": { "version": [ @@ -36144,26 +36836,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20200516, - 624 + 20200811, + 652 ], "deps": [ "seq" ], - "commit": "83d308b6fd26662bc8fb204c4d634616e03dca44", - "sha256": "0a068qfc969bvxyynrk2yakv2l3y31snnvcpdsbxd4m4m6drv3lw" + "commit": "55be196ef20cdc276b3bde1a39444df1cc599f9b", + "sha256": "14baj9ldssdb5vrc3fl7c7nhc2iff6gxa7v2flcjjnazfg87r3b2" }, "stable": { "version": [ 3, - 1, - 0 + 2, + 2 ], "deps": [ "seq" ], - "commit": "9027c6f2b2a2d7d64501e55ff3531cdef26c463d", - "sha256": "08giwg0jwk8zzj2i4cm08322qr6znrnv9a49za7c6j47bykpwj6s" + "commit": "1405217e69d055b869e804d33feca23cb602f759", + "sha256": "0rwdwbw9cq8ljvbmgmz9izank8dqjki79l1bw127lli69fs72gyi" } }, { @@ -36274,15 +36966,15 @@ "repo": "davidshepherd7/frames-only-mode", "unstable": { "version": [ - 20190524, - 1439 + 20200728, + 740 ], "deps": [ "dash", "s" ], - "commit": "ce55b3ad3b3cb4c4253a0172bb8e9461814b2d64", - "sha256": "1sw1s2k4wch32h5r0z6bfyiw4qcwjz93lq36ix17r968r505djc2" + "commit": "3cd98cbf80b04ae2ebca1c67c52ba756116f6784", + "sha256": "0smyic3x3b98ipwhb9pw47nnymccy4w7k3dbng2g2zhgwi5pyc1k" }, "stable": { "version": [ @@ -36366,15 +37058,15 @@ "url": "https://git.launchpad.net/frecentf.el", "unstable": { "version": [ - 20191204, - 312 + 20200624, + 1534 ], "deps": [ "frecency", "persist" ], - "commit": "1d5d641fdd93480db2374276e85ec652af0565c5", - "sha256": "01l92rz4hll2v5k0xppmszcpy0r6lxgm4cql0zxkcj5yhgzjmrln" + "commit": "d9d093365ffe12c46e81d16ee81850abd86a2177", + "sha256": "06w17km8hmlr2mrxi26g51mnfvcvilw91b17y52pmx09jgnqa9ac" } }, { @@ -36454,8 +37146,8 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20200510, - 1438 + 20200527, + 830 ], "deps": [ "cl-lib", @@ -36463,14 +37155,14 @@ "friendly-tramp-path", "with-shell-interpreter" ], - "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", - "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", + "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "cl-lib", @@ -36478,8 +37170,8 @@ "friendly-tramp-path", "with-shell-interpreter" ], - "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", - "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", + "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" } }, { @@ -36490,28 +37182,28 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20200510, - 1438 + 20200527, + 830 ], "deps": [ "cl-lib", "with-shell-interpreter" ], - "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", - "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", + "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "cl-lib", "with-shell-interpreter" ], - "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", - "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", + "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" } }, { @@ -36522,30 +37214,30 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20200510, - 1438 + 20200527, + 830 ], "deps": [ "cl-lib", "dash", "with-shell-interpreter" ], - "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", - "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", + "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "cl-lib", "dash", "with-shell-interpreter" ], - "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf", - "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8" + "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6", + "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16" } }, { @@ -36668,16 +37360,16 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20191130, - 1857 + 20200520, + 1842 ], "deps": [ "dash", "eglot", "s" ], - "commit": "8c86e38b93aac55f57d5baf3a9575b45b54cd16a", - "sha256": "08c8v5wnb7fi4pbi5ivkhi3l4nf8mhn9b9829nkpz1l5q9lmz263" + "commit": "3e41fe1391b64eefa66a8a02fce27a12a04e1e01", + "sha256": "03ln0dmjkg4bnpabnw27vby3jqf40wzvs3znynqqqx7cn53vy5fp" }, "stable": { "version": [ @@ -36701,8 +37393,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20200424, - 2235 + 20200624, + 2201 ], "deps": [ "company", @@ -36712,8 +37404,8 @@ "quick-peek", "yasnippet" ], - "commit": "d8b586518f32d4acde049852d81902670d1ee277", - "sha256": "0av315lf58nwgvix100bj279mq2pm175vwc5dip19gn73bq4d9vi" + "commit": "bd28cb8f25538e26287c76efbbc5ef7378d1fbc6", + "sha256": "1jvvasin29bwxq7cmviv0431jb7p2gq3yh12pyf6f5zinsax97cp" }, "stable": { "version": [ @@ -36743,8 +37435,8 @@ "deps": [ "cl-lib" ], - "commit": "68f6eeb3adbc7d9f71d24761600bf8538775c969", - "sha256": "16iz2wf8bn4mjcgbc5vj50snlgiqqdc495kxbd9mcld5rjhfs45q" + "commit": "3fdb0325ca2a6d80e4111af43b1b166808022020", + "sha256": "0kid3a0qq2qvzndbs1c69z30f2in7q7fzpv6yas84f8y5kkmk220" }, "stable": { "version": [ @@ -36861,10 +37553,10 @@ }, { "ename": "fuo", - "commit": "25fb625becf7f582d2a8d53726d6f01d9ea89ecc", - "sha256": "02mvgz2cxrdn5kp5dw0c57rl5nfavqli5yqbxczmbsih164ljdxf", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1aaqa7lih9gh4rz51jy577l95rgmyhna2h9ci1h4baini19mxi26", "fetcher": "github", - "repo": "cosven/emacs-fuo", + "repo": "feeluown/emacs-fuo", "unstable": { "version": [ 20190812, @@ -36897,14 +37589,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20200415, - 1228 + 20200627, + 732 ], "deps": [ "cl-lib" ], - "commit": "2befd490ce7d78a43d001b4bb0bd4300d086d645", - "sha256": "0p4ii7mbspx1fsmzx9n8z2siq9n8ixpisxs388ndd2ccp7x3k6nm" + "commit": "9db9fb81e08b6ded43a4eede5220644ce354060d", + "sha256": "0hcwqsq65hlznsq2k5bviwzyh82sddfb28v5xna0016yphbdng2h" } }, { @@ -36918,8 +37610,8 @@ 20200104, 524 ], - "commit": "0b6b64cebde5675be3a28520ee16234db48d3b8b", - "sha256": "1bddjr3rpmvkrljq5ipjm42d59m2897cpfhmiah3rcb4c6ra40m1" + "commit": "fee874aa35d2ee6b12b836290b5c8eaa44175a28", + "sha256": "1xswm8my29i4fddy64k21b1vclbr5fjb0pisb4hs8ynkk5w1kw2a" }, "stable": { "version": [ @@ -37069,6 +37761,21 @@ "sha256": "14drm6b6rxbcdilcms1jlqyrqbipcqbdil6q06ni9pgafi7xp8hz" } }, + { + "ename": "gameoflife", + "commit": "bdfc00fe567155ae98fbf1a44d0bb4fa3a8e5786", + "sha256": "0vjlbpf9672442lzcw1p39vldywy4a1yj2mcwmbsqhpjlnzalw4l", + "fetcher": "github", + "repo": "Lindydancer/gameoflife", + "unstable": { + "version": [ + 20200614, + 1814 + ], + "commit": "2483f3d98dbcf7f1633f551cc3691f5659b4b942", + "sha256": "1a57fc8ylrdlqlywp81b71jd93hiwkxy6gxpi8358d6d4czslvq7" + } + }, { "ename": "gams-ac", "commit": "ca2681b39ac5a985c2f70b4b84ee3c10af1a7ca4", @@ -37188,20 +37895,20 @@ "repo": "GDQuest/emacs-gdscript-mode", "unstable": { "version": [ - 20200427, - 1514 + 20200726, + 1721 ], - "commit": "0718ca9b090780bd28d02ef5c79cd0e7c5a84d5e", - "sha256": "0wdsfakx50x60lxb6d46h9rhb1vrisch71fmdl1c8jiwf57q5kpn" + "commit": "7aea87bd7b3cd14b1a767e7d835cee896722cd29", + "sha256": "1cq2k054ngqwanayy7fgkqdb5fq6xcqdglpyxngqmh765lyb7nrb" }, "stable": { "version": [ 1, - 1, + 2, 0 ], - "commit": "86577f81dc2640d5388565d0430b4df241bdd38e", - "sha256": "0cpfdbza3gh1s6y5igs51b1m7g7dfa7jszjfawz3v2g49p4a5m2d" + "commit": "36c92dff1587d7c3c7ff2cd02d8e158cbed55215", + "sha256": "02by4bvdayldbjlz6jkp36m5rgcy2h5bwhqx2cj7wma6xf6cw3lf" } }, { @@ -37289,20 +37996,49 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20200513, - 1219 + 20200714, + 1210 ], - "commit": "7a39c8eb7ca2a0a4fe0ad307ea55578e11e6dfdd", - "sha256": "09lv9ixgrkb351nb67nas5yfa8vk0rz4ljhc1hxxn4g451hbd14f" + "commit": "adc5c4ab5ff33cf94cb3fcd892bb9503b5fa2aa2", + "sha256": "0n718xpys7v94zaf9lpmsx97qgn6qxif1acr718wyvpmfr4hiv08" }, "stable": { "version": [ 0, - 11, + 12 + ], + "commit": "adc5c4ab5ff33cf94cb3fcd892bb9503b5fa2aa2", + "sha256": "0n718xpys7v94zaf9lpmsx97qgn6qxif1acr718wyvpmfr4hiv08" + } + }, + { + "ename": "geiser-gauche", + "commit": "1cb02b836748f31be26013d2e43ada6d68f35c90", + "sha256": "1fbhfaz304bfzq7m75kifpfxb69zx4ymnvanfv7lnmbx6fqqfrqp", + "fetcher": "gitlab", + "repo": "emacs-geiser/gauche", + "unstable": { + "version": [ + 20200802, + 1300 + ], + "deps": [ + "geiser" + ], + "commit": "66e51430bded0f0e2037f474818a7bbaafb2906c", + "sha256": "1gsvl0r6r385lkv0z4gkxirz9as6k0ghmk402zsyz8gvdpl0f3jw" + }, + "stable": { + "version": [ + 0, + 0, 2 ], - "commit": "51252bcb35d6afe006487b73c1e2276210b4ed83", - "sha256": "1khi1bghsjx6cs5acizmlbw9z19s4qycnji9krdbn42cbpv0rysv" + "deps": [ + "geiser" + ], + "commit": "9e7ed54e5629f759660569bc7efc3d75dbabbc5f", + "sha256": "0rxncnzx7qgcpvc8nz0sd8r0hwrplazzraahdwhbpq0q6z8ywqgg" } }, { @@ -37323,6 +38059,21 @@ "sha256": "0j2djjgfd4hd2k60ymgxzpsy52ks6hxpd4rr81z5nh9fdg9axhrs" } }, + { + "ename": "gemini-mode", + "commit": "2cc0e9039171064cd0fb37b3eb5324c91a88ef7a", + "sha256": "1mbhv034jk4bwi58z6jc2r4d828v0ir3jwqpgi2mfjnjxk5x5ga5", + "fetcher": "git", + "url": "http://git.carcosa.net/jmcbray/gemini.el.git", + "unstable": { + "version": [ + 20200813, + 1424 + ], + "commit": "d114bacfb12f9e66821254ff0a1fb85443700b24", + "sha256": "0m7jricw40h4r30kcg60dl2ybgrdbiglnb55lz3n70bc5nsx8dcd" + } + }, { "ename": "general", "commit": "d86383b443622d78f6d8ff7b8ac74c8d72879d26", @@ -37456,8 +38207,8 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20200226, - 2137 + 20200727, + 2006 ], "deps": [ "dash", @@ -37465,8 +38216,8 @@ "magit", "s" ], - "commit": "36870fd34ad681f907a57a2d82b2002735878614", - "sha256": "0h9v4ajp50wpg3zz0p7klyi705ynfy2mka0hpzz81kgpq8q8f46z" + "commit": "eb4b182e493a6d5d3e94c9ff5abe0a0206b03c7c", + "sha256": "16v043avd9sm0rq7951x7045zfxhiadq2q056grkjgcpy2id45lw" } }, { @@ -37603,10 +38354,10 @@ }, { "ename": "gh-md", - "commit": "2794e59d5fea812ce5b376d3d9609f50f6bca40e", - "sha256": "0b72fl1hj7gkqlqrr8hklq0w3ryqqqfn5qpb7a9i6q0vh98652xm", + "commit": "b38908bc1b759b14173ffb49ddeb040a9892cc0d", + "sha256": "11bbicmv15qfh4s5bpgvbnc6v9v1hdh6y0clii5k8jv4p1nxfix4", "fetcher": "github", - "repo": "emacs-pe/gh-md.el", + "repo": "emacsorphanage/gh-md", "unstable": { "version": [ 20151207, @@ -37754,28 +38505,28 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20200425, - 2233 + 20200801, + 815 ], "deps": [ "let-alist", "treepy" ], - "commit": "206f2b5b2ab622efda8da85feaa3bc2a1e0f3da3", - "sha256": "132y2yi9c91p25cwnvb9w6jj7la6fdc0xlvnxmbnfnxaic4jyhs3" + "commit": "942e7bdabc4b938a0535530c26eb6548504fca24", + "sha256": "07iy4203ppvzkh67sb0v968hnypnvy4dpfy0qpqrp8zmc455dxq5" }, "stable": { "version": [ 3, - 3, - 0 + 4, + 1 ], "deps": [ "let-alist", "treepy" ], - "commit": "eec071aa9e2810c8ce2f2522e6be8d78f579069d", - "sha256": "1229g0d9f4ywwjndx32x4z5jdr0kzyi44hjxmy0sifwfmg9nn251" + "commit": "942e7bdabc4b938a0535530c26eb6548504fca24", + "sha256": "07iy4203ppvzkh67sb0v968hnypnvy4dpfy0qpqrp8zmc455dxq5" } }, { @@ -37984,11 +38735,11 @@ "repo": "ryuslash/git-auto-commit-mode", "unstable": { "version": [ - 20200322, - 2007 + 20200801, + 748 ], - "commit": "dd0c2441de0f5ff8c69c8260d9450d0b607e3e55", - "sha256": "0r7jry1sbqsp7c1vxf7fchc7ivmnccfrflg52379v3gmpvd8s0kn" + "commit": "d4fd94320610100f23de083493d12de3324304b5", + "sha256": "180rzh53hrd374nf96cz8n6brxvi68fgss21ic5r623hkczhi73b" }, "stable": { "version": [ @@ -38038,15 +38789,15 @@ "repo": "walseb/git-backup-ivy", "unstable": { "version": [ - 20200424, - 1049 + 20200709, + 818 ], "deps": [ "git-backup", "ivy" ], - "commit": "d9361c9ad903e0d58f25ccebad99d9a753f1937a", - "sha256": "0jkkajv0scbp91al18fqqyvvcda2z6wkkbz0p1rcwzap5g96b7ag" + "commit": "0a5c52e64d0062f77ffefc9213e75690c6d7b111", + "sha256": "060x20c4q7cr5zrfsa28z2zgr6isfb2y2ys450h46a9yi3w9h60f" } }, { @@ -38105,16 +38856,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200207, - 1819 + 20200701, + 2112 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", - "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" + "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe", + "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n" }, "stable": { "version": [ @@ -38312,16 +39063,16 @@ "repo": "akirak/git-identity.el", "unstable": { "version": [ - 20200124, - 1856 + 20200810, + 1106 ], "deps": [ "dash", "f", "hydra" ], - "commit": "8471e6f8ef6c502dc999e513b552d6b23974d40d", - "sha256": "1w4dnrc0dq0brdq0dpk5lj7ji50v5b7q32f1ghkvx50i7a3dslvq" + "commit": "6bf8b2cd72061eac5a4d247ba2fabdd8deafdea7", + "sha256": "1p6if6fvz6m7nnd7fl1j2dxg830ax06ln9wvm5anpsdky0lqwqyr" }, "stable": { "version": [ @@ -38385,20 +39136,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20200331, - 2329 + 20200721, + 2250 ], - "commit": "7142ec898f0cb97aa5d1a68da7957b4710bbfa87", - "sha256": "0xcgzhlxd7ycfxmbgkwm04pdfjysygkka3jis4p45zy6mrackn4c" + "commit": "cbaf7033edad8d4712b6e7dc11cad979c6a002de", + "sha256": "074xqp1apcrmnh2cb9m60gaq78hzybyg5sr09n37ka0sw447rp15" }, "stable": { "version": [ 0, - 7, - 5 + 8, + 0 ], - "commit": "267bd81c228bdab434172dbef896f3f3b82713fa", - "sha256": "04xa6lp8wkjb6zs096bf4sz124grcjj15xv1h009bmn2j95rggj6" + "commit": "2f61413bec5d94b068140a764ba8c2a732ac8d58", + "sha256": "1cj04nzqxwvi1f97y36n311nayj31y3iy7kysb31nlfn19y2g4wj" } }, { @@ -38496,14 +39247,14 @@ "repo": "pidu/git-timemachine", "unstable": { "version": [ - 20190730, - 849 + 20200603, + 701 ], "deps": [ "transient" ], - "commit": "391eb61050de321101e631fcf373fc70ec6e7700", - "sha256": "1pz4l1xnq6s67w5yq9107vm8dg7rqf8n9dmbn90jys97c722g70n" + "commit": "8d675750e921a047707fcdc36d84f8439b19a907", + "sha256": "1ppids836gdk5j8cli8wkzkjb85f4s1s550v5xpxyyq75rj1bnsr" }, "stable": { "version": [ @@ -38753,11 +39504,20 @@ "repo": "TxGVNN/github-explorer", "unstable": { "version": [ - 20190701, - 630 + 20200803, + 1445 ], - "commit": "e3a410dd1113bdff382a745465ea48d9b1fe860b", - "sha256": "1yq9bsy2qry49q1asdxnfyhahsp499b37l2yabwhpbxjlb7mmnp6" + "commit": "e6bdc500dd9b580ed12a54d18600f5db541b38b8", + "sha256": "1a9hnmx1q7fxyyxn0ji2mcam6wz8rwxi7a71f5542l65ah20gg1r" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "e6bdc500dd9b580ed12a54d18600f5db541b38b8", + "sha256": "1a9hnmx1q7fxyyxn0ji2mcam6wz8rwxi7a71f5542l65ah20gg1r" } }, { @@ -38850,8 +39610,8 @@ "ghub", "s" ], - "commit": "50c6bcc7cf4d7193577b3f74eea4dd72f2b7795b", - "sha256": "0khsxsqzx81y5krj06i8v84qsb3z86b1z17knyr1xizrd2lmraqp" + "commit": "fab440aeae4fbf6a8192fd11795052e9eb5d27d1", + "sha256": "19kk55r0qixmvw1q80x3rnvcssrq64k5b5ixp8wjzpg6h65s9vk9" } }, { @@ -39078,7 +39838,7 @@ "dash", "helm" ], - "commit": "a0ba22ae7098b1a57af626fe5b6e9d663e8e2fc3", + "commit": "782df679e33646db29e07508311bc8e8624b484e", "sha256": "1mxkcnjgazc1pyjbqqfnhc9phpyrgah960avm2fmi7m9n5v8cf0w" }, "stable": { @@ -39198,11 +39958,11 @@ "url": "https://git.launchpad.net/global-tags.el", "unstable": { "version": [ - 20200511, - 2146 + 20200520, + 1816 ], - "commit": "5239c1ba873eb907d5665964820b4a7ddbf75b5c", - "sha256": "0yp1hq849drkkbypaaak36i5s1q9ff549w21qswmi60nmiikabsg" + "commit": "f3c93828ab08895bf7eac8a2d3bfd949303a6d1f", + "sha256": "1ar9pgc31mfv2x26qpvsmiv2lnczfjliplnzjxnrmiccqiabp1y8" } }, { @@ -39514,8 +40274,8 @@ "repo": "deusmax/gnus-notes", "unstable": { "version": [ - 20200509, - 1942 + 20200605, + 1421 ], "deps": [ "async", @@ -39526,17 +40286,26 @@ "org", "s" ], - "commit": "c5c057263ecc86f60b62a1e811e63cfb1c394c15", - "sha256": "1rfkc6pp2kkin87hbjz1192hb6hf24ygiyd6zigs3bfaxja313rp" + "commit": "2b587ac2e428fe3805443df5306e67d78bdf8ec2", + "sha256": "0r08dhc6w2zk8is738qd6rkpq03n1fnfr398lsqgn2jaizgsik0l" }, "stable": { "version": [ 0, 3, - 1 + 2 ], - "commit": "8373615b1b5945db485ab18205fdd1077ee0a506", - "sha256": "10ddsw1idyn1w2w92gs6i7a14hq347qib521vk7yqb9s4qyxg1fg" + "deps": [ + "async", + "bbdb", + "helm", + "hydra", + "lv", + "org", + "s" + ], + "commit": "56403ee22242fd479c2aff85f4cf4133e32ca90a", + "sha256": "0g26ygcmbcmxbafvyw04xcqzg2dlava2rqa5m2lv0cxyi6rnvdhj" } }, { @@ -39729,11 +40498,11 @@ "url": "https://git.sr.ht/~zge/go-capf", "unstable": { "version": [ - 20200216, - 936 + 20200814, + 1046 ], - "commit": "9e66ce4ef4307e9f0e73e65f6bb2f287ed2c940b", - "sha256": "1sgsxd511xw1g707c0d58j3xzxfbay7k5b7hyamd2fnh30pw2hb3" + "commit": "acc353135f390245453f0d90f5846f67b0a84952", + "sha256": "1hb8glprzpm94bsyx2mnv9w6b825y451agpqh2ry8ngydbc1llhi" }, "stable": { "version": [ @@ -39803,26 +40572,26 @@ "repo": "benma/go-dlv.el", "unstable": { "version": [ - 20191005, - 829 + 20200713, + 1202 ], "deps": [ "go-mode" ], - "commit": "d3cca689e76b71e0ef0ab827c7e01cd9042d2095", - "sha256": "0qdbfg9ihxwywjyir3lj1azwsaw425f90gp3182q7165j5v43k9w" + "commit": "69b86c1bdb73d78fb3404f2f1eefbc9a93b1aba6", + "sha256": "1ww91sw15qnwrglz9q37vxm5qxxa43ccpyczz7kkjp66qs6746wh" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "go-mode" ], - "commit": "d3cca689e76b71e0ef0ab827c7e01cd9042d2095", - "sha256": "0qdbfg9ihxwywjyir3lj1azwsaw425f90gp3182q7165j5v43k9w" + "commit": "69b86c1bdb73d78fb3404f2f1eefbc9a93b1aba6", + "sha256": "1ww91sw15qnwrglz9q37vxm5qxxa43ccpyczz7kkjp66qs6746wh" } }, { @@ -39878,6 +40647,21 @@ "sha256": "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3" } }, + { + "ename": "go-expr-completion", + "commit": "8d09efb2e93fefd5158685084691ccf20178fe78", + "sha256": "1fhcwwv377zahg6nh9v9vigb7pqnm6r0fwvfa6fd5j81vffivaww", + "fetcher": "github", + "repo": "fujimisakari/emacs-go-expr-completion", + "unstable": { + "version": [ + 20200817, + 1750 + ], + "commit": "66bba78f52a732b978848e3a4c99fa2afeb6c25f", + "sha256": "0gbxgf36p24gjh9n5swmvyzl4h518lx63zyf0b80xnrvb7d5qi46" + } + }, { "ename": "go-fill-struct", "commit": "0c03d2382efd20e248b27b5505cdeed67d000f73", @@ -40084,28 +40868,27 @@ "repo": "grafov/go-playground", "unstable": { "version": [ - 20190625, - 1855 + 20200818, + 2215 ], "deps": [ "go-mode", "gotest" ], - "commit": "508294fbc22b22b37f587b2dbc8f3a48a16a07a6", - "sha256": "18vsrckkazfzksjpyx1lbwg5hdgd43ndaj3csy3i3hk7p26x98lm" + "commit": "ede417a52c0eea1a69658f4c6c6c12d6165e64a4", + "sha256": "1zzdkp6zqh03gfiirmvwv5c8s9m4511zcaya9cp5sjzmh0g5wjip" }, "stable": { "version": [ 1, - 6, - 1 + 7 ], "deps": [ "go-mode", "gotest" ], - "commit": "508294fbc22b22b37f587b2dbc8f3a48a16a07a6", - "sha256": "18vsrckkazfzksjpyx1lbwg5hdgd43ndaj3csy3i3hk7p26x98lm" + "commit": "ede417a52c0eea1a69658f4c6c6c12d6165e64a4", + "sha256": "1zzdkp6zqh03gfiirmvwv5c8s9m4511zcaya9cp5sjzmh0g5wjip" } }, { @@ -40140,18 +40923,19 @@ "repo": "dougm/go-projectile", "unstable": { "version": [ - 20181023, - 2144 + 20200609, + 131 ], "deps": [ + "dash", "go-eldoc", "go-guru", "go-mode", "go-rename", "projectile" ], - "commit": "7910884b4de560f3fc70b53752f658ef9cdc02cd", - "sha256": "03bh8k95qrc3q1sja05bbv3jszh6rgdv56jpi8g06yxk53457a1n" + "commit": "ad4ca3b5695a0e31e95e3cc4ccab498f87d68303", + "sha256": "1ai34z7n56cczz6qb0vbcrqbjrkmxwv9r928pjbw58812nycj1mh" } }, { @@ -40300,20 +41084,20 @@ "repo": "emacsorphanage/god-mode", "unstable": { "version": [ - 20200413, - 2144 + 20200708, + 2200 ], - "commit": "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7", - "sha256": "0kqw6w72prhxbqvxccbrc80q82yfif0y99nfgqd60rfk9mpl369k" + "commit": "ad2e6745294843462f78768b5a1cd3b0d3563951", + "sha256": "00v69c76737yfmy3injhf6l1khj67rr0xvpq0yyjxg4hh9dv4j90" }, "stable": { "version": [ 2, - 16, + 17, 2 ], - "commit": "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7", - "sha256": "0kqw6w72prhxbqvxccbrc80q82yfif0y99nfgqd60rfk9mpl369k" + "commit": "2e519312fdef36dea523aa530d134a703d3032a6", + "sha256": "1gnwl81immxdq72hsxgic2631r4jsq9pv5jqh0jzji0q320m9xcl" } }, { @@ -40404,14 +41188,14 @@ "repo": "stardiviner/goldendict.el", "unstable": { "version": [ - 20180121, - 920 + 20200731, + 1119 ], "deps": [ "cl-lib" ], - "commit": "1aac19daaec811deb9afe45eea4929309c09ac8b", - "sha256": "1il432f6ayj2whl4s804n5wykgs51jhbx4xkcbfgqra58cbjrjhi" + "commit": "ad5212f6ade58c193287851a46c3f9378fe2f059", + "sha256": "0lgdrrch9rn23jd90rpcs5zxrv279ds3g9rzq5whl19410dbjamm" } }, { @@ -40488,8 +41272,8 @@ 20180130, 1736 ], - "commit": "7a59e424c8e641605e30eed68197859533ea6aaf", - "sha256": "1w9hf7bcdd5ddjavhj0ggnxipf5f5w3cfj52n9i46jmm6g2x2b5g" + "commit": "25e977d641fc204a38263a2272f92307c545121b", + "sha256": "1dgna85s3gwb0a2504min4ch0xih4ygnv8ia2jvx3wyxgn436z1x" } }, { @@ -40566,20 +41350,20 @@ "repo": "atykhonov/google-translate", "unstable": { "version": [ - 20190620, - 1416 + 20200809, + 1430 ], - "commit": "dc118de511c433750d4c98b9dd67350118c04fd6", - "sha256": "1kbiqisqyk31l94gxsirhnrdkj51ylgcb16fk2wf7zigmf13jqzp" + "commit": "0ab218f9e1a620af7b4b22d9c82b8d83ff5f4606", + "sha256": "1z0jbjgjnb36cj14l6khnxmrcfvbmlw89sc9dbkw6j7a3k51nlc0" }, "stable": { "version": [ 0, - 11, - 18 + 12, + 0 ], - "commit": "dc118de511c433750d4c98b9dd67350118c04fd6", - "sha256": "1kbiqisqyk31l94gxsirhnrdkj51ylgcb16fk2wf7zigmf13jqzp" + "commit": "ba027ff85352b989abac29b0efba1811b870ebec", + "sha256": "0rwpij2bm8d4jq2w5snkp88mfryplw8166dsrjm407n2p6xr48zx" } }, { @@ -40728,20 +41512,20 @@ "repo": "jcs-elpa/goto-char-preview", "unstable": { "version": [ - 20190418, - 829 + 20200717, + 730 ], - "commit": "c0209143fbeafcc9ba93bc2333dd08e72211fa20", - "sha256": "15plzc33vyhmfm7bxhvnfr25yvjj6fdr1zp2dvsj8jryj4gb6gkz" + "commit": "11fb6b8c77c6191f839f86afc8c8ca3341919058", + "sha256": "14wcz9azp1c66jz1wz75v0ijbsk5hjmchcm36k7phbn3hjag99ji" }, "stable": { "version": [ 0, 0, - 1 + 2 ], - "commit": "366cf84c30fc8e675e9cbab1091ead6f3cd0d399", - "sha256": "1y2ay0r0rqayvw8wlbf8advjbhvzz7sa16k272mxszxzp7xmnr71" + "commit": "446e5236227d6b3f180be2eb5ef2209aef947553", + "sha256": "0dd5iq9xkvqavabipg1iz9zk1rnz830grhzw0z1l89b1vvgzpd62" } }, { @@ -40752,14 +41536,14 @@ "repo": "emacs-evil/goto-chg", "unstable": { "version": [ - 20190110, - 2114 + 20200603, + 1911 ], "deps": [ "undo-tree" ], - "commit": "1829a13026c597e358f716d2c7793202458120b5", - "sha256": "1y603maw9xwdj3qiarmf1bp13461f9f5ackzicsbynl0i9la3qki" + "commit": "85fca9f7d8b04be3fbb37cc5d42416f3c4d32830", + "sha256": "0laq44dfwcdhphrkwsklxa0146sl9y841mmjwn5gc0z4d5npz0ql" }, "stable": { "version": [ @@ -40818,20 +41602,20 @@ "repo": "jcs-elpa/goto-line-preview", "unstable": { "version": [ - 20190308, - 736 + 20200717, + 733 ], - "commit": "1f0afb261a4e4a1b0a2fae3959b0ce5d30bce2a1", - "sha256": "03csbs9mh9jjw21sncvnlmm97waazy0c57jp1jynwhzzsbp0k0rs" + "commit": "b1df7fe72b0281704d277a69dfd9e2b8214a328b", + "sha256": "00862y6r5xbq5crb581xh1b18dqigc8k42di9mjc6zvslxq8n6qd" }, "stable": { "version": [ 0, 0, - 5 + 6 ], - "commit": "772fb942777a321b4698add1b94cff157f23a93b", - "sha256": "16zil8kjv7lfmy11g88p1cm24j9db319fgkwzsgf2vzp1m15l0pc" + "commit": "a4173abfffda03ad27e695a316adfe560a97f00e", + "sha256": "0bh70d2isl3kdzxyidjrxhs7sh8rqr8cmdwil7ksp9a28mz3l55p" } }, { @@ -40851,14 +41635,14 @@ "magit-popup", "s" ], - "commit": "0c56c1e833bc9e21b603539a19bdfe4836a197ed", - "sha256": "0iaa34hh0zpy9alf0d6bad7qwk565l9k5k09ig342pwnmigz1scs" + "commit": "609218c5232673cec215d088eb01d043120de385", + "sha256": "0wg2sn5zfcsdnv6ymy0a13px7j6pkgmdd9dpss98l70xf3b6g590" }, "stable": { "version": [ 0, - 22, - 2 + 23, + 1 ], "deps": [ "dash", @@ -40866,8 +41650,8 @@ "magit-popup", "s" ], - "commit": "e7df0c1118c15c0b35fe08f183ca084269ea6542", - "sha256": "0lm1jaw5bpz7z4gibbbhswjr7qdhxkgbawr5bnykprsmp663i3nm" + "commit": "cfbe1d59b449be9b5378251bc6e52c65bc5e1cbd", + "sha256": "05f6i7v8v9g3w3cmz8c952djl652mj6qcwjx9iyl23h6knd1d9b1" } }, { @@ -40917,19 +41701,19 @@ "repo": "xuchunyang/grab-mac-link.el", "unstable": { "version": [ - 20190419, - 1307 + 20200712, + 428 ], - "commit": "b52d29cd78a60cfe874667a8987ed10e8eb0f172", - "sha256": "15qznll0358cgqb9m9hpr2if2rsskr29mpsg7h32xb6njqnn741m" + "commit": "9b47cbe126a0735fa447a3c5e1e8ba80a7ef8d26", + "sha256": "1hx3a6sfc3ah3xgwii0l0jvshgbw0fjwsyrmb4sri0k8cla7fwin" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "8bf05a69758fd10a4303c5c458cd91a49ab8b1b2", - "sha256": "12x47k3mm5hvhgn7fmfi7bqfa3naz8w1sx6fl3rmnbzvldb89i1k" + "commit": "9b47cbe126a0735fa447a3c5e1e8ba80a7ef8d26", + "sha256": "1hx3a6sfc3ah3xgwii0l0jvshgbw0fjwsyrmb4sri0k8cla7fwin" } }, { @@ -40999,20 +41783,20 @@ "repo": "lifeisfoo/emacs-grails", "unstable": { "version": [ - 20160417, - 636 + 20200519, + 1909 ], - "commit": "fa638abe5c37f3f8af4fcd32f212453185ce50b1", - "sha256": "1npsjniazaq20vz3kvwr8p30ivc6x24r9a16rfcwhr5wjx3nn91b" + "commit": "d47273a619d6731683afe60636259b02e2c78a2e", + "sha256": "1j2sd51bnn6ngz5sd01akmrnh9938g7v1fh6mxq4lbzjwgnzbvgy" }, "stable": { "version": [ 0, 4, - 1 + 2 ], - "commit": "fa638abe5c37f3f8af4fcd32f212453185ce50b1", - "sha256": "1npsjniazaq20vz3kvwr8p30ivc6x24r9a16rfcwhr5wjx3nn91b" + "commit": "d47273a619d6731683afe60636259b02e2c78a2e", + "sha256": "1j2sd51bnn6ngz5sd01akmrnh9938g7v1fh6mxq4lbzjwgnzbvgy" } }, { @@ -41026,8 +41810,8 @@ 20160504, 911 ], - "commit": "cafdd98e06a3bbff213f3ccb163de2c42d412b66", - "sha256": "07809alyxind4n0rb1h3x19hgq7ihpn128xljlz38d9xvp0r48z3" + "commit": "26da902d1158c0312628d57578109be54eca2415", + "sha256": "113s9znqrdi9zm045hi3ws5ixrd0bzxfy3wr8lzxq9r3jbv67iz2" }, "stable": { "version": [ @@ -41078,32 +41862,30 @@ "repo": "jcs-elpa/grammarly", "unstable": { "version": [ - 20200126, - 420 + 20200720, + 948 ], "deps": [ - "cl-lib", "request", "s", "websocket" ], - "commit": "709bf3124b6e130efcede8b38fc2fed38699e19b", - "sha256": "1lz74qqzznv5c6pnsnnp0x0k16q663pkqakvwpg69lavcg68ysxh" + "commit": "d597c5d71bc64f5a91e96c707d7471bceaa84075", + "sha256": "073rv64m14llav59b2y73qcw7z5p0b537aa46chxf2bxq93lb4vf" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ - "cl-lib", "request", "s", "websocket" ], - "commit": "cd2e75f21989a586c9cc71540fc6e3b5df8a5ce0", - "sha256": "1v7lwwx9iyksh5aaav97vd5pm07k93fkv5v4h96s8i3hyrbcgd74" + "commit": "d597c5d71bc64f5a91e96c707d7471bceaa84075", + "sha256": "073rv64m14llav59b2y73qcw7z5p0b537aa46chxf2bxq93lb4vf" } }, { @@ -41358,20 +42140,20 @@ "repo": "fredcamps/green-is-the-new-black-emacs", "unstable": { "version": [ - 20190724, - 1252 + 20200529, + 242 ], - "commit": "34f0372878a07a23bf1d9418aa380c403d272457", - "sha256": "1gfp5n4lknbw2p5wik0kq5i80p90x9gwd1zif7sjz5g3ximmgg04" + "commit": "9b682c0000bc732e4c55e876ac968877eada0402", + "sha256": "0yilp68qw2a4z8b8mmr2yl2lmwkd3ibk6j5ix6x3vlcmfmrfl3bj" }, "stable": { "version": [ + 1, 0, - 5, 0 ], - "commit": "34f0372878a07a23bf1d9418aa380c403d272457", - "sha256": "1gfp5n4lknbw2p5wik0kq5i80p90x9gwd1zif7sjz5g3ximmgg04" + "commit": "9b682c0000bc732e4c55e876ac968877eada0402", + "sha256": "0yilp68qw2a4z8b8mmr2yl2lmwkd3ibk6j5ix6x3vlcmfmrfl3bj" } }, { @@ -41443,38 +42225,6 @@ "sha256": "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw" } }, - { - "ename": "grep-context", - "commit": "41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637", - "sha256": "175s9asbnk2wlgpzc5izcd3vlfvdj064n38myy9qf4awn12c2y1g", - "fetcher": "github", - "repo": "mkcms/grep-context", - "unstable": { - "version": [ - 20181002, - 1654 - ], - "deps": [ - "cl-lib", - "dash" - ], - "commit": "58f6edc18510d871e4f5ef63ef60665cbc204e96", - "sha256": "04mk5wi2i4mx58mfzl4zk10lm58yliczsw5vpxqmikz8gbripqqx" - }, - "stable": { - "version": [ - 0, - 1, - 0 - ], - "deps": [ - "cl-lib", - "dash" - ], - "commit": "4c63d0f2654dee1e249c2054d118d674a757bd45", - "sha256": "0n2bc9q6bvbfpaqivp3ajy9ad1wr7hfdd98qhnspsap67p73kfn4" - } - }, { "ename": "greymatters-theme", "commit": "d13621f3033b180d06852d90bd3ebe03276031f5", @@ -41498,11 +42248,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20200312, - 1136 + 20200725, + 725 ], - "commit": "9615c4774727a719d38313a679d70f2a2c6aca68", - "sha256": "01imyi1l33ng78m6c5g4pma5gy4j7jy7dwmqwsqgwbws08qdbwgr" + "commit": "281ada2c93bac7043c6f665fac065a17d4247bdc", + "sha256": "14gsmxpp8znk2w2yszdpwb8dx0hxbpy2rjr7rshs3bvqjib8rzyp" }, "stable": { "version": [ @@ -41587,8 +42337,8 @@ "dash", "s" ], - "commit": "cafdd98e06a3bbff213f3ccb163de2c42d412b66", - "sha256": "07809alyxind4n0rb1h3x19hgq7ihpn128xljlz38d9xvp0r48z3" + "commit": "26da902d1158c0312628d57578109be54eca2415", + "sha256": "113s9znqrdi9zm045hi3ws5ixrd0bzxfy3wr8lzxq9r3jbv67iz2" }, "stable": { "version": [ @@ -41625,6 +42375,30 @@ "sha256": "14h0rcd3nkw3pmx8jwip20p6rzl9qdkip5g52gfjjbqfvaffsrkd" } }, + { + "ename": "grugru", + "commit": "eb55452f19b8f33605ca1b0cb5d93e00ff4cf3f5", + "sha256": "0zrcx6097hjdrr3b5fagm77h6fl5ys0djk8h70gkzvc2cc4sdim2", + "fetcher": "github", + "repo": "ROCKTAKEY/grugru", + "unstable": { + "version": [ + 20200810, + 1411 + ], + "commit": "2f304daa39df10ebe9e4cb982af5343bca252c6d", + "sha256": "1bry2iqab6shyhlmka7334yqc5k4c9hl1qrigz2p9km9hv45r7hw" + }, + "stable": { + "version": [ + 1, + 10, + 0 + ], + "commit": "d71007802389028a70d0ccbf5c57330241add7cc", + "sha256": "1gr8jdm8g7cxysf1f83mkfwp3la6bcd08r8gw5v9ms4k217nx2is" + } + }, { "ename": "grunt", "commit": "acc9b816796b9f142c53f90593952b43c962d2d8", @@ -41665,14 +42439,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20200514, - 740 + 20200807, + 855 ], "deps": [ "autothemer" ], - "commit": "f1dfcd8bd50e4885cab71b174bbc6a620c2b9d7f", - "sha256": "106vkpm75s3s52bkmcnjlw8gx3qlh5hffwvj2bvkmqfcgnxpzgx0" + "commit": "746a5f36cf4ff3959f2d007598d5cb248cfc1879", + "sha256": "1j66ffg1xl37nggckm38fmapxm0v7bycvpggxdx0s8q7hqlikk9f" }, "stable": { "version": [ @@ -41807,14 +42581,14 @@ "repo": "tmalsburg/guess-language.el", "unstable": { "version": [ - 20200326, - 1725 + 20200707, + 1058 ], "deps": [ "cl-lib" ], - "commit": "f4ce91eba3c479d08fedf0a3ced6c1265a7838ca", - "sha256": "0z7agqi5sgjjidhmnrv7615737xk7p1s6pdhr6swjcr117dq44fm" + "commit": "256230072f4f828e07db6ab17b6b7e90891b7308", + "sha256": "0yqvrd7b43ibzszzcw8zg0ifqz7v4ply5wdgq1zclk3xgsn9n3pr" } }, { @@ -41889,8 +42663,8 @@ "repo": "alezost/guix.el", "unstable": { "version": [ - 20200510, - 1613 + 20200730, + 930 ], "deps": [ "bui", @@ -41899,8 +42673,8 @@ "geiser", "magit-popup" ], - "commit": "0b8f75124372266bfab32e8d1fa114f33ea24e6f", - "sha256": "17i0rivgixkg18qiqw5a47ahli9vpc9p5yhd9s9j3jmf1jlzq4bf" + "commit": "58a840d0671091e3064e36244790ef8839da87d6", + "sha256": "1qnr5sixmvrhr9rinrhfy7sy20mikjvvwbdixwkbx30qpcdwgwj1" }, "stable": { "version": [ @@ -41942,19 +42716,19 @@ "repo": "bbatsov/guru-mode", "unstable": { "version": [ - 20170730, - 731 + 20200708, + 728 ], - "commit": "c180e05ebc1484764aad245c85b69de779826e4e", - "sha256": "0qb6yr6vbic0rh8ayrpbz5byq7jxmwm1fc9l4alpz7dhyb11z07v" + "commit": "9d0aff6cda6d3d78d5102f07f813b9fca6f0ab7b", + "sha256": "1ja98di2iwjp0l4ndh22pwm7s56753kmz255xlv6vni2ai4rf8sm" }, "stable": { "version": [ - 0, - 2 + 1, + 0 ], - "commit": "62a9a0025249f2f8866b94683c4114c39f48e1fa", - "sha256": "1y46qd9cgkfb0wp2cvksjncyp77hd2jnr4bm4zafqirc3qhbysx0" + "commit": "9d0aff6cda6d3d78d5102f07f813b9fca6f0ab7b", + "sha256": "1ja98di2iwjp0l4ndh22pwm7s56753kmz255xlv6vni2ai4rf8sm" } }, { @@ -42066,14 +42840,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20200421, - 157 + 20200526, + 2210 ], "deps": [ "s" ], - "commit": "330df61f7297344cff9cf9e2d802a4d041279de3", - "sha256": "00g9h96kb9d3qg544x9143hx4nc5crw67cq93ip4mrh3d86rkpc1" + "commit": "572c3b41bed91ea543434c04914a7a0c45fec7c7", + "sha256": "12r14846dpgn03h1gn58aff3p8swlp0zlajhzpqpzp2s7kvl0f6f" }, "stable": { "version": [ @@ -42119,23 +42893,20 @@ "repo": "clarete/hackernews.el", "unstable": { "version": [ - 20190529, - 1120 + 20200604, + 1557 ], - "commit": "2362d7b00e59da7caddc8c0adc24dccb42fddef9", - "sha256": "1hcc5b173yzcvvd2ls3jxrmsw2w9bi21m9hcpcirkn0nh93ywadv" + "commit": "019a727b41e2726516841048a2b5b04f2ed2301a", + "sha256": "1b4vlk3l1mm8jz0kkyjbddfnx963vzsq4gprci8aw203fjnxhbdx" }, "stable": { "version": [ 0, - 5, + 6, 0 ], - "deps": [ - "json" - ], - "commit": "916c3da8da45c757f5ec2faeed57fa370513d4ac", - "sha256": "09bxaaczana1cfvxyk9aagjvdszkj0j1yldl5r4xa60b59lxihsg" + "commit": "aec997970f2c2f8e0077c1f6584e4d1996ae3864", + "sha256": "15asarr271p582xbmhvhh9q0lgka25h6k65xh82rqvig4mirhn1l" } }, { @@ -42517,11 +43288,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20200408, - 247 + 20200531, + 2255 ], - "commit": "bbdbc0e9231f49a45ce787ebfb3f2b019615bf61", - "sha256": "0qln2zc4zx8w4ffplp6b17sksg578x61hyvwv1l79pc8bmpgn0ww" + "commit": "41683c0e634bb3f54eac8747919a82132e1714fe", + "sha256": "1fxj11in90xvpbqhxx5c3qynkd8yfainpbf8cvdh3gdgpifrc0gg" }, "stable": { "version": [ @@ -42574,8 +43345,8 @@ 20200513, 1950 ], - "commit": "0482f0de774c58bd7f2e079f5bf01781eed709a3", - "sha256": "05hgxrmsrmg5i50zxs7pa2xnfn2sja09hdk8xjsalnbbjvn4mmxx" + "commit": "3239e814d6999f31ad845cc58df53395ad299059", + "sha256": "0319nr4l56p0d2gpybkc2lkkhwi6qmf2gjpgpajpcz11ms9m8x5z" }, "stable": { "version": [ @@ -42792,8 +43563,8 @@ 20200315, 2129 ], - "commit": "c3d1158ad1a64f06aa8986ab1cdea6b7fbdd4bf7", - "sha256": "0qza5pgpzcabik3592dk25glsv9zcg84pn1jzm43f9b1j9w5iv4i" + "commit": "e12b1df2ca28d2b06c471cd709c038a2dc0bcdbd", + "sha256": "05j97g2l4rdx35a435xpdpq1ixgf9j94828fx4yhh4g60fjwwb82" }, "stable": { "version": [ @@ -42851,30 +43622,30 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200515, - 715 + 20200818, + 742 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "202bcb533e2feb25d63c64553afccefd9cfab262", - "sha256": "0vn6420qjs04cwiq1bry0cj14i53w3zkyib4y6wyrnd709dfyzgp" + "commit": "e9a1e53c57478389343ee23ebb962c8b9b4b4bba", + "sha256": "1vw6qcpz71sb6xhjzlikr4l1q23sfbphlza4x4ma0gc7mfzyqfh0" }, "stable": { "version": [ 3, 6, - 1 + 4 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "55281e1390bae54310dc880ae3805e0595d5c1bd", - "sha256": "1sghq7xjd4a9ysh3cywd5rss9y47rwk82y86cwh1g7p0jv89gqaf" + "commit": "a3343a370975d9c01df4f1ff42875cc32ae89592", + "sha256": "0cl5awhq5py872qx9s30sfgfpfwjivwbsi18mgar8lj6lvs4s8zz" } }, { @@ -42974,25 +43745,25 @@ "repo": "emacsorphanage/helm-ag", "unstable": { "version": [ - 20200516, - 613 + 20200811, + 1304 ], "deps": [ "helm" ], - "commit": "ae1dbefa151544035272d04e56e0147185a847c5", - "sha256": "03q29x63v500b3h4mj99h619ayifb12rrqiyyihm84i9lmgp5r28" + "commit": "4ee2174c4e27e02c75a487a235de4d80c663aa08", + "sha256": "1sc9ksfb3s5p5kqriz5402r785fklw3ykz8fb107xykl9kdjnzy3" }, "stable": { "version": [ 0, - 59 + 62 ], "deps": [ "helm" ], - "commit": "79373d7f1616d175a5e0730e1e0c3855f04bd945", - "sha256": "0vsz2b5qw4qahlf74059z4p1grinhfz28f0psw4c3qf4jasv3b9j" + "commit": "08aaab53b8876caba619f956945a8152ece47182", + "sha256": "0xgbpp8xqdiyvfs64x0q909g77ml28z3irw2lnasvpsg0dfdm2zy" } }, { @@ -43013,6 +43784,24 @@ "sha256": "1rifdkhzvf7xd2npban0i8v3rjcji69063dw9rs1d32w4n7fzlfa" } }, + { + "ename": "helm-apt", + "commit": "5d3fec3e22c66091f0f71c2c9916755006b290f4", + "sha256": "11l35c08zs0ds0k8q8mr63446b0943i9yr85g9i6s1kdcsx96swc", + "fetcher": "github", + "repo": "emacs-helm/helm-apt", + "unstable": { + "version": [ + 20200719, + 1131 + ], + "deps": [ + "helm" + ], + "commit": "f6204e2333881291b007e4859d9446994e988653", + "sha256": "08gxfby2i80nmzlbj39p0nnicg95swzjxc222wksvggfxvvln5f7" + } + }, { "ename": "helm-aws", "commit": "421182006b8af17dae8b5ad453cc11e2d990a053", @@ -43368,16 +44157,15 @@ "repo": "emacs-jp/helm-c-yasnippet", "unstable": { "version": [ - 20170128, - 1542 + 20200520, + 1519 ], "deps": [ - "cl-lib", "helm", "yasnippet" ], - "commit": "65ca732b510bfc31636708aebcfe4d2d845b59b0", - "sha256": "1cbafjqlzxbg19xfdqsinsh7afq58gkf44rsg1qxfgm8g6zhr7f8" + "commit": "89cc8561e7e57e9d1070ee3641df019c7f49c5dd", + "sha256": "1b6wwz7j9alwmxmk3wvf862ynznkdm1jk5r456dn8ykkvfrs7nlv" }, "stable": { "version": [ @@ -43733,26 +44521,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200514, - 644 + 20200803, + 1032 ], "deps": [ "async" ], - "commit": "202bcb533e2feb25d63c64553afccefd9cfab262", - "sha256": "0vn6420qjs04cwiq1bry0cj14i53w3zkyib4y6wyrnd709dfyzgp" + "commit": "e9a1e53c57478389343ee23ebb962c8b9b4b4bba", + "sha256": "1vw6qcpz71sb6xhjzlikr4l1q23sfbphlza4x4ma0gc7mfzyqfh0" }, "stable": { "version": [ 3, 6, - 1 + 4 ], "deps": [ "async" ], - "commit": "55281e1390bae54310dc880ae3805e0595d5c1bd", - "sha256": "1sghq7xjd4a9ysh3cywd5rss9y47rwk82y86cwh1g7p0jv89gqaf" + "commit": "a3343a370975d9c01df4f1ff42875cc32ae89592", + "sha256": "0cl5awhq5py872qx9s30sfgfpfwjivwbsi18mgar8lj6lvs4s8zz" } }, { @@ -43829,10 +44617,10 @@ }, { "ename": "helm-dash", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "032hwwq4r72grzls5ww7bjyj39c82wkcgf3k7myfcrqd3lgblrwb", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0vn9b6v6y1l4v475s69930sf2h8cj9g3vdi1rx5janpcq7w42mq7", "fetcher": "github", - "repo": "areina/helm-dash", + "repo": "dash-docs-el/helm-dash", "unstable": { "version": [ 20190527, @@ -43989,10 +44777,10 @@ }, { "ename": "helm-dired-recent-dirs", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "1rm47if91hk6hi4xil9vb6rs415s5kvhwc6zkrmcvay9hiw9vrpw", + "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", + "sha256": "08dyzsfpzzp279jvzbj7m187gn8rmxzfclrn71n4xsss5g1k7gb1", "fetcher": "github", - "repo": "yynozk/helm-dired-recent-dirs", + "repo": "zonkyy/helm-dired-recent-dirs", "unstable": { "version": [ 20131228, @@ -44230,14 +45018,14 @@ "repo": "cute-jumper/helm-ext", "unstable": { "version": [ - 20180526, - 350 + 20200722, + 107 ], "deps": [ "helm" ], - "commit": "90b788aced21ec467a234b6b77b5a6ebae6de75f", - "sha256": "11a27556slh95snzqyvy0rlf6p7f51nx8rxglnv0d34529h72508" + "commit": "c30f7772ec577a5ce1de3215f0507826e0725a69", + "sha256": "1sb3z1c1p9wal5g6fz8b948pvaarg4yhcmjqmpd2y7b85hzapgp1" }, "stable": { "version": [ @@ -44328,8 +45116,20 @@ "deps": [ "helm" ], - "commit": "6ab26c5fb414a0c1232974fd3f888839b6844203", - "sha256": "0lsrcn03f4981762l2rq25ps1f2ka86q125jkh6nq7wzfb7pj71f" + "commit": "d7e0c1814299fc0e345e159f02733cee5277716e", + "sha256": "07767jm0wqnn4qavnvnsf6wzfsvsk5bfba2sm16l5036sj4dyjxn" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "deps": [ + "helm" + ], + "commit": "52dbc68cf7484d66c40593733770c0c61b383ef0", + "sha256": "1xrq5481mri9nfdwkn14zjq1zgl31w6aywca6sr1by5cqggqrqr1" } }, { @@ -44359,15 +45159,15 @@ "repo": "emacs-helm/helm-firefox", "unstable": { "version": [ - 20200306, - 1408 + 20200612, + 800 ], "deps": [ "cl-lib", "helm" ], - "commit": "7065e01188ed17b86a7b4f01b95ace575a15eef1", - "sha256": "0kk7d73hcrxcnsrq803zp5lh1hyk30nahb6wdlalqvkczksgpkml" + "commit": "8ecf5bcb815d1650bf184deffeef10b1277e0e1e", + "sha256": "00is30ijsh2aqvrkk5cxl46mbcj3q2fzc02hb55mj3gq4h6lb1bq" }, "stable": { "version": [ @@ -44390,27 +45190,27 @@ "repo": "emacs-helm/helm-fish-completion", "unstable": { "version": [ - 20200509, - 1056 + 20200622, + 1255 ], "deps": [ "fish-completion", "helm" ], - "commit": "fd730198afe01f6eecc6c5841358a8eea4cf4b09", - "sha256": "1iv0hwr74hzgrvrr31nlnswvi87lvpg24rd1rhkr5kjicr2295fq" + "commit": "f055dab2f14462ff130841d4ab421f34baab39d5", + "sha256": "0hpsm39kx8vpz2zmarjrkvy1capkk5lwpsmdg2xnklsck6xsn922" }, "stable": { "version": [ 0, - 3 + 5 ], "deps": [ "fish-completion", "helm" ], - "commit": "fd730198afe01f6eecc6c5841358a8eea4cf4b09", - "sha256": "1iv0hwr74hzgrvrr31nlnswvi87lvpg24rd1rhkr5kjicr2295fq" + "commit": "f055dab2f14462ff130841d4ab421f34baab39d5", + "sha256": "0hpsm39kx8vpz2zmarjrkvy1capkk5lwpsmdg2xnklsck6xsn922" } }, { @@ -44524,15 +45324,15 @@ "repo": "rustify-emacs/fuz.el", "unstable": { "version": [ - 20200104, - 524 + 20200812, + 1222 ], "deps": [ "fuz", "helm" ], - "commit": "0b6b64cebde5675be3a28520ee16234db48d3b8b", - "sha256": "1bddjr3rpmvkrljq5ipjm42d59m2897cpfhmiah3rcb4c6ra40m1" + "commit": "fee874aa35d2ee6b12b836290b5c8eaa44175a28", + "sha256": "1xswm8my29i4fddy64k21b1vclbr5fjb0pisb4hs8ynkk5w1kw2a" }, "stable": { "version": [ @@ -44581,6 +45381,19 @@ "flx", "helm" ], + "commit": "152d54bcd7137e4f5df54cf213e578c9d71864bd", + "sha256": "1msnagb1mxxi9c64j54j9r95l98jha2n6qdgs236b953lz8d9wwf" + }, + "stable": { + "version": [ + 0, + 1, + 5 + ], + "deps": [ + "flx", + "helm" + ], "commit": "fc080a0b4be8a68944a64bc4fb5b38cd11a70bc7", "sha256": "01632zrpl69b034srgsfidf62r1kwc8f4z8i48kz95g5n2ax1xk9" } @@ -44895,14 +45708,26 @@ "repo": "kopoli/helm-grepint", "unstable": { "version": [ - 20161001, - 1413 + 20200811, + 1616 ], "deps": [ "helm" ], - "commit": "a62ca27515ff6a366b89b420500eb16d380cc653", - "sha256": "1v87v6a34zv998z1dwwcqx49476pvy9g5zml7w5vzfkms0l8l28w" + "commit": "9aec98428823b749eb14d2c8512b46b59ca9f8ca", + "sha256": "1fmpk9ynish20daajnx4c2s8bnlngb8sv3nwspxkk8fvv0c3p39i" + }, + "stable": { + "version": [ + 1, + 6, + 1 + ], + "deps": [ + "helm" + ], + "commit": "9aec98428823b749eb14d2c8512b46b59ca9f8ca", + "sha256": "1fmpk9ynish20daajnx4c2s8bnlngb8sv3nwspxkk8fvv0c3p39i" } }, { @@ -44931,26 +45756,26 @@ "repo": "emacsorphanage/helm-gtags", "unstable": { "version": [ - 20200409, - 1559 + 20200602, + 1610 ], "deps": [ "helm" ], - "commit": "25b81d7774622911c1e95d9020209ae4ace1542b", - "sha256": "14k0yrf8p015gsgdgq8ykvrjjhd1brq2gsfx7m3jv0p789yxw7zk" + "commit": "a15fe1dd272d252ad933d8129db1dce02fd41adb", + "sha256": "1kc1jzk10nfd2v20g8dwnb6a944afrwdwnkzl06w4ba8k4yim7gi" }, "stable": { "version": [ 1, 5, - 6 + 7 ], "deps": [ "helm" ], - "commit": "dbe0d2d9d08058d469ad2d729bd782515b5b3b62", - "sha256": "0zyspn9rqfs3hkq8qx0q1w5qiv30ignbmycyv0vn3a6q7a5fsnhx" + "commit": "a15fe1dd272d252ad933d8129db1dce02fd41adb", + "sha256": "1kc1jzk10nfd2v20g8dwnb6a944afrwdwnkzl06w4ba8k4yim7gi" } }, { @@ -45071,6 +45896,26 @@ "sha256": "1ih2pgyhshv8nl7hhchd4h0pbjgj45irp5dy1fq2gy05v4rn7wi4" } }, + { + "ename": "helm-icons", + "commit": "388e1c96b251fd68adc08288c9109dad19840bc7", + "sha256": "074s4pv0lgvcmvfqv34bsi45cy4rlskc6skmfffkflyf1kddpz1g", + "fetcher": "github", + "repo": "yyoncho/helm-icons", + "unstable": { + "version": [ + 20200719, + 1359 + ], + "deps": [ + "dash", + "f", + "treemacs" + ], + "commit": "d8c15dc61c1f321686b447e83abb17e14bc6f1c6", + "sha256": "0na4nks6l7917r64rc49b38lwsdj7wvslnnikms92882z5c8c6nn" + } + }, { "ename": "helm-idris", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -45295,16 +46140,16 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20171102, - 1454 + 20200620, + 915 ], "deps": [ "dash", "helm", "lean-mode" ], - "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c", - "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n" + "commit": "6b4377686128d5c2fb55d8fe61b92a9991d40fbd", + "sha256": "1zb3igic1i30mfbsx4k2sabhdpl58fsrl5c3fjvqrpn92ixi9vws" } }, { @@ -45371,14 +46216,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20191127, - 510 + 20200519, + 912 ], "deps": [ "helm" ], - "commit": "18c53b62bc758b9d8ad4e94a94f58d143ccb29db", - "sha256": "0r4dj6422g2zsbm2kig369j39lw4d68zpcr2xr02p02sfyhg1c0f" + "commit": "4da1a53f2f0a078ee2e896a914a1b19c0bf1d5ed", + "sha256": "12fi08w20yjsdfkxl1pk9q4w0z9l92va5fa5ghay9w33xlymc8dc" }, "stable": { "version": [ @@ -45450,16 +46295,29 @@ "repo": "emacs-lsp/helm-lsp", "unstable": { "version": [ - 20200429, - 1457 + 20200808, + 713 ], "deps": [ "dash", "helm", "lsp-mode" ], - "commit": "6b5ce182d7c94c62b55b8f7d0c7e643b2c30e560", - "sha256": "0f6a26h1n6h0x3dal40180w3vb7gz3h8qwxvr3b0zq4f7byikisb" + "commit": "4263c967267b0579956b3b12ef32878a9ea80d97", + "sha256": "1j0w6391ivw7gyx03vmmhccj25d5p94dnbblhd6vxl8d22azdfq3" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "dash", + "helm", + "lsp-mode" + ], + "commit": "5c960e7800dc8f4432f3a1466a637d484b87dc35", + "sha256": "1vq3qpqm3ndqyvf5bk8qhqcr60x9ykc0ipk2a43rr3yjm4z1b6s9" } }, { @@ -45504,11 +46362,11 @@ "repo": "abo-abo/helm-make", "unstable": { "version": [ - 20200228, - 1742 + 20200620, + 27 ], - "commit": "a52b3a34ade00e695a412bc0c5873d4f4d22c323", - "sha256": "1jqihwh24f190zsc3a2xc7ja6j6q3nl742a0m9d6fiw28aijg34f" + "commit": "ebd71e85046d59b37f6a96535e01993b6962c559", + "sha256": "14jvhhw4chl94dgfwbyy7yirwchvcz5zrsgr9w6qy4z0fhqba41a" }, "stable": { "version": [ @@ -45693,10 +46551,10 @@ }, { "ename": "helm-notmuch", - "commit": "98667b3aa43d3e0f6174eeef82acaf71d7019aac", - "sha256": "1ixdc1ba4ygxl0lpg6ijk06dgj2hfv5p5k6ivq60ss0axyisnnv0", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1k1kj5n6r32qc139ms5cvj5x5xpbd5v8c64j3jpcrmgg8d396f1m", "fetcher": "github", - "repo": "xuchunyang/helm-notmuch", + "repo": "emacs-helm/helm-notmuch", "unstable": { "version": [ 20190320, @@ -45800,8 +46658,8 @@ "org-multi-wiki", "org-ql" ], - "commit": "8b056103d6f5320563e9fd794a008fd4e0719702", - "sha256": "1xmj2p9hcpf1nld0gsnxq12kaljh0p195fy24v23l8ygykhmqw17" + "commit": "2541e1b0798a1c9d4b4b8778e6c97a579ac3fa14", + "sha256": "1mcpbq1qylkxpd6nzq04jrji6p1xll5a30dc7dpxpcjrkgvbzf39" }, "stable": { "version": [ @@ -45820,10 +46678,10 @@ }, { "ename": "helm-org-rifle", - "commit": "f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615", - "sha256": "0hx764vql2qgw9i8qrr3kkn23lw6jx3x604dm1y33ig6a15gy3a3", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "05arqjadly6qf2slw8109wk828sd4f76spklpnxwjc98x01vacxw", "fetcher": "github", - "repo": "alphapapa/helm-org-rifle", + "repo": "alphapapa/org-rifle", "unstable": { "version": [ 20200512, @@ -46138,31 +46996,30 @@ "repo": "bbatsov/helm-projectile", "unstable": { "version": [ - 20190731, - 1538 + 20200625, + 443 ], "deps": [ "cl-lib", "helm", "projectile" ], - "commit": "5328b74dddcee8d1913803ca8167868831a07463", - "sha256": "0a811cblrvc8llpv771b8dppgxs6bwjyvjy3qn2xns4nigvn93s0" + "commit": "2f3a2a03d6cb9419c25b432637aa11c8d2f9f3b7", + "sha256": "0h6r8v2lj6abjz73iv8568ijs7l37j76nf58h4p9r9ldpdigihzz" }, "stable": { "version": [ + 1, 0, - 14, 0 ], "deps": [ "cl-lib", - "dash", "helm", "projectile" ], - "commit": "1a90f93732f1a1e8080098d65eadd6a1cd799e31", - "sha256": "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4" + "commit": "5eb861b77d8e6697733def65288039df5be81a0e", + "sha256": "05gpg90gg03yalmv9fw1y9k21i2l617iipvs0p9n80aln8nrzs8g" } }, { @@ -46400,14 +47257,14 @@ "repo": "emacs-helm/helm-recoll", "unstable": { "version": [ - 20190729, - 453 + 20200805, + 1235 ], "deps": [ "helm" ], - "commit": "219e517dd79a7879414ca36e8de28a159a49c78a", - "sha256": "0yjz8g8v839fs42lmmjbm5l4yzkq9npjlb6jxz6nv5j71xvz5lbf" + "commit": "c021a3b5e8c010bdad062cceb80fb49788f89e9f", + "sha256": "09aj1hsj81vx761v5ai48hvl17i2i60gx3szk8qcmmpcn00m3ps7" }, "stable": { "version": [ @@ -46429,16 +47286,16 @@ "repo": "cosmicexplorer/helm-rg", "unstable": { "version": [ - 20190130, - 1734 + 20200721, + 725 ], "deps": [ "cl-lib", "dash", "helm" ], - "commit": "785a80fe5cc87e27c5ea3d00a70049028d9e2847", - "sha256": "1cfdnwlgwil7fp228p5sb3jkwrgnhnad4p2m1vl2wn0fjb89dppp" + "commit": "ee0a3c09da0c843715344919400ab0a0190cc9dc", + "sha256": "0m4l894345n0zkbgl0ar4c93v8pyrhblk9zbrjrdr9cfz40bx2kd" }, "stable": { "version": [ @@ -46537,8 +47394,8 @@ "helm", "rtags" ], - "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", - "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" + "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824", + "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b" }, "stable": { "version": [ @@ -46623,10 +47480,10 @@ }, { "ename": "helm-sage", - "commit": "09760a7f7b3cff6551c394fc7b2298567ca88eb0", - "sha256": "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1v1j2ipmzxcflknzmy1asm2ifalj2yb5qiv24wi7a323izlaxy2m", "fetcher": "github", - "repo": "stakemori/helm-sage", + "repo": "sagemath/helm-sage", "unstable": { "version": [ 20160514, @@ -46674,6 +47531,35 @@ "sha256": "1n6sp6bhlz01b1d87cgrgxhap0ch1bkh7fl45dzidx5fjz9lccdf" } }, + { + "ename": "helm-selector", + "commit": "91193d76993bc65cc71bfa06148ef375b8034bd7", + "sha256": "19v1xvrbc9pn6ilbf28g4bjd4psmb34as6cjmksyaw5rn71ps2ay", + "fetcher": "github", + "repo": "emacs-helm/helm-selector", + "unstable": { + "version": [ + 20200808, + 858 + ], + "deps": [ + "helm" + ], + "commit": "a1920a885830693dd9b1d6af3dd60f1915d976f4", + "sha256": "134rxm4zicn565k3q5q15iiqcvcyiq6lsvmsqr53ifjjbq8pd9y6" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "helm" + ], + "commit": "a1920a885830693dd9b1d6af3dd60f1915d976f4", + "sha256": "134rxm4zicn565k3q5q15iiqcvcyiq6lsvmsqr53ifjjbq8pd9y6" + } + }, { "ename": "helm-sheet", "commit": "010c5c5e6ad6e7b05e63936079229739963bf970", @@ -46886,16 +47772,15 @@ "repo": "jamesnvc/helm-switch-shell", "unstable": { "version": [ - 20191223, - 1418 + 20200817, + 1725 ], "deps": [ "dash", - "helm", - "s" + "helm" ], - "commit": "690e20f0d95f81151b34cb424a201f39d93eb430", - "sha256": "08p9dfjkf1ssnzd8n69a10mkvdvm8w229fy32z95dh9vbxsp7aqv" + "commit": "9cab3dfd2f006148e969555bc3bfb6456d1b3f84", + "sha256": "0z1785cw5sbcyqs2zbi35b5y6ac9lws1wxp89la7hwdlzwzk1c2a" } }, { @@ -46906,26 +47791,26 @@ "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20200515, - 417 + 20200814, + 448 ], "deps": [ "helm" ], - "commit": "2efc552591102ab8b4408ad60a3c4be991bb8e93", - "sha256": "0fbahbcgdcbmnhv3m2pmxy8n01qab5x0468bikygs80krch84qh5" + "commit": "1f7d3cf0d742b199e4ce13fcb8b19c977a44611e", + "sha256": "1r03d3ivmi0r5knsrlfx2cq5jljjl36h2l5n0mbs3sc6iad9wz20" }, "stable": { "version": [ - 2, + 3, 0, 0 ], "deps": [ "helm" ], - "commit": "c5ec1f3acfb07155273c2de021f3521e198e4a9d", - "sha256": "0k0ns92g45x8dbymqpl6ylk5mj3wiw2h03f48q5cy1z8in0c4rjd" + "commit": "533dcd14198b61fd2fbf8c6f286f65feae5b6bd2", + "sha256": "1qjay0fvryxa8n1ws6r1by512p2fylb2nj7ycm1497fcalb0d706" } }, { @@ -46943,8 +47828,8 @@ "helm", "seq" ], - "commit": "4e257fc84472d3d85ee2b413ca8a45aa0fd0118c", - "sha256": "1p89zggsqhif6dadajapq8vr9ffxbzq7v8sv8iaxyn0cg2sn6fdl" + "commit": "d6ad2f682d744048ea0ac47c470be5a159a6541b", + "sha256": "01zsl1g8r3rkgwpdphgmbljjnrhk6mmk2rjqhykjk5f3bdk02rwk" }, "stable": { "version": [ @@ -47181,6 +48066,24 @@ "sha256": "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz" } }, + { + "ename": "helm-wikipedia", + "commit": "317729c132a993dd14f25876f753c8f1636d7b91", + "sha256": "0wnyzqz0q79bl2fmq0wszkhv10wm7ydqvqy4mmi4hi78skqmykq6", + "fetcher": "github", + "repo": "emacs-helm/helm-wikipedia", + "unstable": { + "version": [ + 20200630, + 504 + ], + "deps": [ + "helm" + ], + "commit": "a6c8b1d1ab5dc0a69cb44bb5f3eb6792ef091147", + "sha256": "1him1sqdl15qfjqrkgmnhligwqc6a9liiqndssa1law3bd36c2jb" + } + }, { "ename": "helm-wordnet", "commit": "11626120951afc589beac4cf5a0f49bffa752349", @@ -47258,10 +48161,10 @@ }, { "ename": "helm-z", - "commit": "48c9b83fff8fc428d9d1ecf0005d47f2adb8cb00", - "sha256": "1m268zsr4z7a9l5wj0i8qpimv0kyl8glgm0yb3f08959538nlmd1", + "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", + "sha256": "0vazbn8i0yz59310zq839jr86nwv6hh2mn1a9m8a7jv0l3121hzq", "fetcher": "github", - "repo": "yynozk/helm-z", + "repo": "zonkyy/helm-z", "unstable": { "version": [ 20171204, @@ -47426,21 +48329,6 @@ "sha256": "1rp37rhkj8jm07dwr74vc68dhrbvyvrxjdavpb0h073ps9vl9dsc" } }, - { - "ename": "heroku", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1wavsymviybfcmwdfrffbkdwbiydggx55jqg6ql79wf9bx7agacp", - "fetcher": "github", - "repo": "technomancy/heroku.el", - "unstable": { - "version": [ - 20120629, - 1813 - ], - "commit": "92af1c073b593c4def99c8777c869992aa4d0b3a", - "sha256": "0c45pib8qpwgyr271g5ddnsn7hzq68mqflv0yyc8803ni06w9vhj" - } - }, { "ename": "heroku-theme", "commit": "348f0e7aec86c3efd87ab06849a5f1ce90ba23e2", @@ -47761,11 +48649,11 @@ "repo": "Lindydancer/highlight-doxygen", "unstable": { "version": [ - 20180829, - 1818 + 20200520, + 1713 ], - "commit": "53f2250018725fa19548e1771ee79fcc23641694", - "sha256": "0l6zh5cmp771h30i16bv3qvcq40pz9fxn3j7a8yx708vanb4d7kc" + "commit": "eec4874e2e89d4eb39091aad89a67dff8f8ec84c", + "sha256": "0r3rv1px43r265716l3g20c1ss4381h1mc1kjxin22vdmrj6cmxy" } }, { @@ -47806,11 +48694,11 @@ "repo": "DarthFennec/highlight-indent-guides", "unstable": { "version": [ - 20200412, - 2328 + 20200528, + 2128 ], - "commit": "1b12c7b440ff988c7237936187c1375ac4ddc7f4", - "sha256": "03dpwklrwbkminfds8v129w0i47p5mkwdyhlhv05a22xnmlanyrs" + "commit": "a4f771418e4eed1f3f7879a43af28cf97747d41c", + "sha256": "0zwp7kh10b0gxwp6128am94fwc5lmn73qar13qzyh3r1jsc8f95y" } }, { @@ -48050,10 +48938,10 @@ }, { "ename": "hindent", - "commit": "9a15a17a5aa78aed72958b2a1bde53f0c0ab5be7", - "sha256": "0az2zhdi73sa3h1q1c0bayqdk22a7ngrvsg9fr8b0i39sn3w8y07", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz", "fetcher": "github", - "repo": "commercialhaskell/hindent", + "repo": "chrisdone/hindent", "unstable": { "version": [ 20180518, @@ -48062,8 +48950,8 @@ "deps": [ "cl-lib" ], - "commit": "1583be4a8a01b765841f7306284528ae713abb7b", - "sha256": "1l8v3vq3yw7zr1yxyscfw8lggcf0klnyszhv18505c6myybp2dkp" + "commit": "50242bb64e946555defc9fff11ab32bcb05300b6", + "sha256": "0k062mswihnpl1h7r0w37siv57fi5k90956ji2vix9r9qc33zsxc" }, "stable": { "version": [ @@ -48283,14 +49171,14 @@ "repo": "laishulu/hl-fill-column", "unstable": { "version": [ - 20200404, - 306 + 20200607, + 757 ], "deps": [ "names" ], - "commit": "43cb3c35a92c912b7205b8a36f1ad0ec0a5b4a22", - "sha256": "0pf1hk21xbahccw1cdz95haqvhrf50cwg32qa36v9nammd37752z" + "commit": "5782a91ba0182c4e562fa0db6379ff9dd472856b", + "sha256": "0sfki2844yjlvnjlaia0n46af3c5y1bi74x91icwxccqwlkyg8jg" } }, { @@ -48341,20 +49229,20 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20200103, - 1239 + 20200813, + 1419 ], - "commit": "3bba4591c54951d2abab113ec5e58a6319808ca9", - "sha256": "1i5mdmkbrxqx75grwl01pywbgl8pasr00mq6fidspp0aligsbg6w" + "commit": "0598b98f63b623c1778cbd2e2f60b774b7a311b9", + "sha256": "1y57q3s6hrjd134mkwzcz5ii2jichvccpvc6bcj1vfl4d7yrxsal" }, "stable": { "version": [ 3, 1, - 1 + 2 ], - "commit": "5d2ea49f83a7e6953f9d71de94dee478d08f9543", - "sha256": "1v51mlq13wr890ijwcwf0ymmc768cipj7a1nvmbmwh7y4ymlrsgn" + "commit": "3bba4591c54951d2abab113ec5e58a6319808ca9", + "sha256": "1i5mdmkbrxqx75grwl01pywbgl8pasr00mq6fidspp0aligsbg6w" } }, { @@ -48406,8 +49294,8 @@ "deps": [ "cl-lib" ], - "commit": "f17360fe93de6df99a05b4b64b0a1ca4ee45abb6", - "sha256": "01sfba4sd3mjc7bs1y4qdzryfawg1xzg3hbwy9afwfaz0w5czni8" + "commit": "5646d9c0b9e7598b20b2004eab5439fdc6dbeda5", + "sha256": "1w442h5wzxylrbmqn1blpv2pmvyvq7avsk5h8xxsjfqw5580riri" } }, { @@ -48436,16 +49324,16 @@ "repo": "thanhvg/emacs-hnreader", "unstable": { "version": [ - 20200321, - 1900 + 20200726, + 654 ], "deps": [ "org", "promise", "request" ], - "commit": "5dd287e932e2398aab0f34cb23b99457b81ac370", - "sha256": "0ynq9dg00frk1sriraglzsszxpx51mpfdkbd1iqdz648rlhzyp3m" + "commit": "7ff808d4728ce4e269b6d99a73604063dd9b374a", + "sha256": "0kxx8pvl99qdbldsn6lvxj69j1jpmmc33wxcr2aw3h423ibcna3s" } }, { @@ -48456,11 +49344,11 @@ "url": "https://gitlab.lrde.epita.fr/spot/emacs-modes.git", "unstable": { "version": [ - 20191010, - 1132 + 20200610, + 1339 ], - "commit": "558e55429acde26423332a03a3b65b12efdbce5f", - "sha256": "0a6jagjimr00dvzrbxj078vyranmv14zl2vn4dkcww4swjzpaag9" + "commit": "18f5c981e256f867f29a93376ccdc04717b159cd", + "sha256": "1814si09xjimmn1a8yp6q13lz1lr6cwnaz7fqfszqcil8lldcwvx" } }, { @@ -48616,11 +49504,11 @@ "repo": "aodhneine/horizon-theme.el", "unstable": { "version": [ - 20200129, - 1957 + 20200720, + 1832 ], - "commit": "040d19abd397d2132508a50e1266e86d324f7c69", - "sha256": "04impsvfmna1vyssjs2id9hsk9cq7wx317z4h16wr1jvng6m1jig" + "commit": "9595549c514a9376c61d5d303405f6a6982e9e46", + "sha256": "1m7wwf17p7qa6dmm0qykz0qnqz7rxvxhsmn9287y8f6wahzd8yfb" } }, { @@ -48717,16 +49605,16 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20191118, - 2222 + 20200805, + 1739 ], "deps": [ "org", "promise", "request" ], - "commit": "23407fb7a950f08498b5586062ba69962a20ea24", - "sha256": "1hcwac7fjsshnjapb1hdh9x0liap4n1i5q6bsar5zanmz1h9i94q" + "commit": "6bf4d5964299c5b51a2299869c0402079869343b", + "sha256": "0rzyh71w5ccimzy1wm489sj96119bnn86mdfshhyk753h9ldjjgp" } }, { @@ -48893,11 +49781,11 @@ "repo": "hniksic/emacs-htmlize", "unstable": { "version": [ - 20191111, - 2130 + 20200816, + 746 ], - "commit": "86f22f211e9230857197c42a9823d3f05381deed", - "sha256": "0n117rb4d9dydl01b65d09rp8bmkir3m09zs02dhlmqmljpy25w8" + "commit": "49205105898ba8993b5253beec55d8bddd820a70", + "sha256": "0caw0wwbscfr4a9ynfabrpkvgibf0hlrkwisib82nhcqcaanf962" }, "stable": { "version": [ @@ -49107,11 +49995,11 @@ "repo": "nflath/hungry-delete", "unstable": { "version": [ - 20200309, - 209 + 20200807, + 2257 ], - "commit": "4a341cfa3a19185c5ecb687970e299082e1144e3", - "sha256": "1gwksvvizz3kdpfzgwp45l1idjbrn8kz4jf0zx4fva20mh6mjz01" + "commit": "671d941de0176255b79820a662d5a694607cf28a", + "sha256": "1cnbyixm1dihcvvfqx591qcjcrs963d2swn9rbrwkplm4a5fyxhf" }, "stable": { "version": [ @@ -49131,16 +50019,16 @@ "repo": "hylang/hy-mode", "unstable": { "version": [ - 20200508, - 502 + 20200730, + 2340 ], "deps": [ "dash", "dash-functional", "s" ], - "commit": "a18b0b8bfcd79a30bfe9ef960244ec6748a9430d", - "sha256": "0vvwilfj1sv7r1xsv7m6w0qc3077jfaflwxmq54dmrbw6qypqx1f" + "commit": "55e84cadbdb63427a8d531992df3990414a26688", + "sha256": "0mrml5cy3isgy5mybxm8mrzqcrxrw4nn9yxchyjakkqzvfjk8gm1" }, "stable": { "version": [ @@ -49187,6 +50075,21 @@ "sha256": "1b8992vzq5bh01pjlj181nzqjrqs4fbjpwvv8h7gjq42sf8w59sm" } }, + { + "ename": "hybrid-reverse-theme", + "commit": "efea6a0ea9176f61cb5a97f5fdce22b3ba28894e", + "sha256": "1lfssdga5y1h42qqbr1lg4rjb8rn8kkv0yxbqyxfv1w1yybn924l", + "fetcher": "github", + "repo": "Riyyi/emacs-hybrid-reverse", + "unstable": { + "version": [ + 20200819, + 240 + ], + "commit": "18b1b786fb4346ad31ec76df75cb672ef5cc7cbf", + "sha256": "03wgxhly8n3j05l9k3pzixczj4xzqd499k0l3d4nngsxps2v67w3" + } + }, { "ename": "hydandata-light-theme", "commit": "51edfd2eed17b79058bbef836bc3edff50defa6e", @@ -49242,15 +50145,15 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20200504, - 1747 + 20200711, + 1210 ], "deps": [ "cl-lib", "lv" ], - "commit": "87873d788891029d9e44fa5458321d6a05849b94", - "sha256": "1b6davg1jqcxqzf9aqv8av8c78fgdri97m9q44xzvr1xfbmvkl8g" + "commit": "112e689f75b59398d8eca79ac6562dca12b8a959", + "sha256": "0famsjgsgd61fm3l5m9mqg4szf8lcgcb57paxlg8rxnsmxmwga7d" }, "stable": { "version": [ @@ -49266,6 +50169,21 @@ "sha256": "0fapvhmhgc9kppf3bvkgry0cd7gyilg7sfvlscfrfjxpx4xvwsfy" } }, + { + "ename": "hyperlist-mode", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0c3jdwbarxvnczfx2g3g1m53kiyjls7l48s6l4bzxl2w4x8axvsw", + "fetcher": "github", + "repo": "Vifon/hyperlist-mode", + "unstable": { + "version": [ + 20200515, + 2209 + ], + "commit": "374cdc04761df23e7a50ca276319ba9745cda9d7", + "sha256": "11940wmzhnj6yxgdkadkwak4k9gad4y1bbf0k39sca13j10j48n7" + } + }, { "ename": "hyperspace", "commit": "0696a12acba676015640de63fc6e011128bca71c", @@ -49334,11 +50252,11 @@ "repo": "mkcms/interactive-align", "unstable": { "version": [ - 20181202, - 1146 + 20200711, + 1117 ], - "commit": "e1308c8f6aea05ad6dbcaa33b9bee4eb7e05ee39", - "sha256": "0b7a2z4v1nyyaw0lvql9xrakpsi1a6kflqr74k56ndm3ivmqwx09" + "commit": "eca40b8b59ea713dba21b18f5b047a6c086b91dc", + "sha256": "1nvj47d62dffgry0dy08m8rz5fqsrn1yhmkmp5jn57fyhbk6nfal" }, "stable": { "version": [ @@ -49411,14 +50329,14 @@ "repo": "purcell/ibuffer-projectile", "unstable": { "version": [ - 20200304, - 2205 + 20200805, + 604 ], "deps": [ "projectile" ], - "commit": "504b0edaa0d937ce60ccc8fdf09f2dae0a90fbaf", - "sha256": "18cqxnwzzbkcj9jcaw89b210432yzhrl1dwsv48p0jbhfnr17k41" + "commit": "ecbe482804a217b1471593f6c7a8b3d64f3cdc47", + "sha256": "0gcars1zmfrysq1n3bv40nwqsk821bz3pffrsjw14fg2mwjpmaxq" }, "stable": { "version": [ @@ -49497,14 +50415,14 @@ "repo": "purcell/ibuffer-vc", "unstable": { "version": [ - 20200304, - 2207 + 20200805, + 604 ], "deps": [ "cl-lib" ], - "commit": "1249c1e30cf11badfe032ac3b1058f24ba510ace", - "sha256": "1mgn7b786j4hwq1ks012hxxgvrfn5rz90adi2j190gmjz60rc5g5" + "commit": "5fa6aea09bc67f71ea743302d609f459967b1e81", + "sha256": "03xkhr8vq741pgbv0b184j5ksqhhdvb7pzwa1arpymsarc6hjwsy" }, "stable": { "version": [ @@ -49526,14 +50444,26 @@ "repo": "conao3/iceberg-theme.el", "unstable": { "version": [ - 20200515, - 934 + 20200812, + 943 ], "deps": [ "solarized-theme" ], - "commit": "9615307cbd37e698d6939a04128162ef893313cb", - "sha256": "02lsbzk5215z1rdvs6idnv2yff2487i4pqi1ljdjfn3g43ly5lr2" + "commit": "183b41eae07d94d4a8f299306078410bddc41d34", + "sha256": "1sxadaip63mhfjvgkax45jlv3c8cnbjnq653qbvw98vb8xsrmjc4" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "solarized-theme" + ], + "commit": "04b8d04c30276a471b37ff93d73409508e88d295", + "sha256": "13m6sq3ld8cm28jq7kxmv4ygrvyi7pjh1lsxwzvgaj6ncjqdi87v" } }, { @@ -49544,19 +50474,19 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20200504, - 1916 + 20200616, + 2322 ], - "commit": "fe835acce91b0f088c8d27801bf42e24bb2dbab5", - "sha256": "1az3m6zwrggj4w2lh5qhnbh09dvxpyj5m2a85yhcha2p7g1hpym1" + "commit": "a5871d39c5850ac4d9aac48350eaa1d31f3aaef7", + "sha256": "00sp2n8kb38nrkgs11m3jpijj9qnsdmy3sp37c1v6p7lgnzly80i" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "a2ee9254085431ec9e5c88d522e2c700355003ef", - "sha256": "1bqnlvv1gvrjriazvzd3bq98r8ii6fqax0zznhvkl1ij5pf55a90" + "commit": "2c328a19f617b538986977a897d3af051ae7f355", + "sha256": "1bm02qd71r3j35b861rgbxkv3kcmg2458c70vwfaw9sjjba0ssng" } }, { @@ -49747,24 +50677,6 @@ "sha256": "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp" } }, - { - "ename": "ido-clever-match", - "commit": "add68b4815cdfe83402b217595a4a46068f83a2a", - "sha256": "081i6cjvqyfpgj0nvzc94zrl2v3l6nv6mhfda4zf7c8qqbvx1m8m", - "fetcher": "github", - "repo": "Bogdanp/ido-clever-match", - "unstable": { - "version": [ - 20151011, - 1726 - ], - "deps": [ - "cl-lib" - ], - "commit": "f173473e99c8b0756f12e4cc8f67e68fa59eadd3", - "sha256": "14nmldahr0pj2x4vkzpnpx0bsxafmiihgjylk5j5linqvy8q6wk6" - } - }, { "ename": "ido-complete-space-or-hyphen", "commit": "59e11094068d3a0c0e4edc1f82158c43d3b15e0e", @@ -49796,16 +50708,16 @@ "repo": "DarwinAwardWinner/ido-completing-read-plus", "unstable": { "version": [ - 20200310, - 25 + 20200520, + 1535 ], "deps": [ "cl-lib", "memoize", "seq" ], - "commit": "98d3a6e56b1d3652da7b47f49f76d77f82ea80ba", - "sha256": "0rmqyxb0cr3avm6lzz26r2d9fmja2csrh3whmky8h2giz79mjf7d" + "commit": "b9ca2566b867464c25b720e2148d240961c110e7", + "sha256": "1vkk311wghhnkmybv3h5a6hf3vxlgy03iqzwl6xyxdw3hgip8in5" }, "stable": { "version": [ @@ -49821,36 +50733,6 @@ "sha256": "088b50iajgj602wsm1280gn5pqirycazndhs27r1li5d84fm1nvj" } }, - { - "ename": "ido-describe-bindings", - "commit": "31b8e255630f1348a5b5730f7b624ad550d219ad", - "sha256": "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2", - "fetcher": "github", - "repo": "danil/ido-describe-bindings", - "unstable": { - "version": [ - 20161023, - 1102 - ], - "deps": [ - "dash" - ], - "commit": "a814e25cb272401bdfee94cb98d915119d307414", - "sha256": "040mpwwldivyapmj0pjxsk8drgi113k7rpx8ym4jqz1hah5n33s1" - }, - "stable": { - "version": [ - 0, - 0, - 11 - ], - "deps": [ - "dash" - ], - "commit": "a142ff1c33df23ed9665497d0dcae2943b3c706a", - "sha256": "0967709jyp9s04i6gi90axgqzhz03cdf1j1w39yrkds6q1b6v7jw" - } - }, { "ename": "ido-exit-target", "commit": "b815e7492eb0bd39c5d1be5a95784f9fe5612b62", @@ -50007,36 +50889,6 @@ "sha256": "0zlkq29wxd3a4vg0w6ds2jad5h1pja7ccd3l6ppl0kz1b1517qlr" } }, - { - "ename": "ido-occur", - "commit": "8a576d8569bf82be01e7d50defcc99a90aab1436", - "sha256": "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji", - "fetcher": "github", - "repo": "danil/ido-occur", - "unstable": { - "version": [ - 20160820, - 1440 - ], - "deps": [ - "dash" - ], - "commit": "6a0bfeaca2e334b47b4f38ab80d63f53535b189e", - "sha256": "0q4w0akmnwk42ldbzqxbr7swz026q8wr1g27bl4i4k25bidqlx9q" - }, - "stable": { - "version": [ - 0, - 2, - 0 - ], - "deps": [ - "dash" - ], - "commit": "b0e67fe4835c162cbcf8a982bdf377955b9ac5ae", - "sha256": "13f21vx3q1qbnl13n3lx1rnr8dhq3zwch22pvy53h8q6sdf7r73a" - } - }, { "ename": "ido-select-window", "commit": "775c8361322c2ba9026130dd60083e0255170b8f", @@ -50184,28 +51036,27 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20190427, - 1539 + 20200522, + 808 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "acc8835449475d7cd205aba213fdd3d41c38ba40", - "sha256": "0n9xbknc68id0mf8hbfmawi8qpvrs47ix807sk9ffv2g3ik32kk6" + "commit": "b77eadd8ac2048d5c882b4464bd9673e45dd6a59", + "sha256": "1v8av6jza1j00ln75zjwaca0vmmv0fhhhi94p84rlfzgzykyb9g1" }, "stable": { "version": [ - 0, - 9, - 19 + 1, + 0 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "314a0baea5752069de08e814bb134a9643fb675d", - "sha256": "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92" + "commit": "b77eadd8ac2048d5c882b4464bd9673e45dd6a59", + "sha256": "1v8av6jza1j00ln75zjwaca0vmmv0fhhhi94p84rlfzgzykyb9g1" } }, { @@ -50231,11 +51082,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20200412, - 756 + 20200807, + 853 ], - "commit": "0fb3d380866664c3ab543acede606d343c257406", - "sha256": "0fz3p41j6d6bwk95v626j7w1z4rvbdxms6a4azy9dfncplnbnih0" + "commit": "59430e8c11c1fa9a294a070a3b1d571bd3887806", + "sha256": "1phm9n25hdg7v7gjjb5l173hrsgb64rc5frmdpchkd7li4ka4g91" }, "stable": { "version": [ @@ -50271,19 +51122,19 @@ "repo": "jrosdahl/iflipb", "unstable": { "version": [ - 20190817, - 547 + 20200731, + 1655 ], - "commit": "aeeb85633566ed3c13dbe94a6a4925d8930b7b85", - "sha256": "07010alf6ymhs0nyj3arafksba0rdvgzjw9wqqhayzw6qqannbb2" + "commit": "d48884212499cd128d103c5ceba3173a90ebd2b4", + "sha256": "0qbdaf41zpm846jjkr9sgarb7iivpvb1qj5izsd5v4w1sz6igwf4" }, "stable": { "version": [ 1, - 4 + 5 ], - "commit": "a5ad1fbd1173cff5228dab265515c92c0778f86a", - "sha256": "0gyxd5d57j0x93mqnfwwdf28plp102xh0ag2d2iws7y1d5m99wm2" + "commit": "83e698f312a6e621f6d2c87b27d1e4acce96b4bf", + "sha256": "1nnkxzf35gx6a7a2xjf73wc5jzzpg4x0hj96jb3j6rim19yrfs8f" } }, { @@ -50545,14 +51396,14 @@ "repo": "alezost/imenus.el", "unstable": { "version": [ - 20180505, - 1717 + 20200730, + 855 ], "deps": [ "cl-lib" ], - "commit": "149cfa579ee231014d3341a0e05add69759757a5", - "sha256": "00licvs457wzqq06a8cx7vw22kyqky20i7yq7a2nzf3cfl7vaya7" + "commit": "90200f5f22377903b405082eabe185447968f3e2", + "sha256": "04zhyn69bihxqddzsn9j0l6lxjpqkgdvbslh77cfdb4fp02cxsp1" }, "stable": { "version": [ @@ -50592,20 +51443,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20200308, - 1330 + 20200818, + 638 ], - "commit": "19c46859e041a0c0e7f40a9157a6c4d0d660f441", - "sha256": "0nx1g7caypnkid7bzhm4gg44cmpikpz1qz1cp11y6rlq1lwrb1d9" + "commit": "d7f18842f5e97977684c3dbb550c418b7625b343", + "sha256": "0gfw8fdl1wh7m2p449qxs2kfixqbhl4lc4zgmx1l3llv1kdq9qkw" }, "stable": { "version": [ 0, - 4, - 2 + 5, + 5 ], - "commit": "19c46859e041a0c0e7f40a9157a6c4d0d660f441", - "sha256": "0nx1g7caypnkid7bzhm4gg44cmpikpz1qz1cp11y6rlq1lwrb1d9" + "commit": "d7f18842f5e97977684c3dbb550c418b7625b343", + "sha256": "0gfw8fdl1wh7m2p449qxs2kfixqbhl4lc4zgmx1l3llv1kdq9qkw" } }, { @@ -50655,15 +51506,15 @@ "repo": "skeeto/impatient-mode", "unstable": { "version": [ - 20200327, - 1619 + 20200723, + 2117 ], "deps": [ "htmlize", "simple-httpd" ], - "commit": "fc84f4a333d47ca853842570cf35e659753a3ebe", - "sha256": "14zycqky7xkmbfacmfdqbmq1qs3sj2r41nfmg09dv0hl97pavir8" + "commit": "cbddfd54242210df3e1c3b590fada5bb5423f5ed", + "sha256": "14jnni828ndl1sj92cy49r0aa6y8qwqbm2rrxc87j0yfn5sdckc7" }, "stable": { "version": [ @@ -50753,8 +51604,8 @@ "epc", "f" ], - "commit": "86f17856db194c5f18b30f35df40fb029d5544b5", - "sha256": "0cak79lnlbfigl6lh3c5wzphxssq78vyd9xxj3zi7ln5q9ijl6pp" + "commit": "701dfcca5f3ab42be0f26a8d381d7116c79be850", + "sha256": "035830aizamh4c8hpnmfrbz9v9gy23d3nx0dv366l3q8mrh36l44" }, "stable": { "version": [ @@ -50823,15 +51674,15 @@ "repo": "conao3/indent-lint.el", "unstable": { "version": [ - 20200129, - 2046 + 20200812, + 949 ], "deps": [ "async", "async-await" ], - "commit": "23ef4bab5509e2e7fb1f4a194895a9510fa7c797", - "sha256": "00ipp87hjiymraiv6xy0lqzhn9h3wcrw7z4dkzb2934d7bd08j29" + "commit": "c55f4ded11e8e50a96f43675a071354a8fb501c3", + "sha256": "0d7vkgzsx6ka4zliscsg6drqhg2bj16i911ryzmsp4v6hj294jrc" }, "stable": { "version": [ @@ -50962,26 +51813,26 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20200425, - 1648 + 20200801, + 1128 ], "deps": [ "clojure-mode" ], - "commit": "f29861204ddbb032b425c7d693e8c006b7b027c6", - "sha256": "127kl64hqdy04qdbqr1xfzky3d8fzgbmp7z4hv6mjsc0p4s19azw" + "commit": "2c8e46b584be71fe1a585c9072da86382710dc59", + "sha256": "13rk3g58vaizp67c1plhfc80vsshdvvsz81wsf3076xp35p05w9b" }, "stable": { "version": [ - 2, - 2, + 3, + 0, 0 ], "deps": [ "clojure-mode" ], - "commit": "ff72d667c2709166d19ac15a36f7aac3423cefa1", - "sha256": "07l8wkm0j6y2cj7bbb24x4rkjgf4q6ag0c1kcjs0sfmf1kaf14bk" + "commit": "2c8e46b584be71fe1a585c9072da86382710dc59", + "sha256": "13rk3g58vaizp67c1plhfc80vsshdvvsz81wsf3076xp35p05w9b" } }, { @@ -51037,11 +51888,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20200327, - 1418 + 20200730, + 1456 ], - "commit": "41e5ed3a886fca56990486f1987bb3bae0dbd54b", - "sha256": "12qgd2p664rh0ks5kq6sxaqi5nlmxrzj5p0kpqrx40caicj6jfpl" + "commit": "9f0f79ff459c7c417e8931ca020db121e24b45b5", + "sha256": "0h0kxgihjrabklnwfphaf86b67q0wmfjywffrydhdmlidi56rbis" }, "stable": { "version": [ @@ -51177,11 +52028,11 @@ "repo": "dieter-wilhelm/inform", "unstable": { "version": [ - 20200512, - 1351 + 20200723, + 500 ], - "commit": "54e0c51960c7f50de31a6831c034ea6adc5a8892", - "sha256": "0j3hc3f7yx9dklbvvwpcq0d2n3lp0z47l5066ngvmm52aihhhiyd" + "commit": "8ff0a19a9f40cfa8283da8ed73de94c35a327423", + "sha256": "1rg3v554zjx1mrw1wz2agfrr9317fzj1bqkn82m9r4ys91gx1qh4" }, "stable": { "version": [ @@ -51269,11 +52120,11 @@ "repo": "emacs-jp/init-loader", "unstable": { "version": [ - 20160528, - 1315 + 20200520, + 2345 ], - "commit": "5d3cea1004c11ff96b33020e337b03b925c67c42", - "sha256": "17bg4s8yz7yz28m04fp2ff6ld0y01yl99wkn2k5rkg4j441xg3n2" + "commit": "44829fa70f5c4cba03d36db5fa2c969001325b91", + "sha256": "1863s0qvnh7hcy2f86d86zajkqldvnz71q16dd9b4wvgnnicwk8s" }, "stable": { "version": [ @@ -51333,17 +52184,26 @@ }, { "ename": "ink-mode", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "02q95xay6z56i4l0j24dszxnfpjbxijlj4150nsadbv55m7nnjcf", + "commit": "8e5ed03afe02f3a53150c6046b8d6bfc12c9eea0", + "sha256": "027k27w9yjzmf6rm9ax2njf9aq4j1y4fa4i5388lf1mf8za9sv2s", "fetcher": "github", "repo": "Kungsgeten/ink-mode", "unstable": { "version": [ - 20160814, - 1116 + 20200611, + 1807 ], - "commit": "e35f26abbaf8ea23c5aa0a0c7ef15334cdfb7b48", - "sha256": "0ixqgk101gnm2q6f2bjk2pnqlrj41krqz56lss6fmf81xhxavmpp" + "commit": "f610a2e7a5a5b176bdc831c66e52f85dc0e7e450", + "sha256": "0bssmf9nsg58xavf55wz1y7akw90bacxqd2czhmj4fnmykqd7cnz" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "commit": "f883fefb739d62e75a3f7247ea5c6ba8a0895c23", + "sha256": "1hr1n0xzjs84a2rgz4mfhhz3d2a7ibgn3wx4kg3qbjlwlwz17x0d" } }, { @@ -51354,11 +52214,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20200515, - 421 + 20200616, + 434 ], - "commit": "0f289a3f465728ed41d532674166eef09ac7209b", - "sha256": "1bchvrmmcbw8ird7i1klz0ds2xkfmwccz2pp59ixgys0j8cxnq4b" + "commit": "0a5f50c3aa590404ae81cdb08eb869ffc04da625", + "sha256": "0hnhq51r0rrl2i3hiwzqzax6cwm3j480w1w2nn8hy61x5p37wn06" } }, { @@ -51423,6 +52283,33 @@ "sha256": "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q" } }, + { + "ename": "insert-esv", + "commit": "de7f7ac1b8e67da50a1bce7f23a0805f8b8dfc06", + "sha256": "02s0jikma4qp38pf46jw0l6mqlx9kkfl7ny9zxzr6w2jmi8nc9nr", + "fetcher": "github", + "repo": "sam030820/insert-esv", + "unstable": { + "version": [ + 20200808, + 1832 + ], + "deps": [ + "request" + ], + "commit": "cf23d1d7e230c0b9212f8eeceff398f86c991b07", + "sha256": "0jqz6krd8b606nqr4q169qcg7dbbwa86gi2rcxvnx5i3jhfhrmab" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "8a09629bfafa87f8cd75e92fee6655cfa8be67f2", + "sha256": "00w9k2r07nyzqrbqp9q77jgx1h976d1gmiq2nv6zxm36sqfvr0xl" + } + }, { "ename": "insert-kaomoji", "commit": "216fcef758036cf466fa5b52599394709eed48b3", @@ -51601,10 +52488,10 @@ }, { "ename": "intero", - "commit": "1b56ca344ad944e03b669a9974e9b734b5b445bb", - "sha256": "15n7ipsq8ylmq4blsycpszkx034j9sb92vqvaz30j5v307fmvs99", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1a25lsm1psjvn9az3vd0an46p9qwrrmn09r16dqnhsjcaiabinxi", "fetcher": "github", - "repo": "commercialhaskell/intero", + "repo": "chrisdone/intero", "unstable": { "version": [ 20200125, @@ -51760,14 +52647,14 @@ "repo": "dotemacs/ipcalc.el", "unstable": { "version": [ - 20170926, - 805 + 20200809, + 1444 ], "deps": [ "cl-lib" ], - "commit": "2720f7e3e662e04e195f8338b81a499cf321296a", - "sha256": "1kmqbb9ca3sca59462ha21grbgxkl4wynz2lr4yqb4qk7cijgd6g" + "commit": "58b2b6c90af93ae46c5445b33ee4d1ef4bac1efb", + "sha256": "0v6ahhixp57p94m0sagidvq95m45bf4lfwszjzsn7a2wcrvap7r9" } }, { @@ -51840,11 +52727,11 @@ "repo": "a13/iqa.el", "unstable": { "version": [ - 20181024, - 2253 + 20200520, + 1137 ], - "commit": "b45614f5204ed851de0abe93907aa94de5e37379", - "sha256": "11wrmiwlp91x59cn9k2j2pqgvzbrnzvf81dqgm9l5ph5fym0jqsd" + "commit": "c1077aca6553cb2011f21b178e10271a17fe4f58", + "sha256": "0rr8m477hma3aaqxzmsayms6qgpf3ff1vx5bgcvbz27ddri375hh" } }, { @@ -51901,8 +52788,8 @@ "cl-lib", "json" ], - "commit": "5f75fc0c9274f4622470e2324e2f4457087aa643", - "sha256": "107ry1jxl7qiqa0ackn03whygndkabg20s7szl5xm1l87vx5xghc" + "commit": "1e1aabaa686a08767ab33e5cd43ce8f0ebf8d020", + "sha256": "1v3q0k93sviv2nn6qsi8f0537w2g0g6c3wamaidlcb019a5rj4vn" }, "stable": { "version": [ @@ -51926,15 +52813,15 @@ "repo": "ikirill/irony-eldoc", "unstable": { "version": [ - 20170502, - 1908 + 20200622, + 2214 ], "deps": [ "cl-lib", "irony" ], - "commit": "0df5831eaae264a25422b061eb2792aadde8b3f2", - "sha256": "1l5qpr66v1l12fb50yh73grb2rr85xxmbj19mm33b5rdrq2bqmmd" + "commit": "73e79a89fad982a2ba072f2fcc1b4e41f0aa2978", + "sha256": "0nwwghsdv11bxqar4ppraxxmm6i076s7nmi9l2c53m708xn4p6pi" } }, { @@ -51963,26 +52850,26 @@ "repo": "jcs-elpa/isearch-project", "unstable": { "version": [ - 20190505, - 819 + 20200717, + 807 ], "deps": [ - "cl-lib" + "f" ], - "commit": "4d660afa365c82c3ed00f685b53f0d2358972d36", - "sha256": "0klngpw69kdh3l9jrvjq63xlgpqd86j8rrvivrzipddmplppz9gy" + "commit": "9113d9452a9a879dc0e503f35e8c1fb4d44d9b64", + "sha256": "0gvr758kbfxcvrcwkvf8msibwbfqfp44zl99s7ls0gi81pgzwryj" }, "stable": { "version": [ 0, - 0, - 7 + 2, + 4 ], "deps": [ - "cl-lib" + "f" ], - "commit": "462b8100451b947367aed2970c2669ea6d15edbd", - "sha256": "0b8ncpi6kps7fx3fmgfwd2czaal52laf2k6pn46yh110sz6dl30m" + "commit": "9113d9452a9a879dc0e503f35e8c1fb4d44d9b64", + "sha256": "0gvr758kbfxcvrcwkvf8msibwbfqfp44zl99s7ls0gi81pgzwryj" } }, { @@ -52132,20 +53019,19 @@ "repo": "doublep/iter2", "unstable": { "version": [ - 20200512, - 2111 + 20200517, + 1623 ], - "commit": "b87c1e8ac50f728e8d33b5b69bf4124ef90b88ba", - "sha256": "09yasj1vfakryjvs22a3gd27wwa866b2pkvajwp8hlngk11sc3p3" + "commit": "987045585d60700b4b9e617313c1a73618a144c9", + "sha256": "0gaq3z2v1q4r9mkyq71dzmqakhi0p8g7ph4z0n3a11rvyc3z9ykx" }, "stable": { "version": [ - 0, - 9, - 11 + 1, + 0 ], - "commit": "a6e228eefed8dd6a405c235c15e7a4ea726cae02", - "sha256": "1n65202ap7qf44mv8f3ly5msp9fn12ap3cckhqb62ib3yw46ilwk" + "commit": "987045585d60700b4b9e617313c1a73618a144c9", + "sha256": "0gaq3z2v1q4r9mkyq71dzmqakhi0p8g7ph4z0n3a11rvyc3z9ykx" } }, { @@ -52205,17 +53091,17 @@ }, { "ename": "ivy", - "commit": "06c24112a5e17c423a4d92607356b25eb90a9a7b", - "sha256": "0xf5p91r2ljl93wbr5wbgnb4hzhs00wkaf4fmdlf31la8xwwp5ci", + "commit": "de5b4f40470cdfb4d2b4b3078436a7457f5703af", + "sha256": "0lrf3xxxi3b78z80sg6jkaz07gzqrv242ajiiy0rvly6da17i06z", "fetcher": "github", "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200515, - 1845 + 20200818, + 1250 ], - "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", - "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" + "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44", + "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l" }, "stable": { "version": [ @@ -52227,6 +53113,25 @@ "sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p" } }, + { + "ename": "ivy-avy", + "commit": "d820ccd91bcd265539276baedb656ab63d4a9c75", + "sha256": "1zanwbf0jcbi0v07n2j058r814dh0qs2qxmwlqrv12j7d1w72kd4", + "fetcher": "github", + "repo": "abo-abo/swiper", + "unstable": { + "version": [ + 20200615, + 938 + ], + "deps": [ + "avy", + "ivy" + ], + "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44", + "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l" + } + }, { "ename": "ivy-bibtex", "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3", @@ -52294,15 +53199,15 @@ "repo": "wandersoncferreira/ivy-clojuredocs", "unstable": { "version": [ - 20190907, - 2053 + 20200714, + 1111 ], "deps": [ "edn", "ivy" ], - "commit": "dd33a25f1de4339f75f05689ed60fe1b1c97f554", - "sha256": "0km1par5jhhbdbn1sccpsz0drqvmmjg1905xyc2bbfc2xx38cg1i" + "commit": "0ea57b70a144ecfa80fbd2ec383ebabedb524c37", + "sha256": "1hqs45573651jw248zcyczby4fwp4pdgil2n9rk4lvgb89531qlz" } }, { @@ -52339,11 +53244,30 @@ } }, { - "ename": "ivy-emoji", - "commit": "f1121a85321a3184d1fa990ae86f5d1f3b04f145", - "sha256": "0sp8z7r1kffgfm4jrn5cqfi335vaynn27hs9345ybrxi3r4a3c0g", + "ename": "ivy-emms", + "commit": "12b434e4c78b3428ee144559cb57ea41df8fb4c5", + "sha256": "1kqjdw94f2mg5m0zcnah1xk59dp152dm4si2rd9c66jn79s2ai4a", "fetcher": "github", - "repo": "sbozzolo/ivy-emoji", + "repo": "franburstall/ivy-emms", + "unstable": { + "version": [ + 20200629, + 801 + ], + "deps": [ + "emms", + "ivy" + ], + "commit": "6f547f9f3dcbf0d5b88595760b3505c7195dc96b", + "sha256": "0bqn0hqdrw8psc8r6xcx6dxrjy7llkfpm0fd1k6ra4ybncgaznfg" + } + }, + { + "ename": "ivy-emoji", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "037r1j2s632a1v05gynlclh6slnhp6mxn55fyx02qw1507l5ap74", + "fetcher": "github", + "repo": "Sbozzolo/ivy-emoji", "unstable": { "version": [ 20200316, @@ -52518,15 +53442,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200421, - 1120 + 20200608, + 1010 ], "deps": [ "hydra", "ivy" ], - "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", - "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" + "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44", + "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l" }, "stable": { "version": [ @@ -52550,15 +53474,15 @@ "repo": "julienXX/ivy-lobsters", "unstable": { "version": [ - 20171202, - 2041 + 20200818, + 1406 ], "deps": [ "cl-lib", "ivy" ], - "commit": "4364df4b3685fd1b50865ac9360fb948c0288dd1", - "sha256": "1cfcy2ks0kb04crwlfp02052zcwg384cgz7xjyafwqynm77d35l0" + "commit": "3f7f90751d15ebcf91253ef3cda18c0aa7d856ff", + "sha256": "034ln7r1fgsgpxgmk4iv08pkjkxmdc0c0q44hqv2ryb1zkbwija1" } }, { @@ -52603,45 +53527,15 @@ "repo": "akirak/ivy-omni-org", "unstable": { "version": [ - 20200125, - 807 + 20200810, + 1050 ], "deps": [ "dash", "ivy" ], - "commit": "113477ae46ec857c5794fc0a031c1e579615f0a9", - "sha256": "1j9gwl3azh6y24yiy2s9p9yh6vhs2rmydv2496ivwxqnq9md5b49" - } - }, - { - "ename": "ivy-pages", - "commit": "93f1183beb74aa4a96de8cd043a2a8eefdd7ad7e", - "sha256": "0zz8nbjma8r6r7xxbg7xfz13202d77k1ybzpib41slmljzh7xgwv", - "fetcher": "github", - "repo": "igorepst/ivy-pages", - "unstable": { - "version": [ - 20160728, - 1920 - ], - "deps": [ - "ivy" - ], - "commit": "47b03a1f9384502cf22369ff31a2898c863d3aff", - "sha256": "0jv74s8jn1sdwdhxkx11gnaqcc49369gld1g6a1hl62521j897rc" - }, - "stable": { - "version": [ - 0, - 1, - 1 - ], - "deps": [ - "ivy" - ], - "commit": "428a901f94c9625c8407fd2bf76f9d7714d40d87", - "sha256": "11lcv8dqlmfqvhn7n3wfp9idr5hf30312p213y5pvs4m70lbc9k2" + "commit": "a6b284f65b229d9b118b4316c2f6377de93400b1", + "sha256": "028c51z4glxxrni1vjdzs9l1475jmcjagpgwaryiqdwx6clia59x" } }, { @@ -52690,15 +53584,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20200331, - 536 + 20200528, + 553 ], "deps": [ "ivy", "posframe" ], - "commit": "ae9bafe94fe6b77b6fe45766ae6172646f6a5d50", - "sha256": "1j6yns5d7lh2v1nfcznrirl7qicdli9csciqvfgj4gkh72a97pw1" + "commit": "44749562a9e68bd43ccaa225b31311476fab1251", + "sha256": "12wj8v483jjnpjvcgkhlm0p971s06c58c3fd73pgnzzppf0fn7xd" } }, { @@ -52709,27 +53603,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20200415, - 1457 + 20200716, + 1414 ], "deps": [ "ivy", "prescient" ], - "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", - "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" + "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530", + "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p" }, "stable": { "version": [ - 4, - 1 + 5, + 0 ], "deps": [ "ivy", "prescient" ], - "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", - "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" + "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc", + "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix" } }, { @@ -52771,14 +53665,14 @@ "repo": "Yevgnen/ivy-rich", "unstable": { "version": [ - 20200428, - 110 + 20200601, + 104 ], "deps": [ "ivy" ], - "commit": "3f818b201769bc13cc75aa73645217e374136aca", - "sha256": "19w1mmqg15xy963f2h50i0cz0gmii75yarkmv2ssfh164pkyvhdk" + "commit": "10970130b41c6ef9570893cdab8dfbe720e2b1a9", + "sha256": "0zpkgj2q16hncafpbap32ypm3666j2vvcrwsn78mca9i82j7xg7l" }, "stable": { "version": [ @@ -52808,8 +53702,8 @@ "ivy", "rtags" ], - "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", - "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" + "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824", + "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b" }, "stable": { "version": [ @@ -52886,8 +53780,8 @@ "repo": "mkcms/ivy-yasnippet", "unstable": { "version": [ - 20181002, - 1655 + 20200704, + 700 ], "deps": [ "cl-lib", @@ -52895,8 +53789,8 @@ "ivy", "yasnippet" ], - "commit": "ebf05761cd890bccd8072051f988dae7ab11c9ce", - "sha256": "01dc8hv464r3q3d6whix76sqwfkjcvhdg55jmw0ck9jwmhwsvc7x" + "commit": "83402d91b4eba5307f71884a72df8e11cc6a994e", + "sha256": "07a4bk3hva41qzz8x4qyswa2f89psxhih89k0slhngw5d8iidx3i" } }, { @@ -53075,11 +53969,11 @@ "url": "https://bitbucket.org/sbarbit/jack-connect", "unstable": { "version": [ - 20200325, - 1639 + 20200519, + 1027 ], - "commit": "c227d1ed3016960c8666a60e4215bbb029436bc7", - "sha256": "1w66dpn0cmdqwgjd1528cd2739ijxhsr62zyx2arlr9ldrnqy5f6" + "commit": "fae8c5f9b383f7606f3883badfd1294e8affb0db", + "sha256": "0r6dihw5dar7w6h5xvif25fv9alwarb74mmaxq2ld8rbhv4il66c" } }, { @@ -53163,33 +54057,6 @@ "sha256": "041rww8ngvjmgkiviqwq6wci8wgh4bs0wjjc8v8lqpwqhbzf65jy" } }, - { - "ename": "japanlaw", - "commit": "6192e1db76f017c3b1315453144cffc47cdd495d", - "sha256": "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa", - "fetcher": "github", - "repo": "mhayashi1120/japanlaw.el", - "unstable": { - "version": [ - 20160615, - 643 - ], - "deps": [ - "cl-lib" - ], - "commit": "1bbdef942f28c61a0adb89d1b3c2cca5b10ca2dc", - "sha256": "1vj5b551383acp77lawvlw5cfvnqidjhd52sig3kz8v4bzz73cch" - }, - "stable": { - "version": [ - 0, - 9, - 1 - ], - "commit": "d90b204b018893d5d75286c92948c0bddf94cce2", - "sha256": "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h" - } - }, { "ename": "jape-mode", "commit": "b034024bd31c4be96c478a951b0ef63d8f89a1b7", @@ -53353,14 +54220,14 @@ "repo": "zk-phi/jaword", "unstable": { "version": [ - 20170426, - 627 + 20200816, + 647 ], "deps": [ "tinysegmenter" ], - "commit": "ac062b0e5ab4bd3270497e80aa0f3ac033a0493f", - "sha256": "05kbscympb59njfrs94w4b2lwkc3057wzib65kq0l93bx4pcw2iy" + "commit": "45e350895fc55f087a2102fded5b306811089a7d", + "sha256": "02ncm22wldx8g3iibdw92gk4hdig0209f7bmhxrhgdv8xp544c2h" } }, { @@ -53594,15 +54461,15 @@ "repo": "rmuslimov/jenkins.el", "unstable": { "version": [ - 20200115, - 2133 + 20200524, + 2016 ], "deps": [ "dash", "json" ], - "commit": "29e27a685ec971b518251ce0e66a0b67d78ea395", - "sha256": "0ms9i4dww801q09n4wzjpaqd6k89xdkn5vx3i565p748kp9lqhz6" + "commit": "bd06cdc57c0cb9217d773eeba06ecc998f10033b", + "sha256": "0g99bi3i27ay8xhz409k9ska9yy77j3k687l817k1fyhlyy5lpjk" } }, { @@ -53621,15 +54488,33 @@ } }, { - "ename": "jest", - "commit": "a656c058c423ea6396b831d45c6dbb9bce6c4881", - "sha256": "10xsqcjskh2s6mlh07vf10whaas3aqm18hk3w309r3n1qmqihf75", + "ename": "jenkinsfile-mode", + "commit": "a579d11271a8f46a65cf557b74f84db36a7b8bb4", + "sha256": "1j70gp8w5f3nli5m08s9ysl3k7pys6n4bzdzmbq0r9yzl02i6m8r", "fetcher": "github", - "repo": "emiller88/emacs-jest", + "repo": "john2x/jenkinsfile-mode", "unstable": { "version": [ - 20200318, - 237 + 20200725, + 2325 + ], + "deps": [ + "groovy-mode" + ], + "commit": "00d259ff9b870d234540e00e1d7c83cccdb063b8", + "sha256": "0srf6xdjnrd4v4ks9pal7i48wmkcl4q5ry7d0yzfx1c9pz2qg9zx" + } + }, + { + "ename": "jest", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1x9dqyrpri2giqzzlcg0nnq6wjfdfmy9fqqrq159qvw8rshvfzcz", + "fetcher": "github", + "repo": "Emiller88/emacs-jest", + "unstable": { + "version": [ + 20200625, + 1611 ], "deps": [ "cl-lib", @@ -53640,8 +54525,8 @@ "projectile", "s" ], - "commit": "b51be19c1de9e82ee1dc62921be2222fc5685eed", - "sha256": "1jdphlhp9vxvkj51cswqfgka910216snyjhql700x4dgpmvkcv56" + "commit": "4c6ddd3304e199211f0fbdc8a5b83ccbfe1f7fcc", + "sha256": "1v940c6p77dhs3rf016qqzhaniifkfsspbkpknf7vdssxgk9g1a5" } }, { @@ -53718,11 +54603,11 @@ "repo": "paradoxxxzero/jinja2-mode", "unstable": { "version": [ - 20141128, - 1007 + 20200718, + 730 ], - "commit": "cfaa7bbe7bb290cc500440124ce89686f3e26f86", - "sha256": "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381" + "commit": "ecd19a40b7832bb00f0a2244e3b0713d0bf3850d", + "sha256": "05z380d8ln53mx1gqa7awnv4wpqdhv7ggc91dds57681wzsqgz15" }, "stable": { "version": [ @@ -53756,15 +54641,15 @@ "repo": "nyyManni/jiralib2", "unstable": { "version": [ - 20200331, - 1940 + 20200520, + 2031 ], "deps": [ "dash", "request" ], - "commit": "ccf69e417911e091ec4c28d47d178ee63196c626", - "sha256": "170fjz7k9bk17qk7wrd56xw484xp8zckx635360pm0lfg4dvycpc" + "commit": "c21c4e759eff549dbda11099f2f680b78d7f5a01", + "sha256": "0yrcc9yfz9gxkhizy03bpysl1wcdbk0m6fj9hkqw3kbgnsk25h4p" } }, { @@ -53823,6 +54708,29 @@ "sha256": "0v4xiq3xf7c52rmyymw8a4ws85ij0xy7pr7625gf15359cs5chs9" } }, + { + "ename": "journalctl-mode", + "commit": "38710d44fba3c886431d1acb7477ae4035cf00c1", + "sha256": "126gj6rh6j0j6lbygx15lg5qxfaz4bpspbzd1hv3h05nvnnykv3h", + "fetcher": "github", + "repo": "SebastianMeisel/journalctl-mode", + "unstable": { + "version": [ + 20200607, + 754 + ], + "commit": "e8e057f387266d1c11f8fb68023ceb9607404948", + "sha256": "1l9z0w8kb15vsfpwcl9rfhflmvy8illsssfqjxkcwl8d7pzfhm8n" + }, + "stable": { + "version": [ + 0, + 8 + ], + "commit": "457e38af67427e92d6217abbb362ca9673b33ed5", + "sha256": "1lnjgpbvs3b7h1m1lnd4g3965pjn1sw4vyjd3f4106s10llmkd8x" + } + }, { "ename": "jpop", "commit": "2a52a3cf909d12201196b92685435f9fa338b7ba", @@ -53892,11 +54800,11 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20200516, - 1606 + 20200604, + 833 ], - "commit": "85214664a9f20faab7c45087b28bedd0feabb560", - "sha256": "0kvi1cqn4hdcs2mc4lsddy01yyixvm2ykqq6j4yb9h07lixrxih6" + "commit": "42ad0a99f0114233e2cb317585cb9af494d18a2f", + "sha256": "1n4w45yv1k7979j42dahhp9356p9bmk6ldybqa0z65k9gz4abkxl" }, "stable": { "version": [ @@ -53953,8 +54861,8 @@ 20180807, 1352 ], - "commit": "306abcfb9f6e46962061a34b68d4f6baa8c7aba4", - "sha256": "1pifplr4qr9667bbbqgqg39v8dyglvg6ljglkjga0d2n39am7r2q" + "commit": "9d9460b17f59e4e7a4e5cc34576ba72b2ca56524", + "sha256": "0hil53mzvxz71l908wm6804migvm7hm0nwm8qpyy2dgnfzl996hg" }, "stable": { "version": [ @@ -54144,14 +55052,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20200427, - 33 + 20200725, + 112 ], "deps": [ "cl-lib" ], - "commit": "515d876c6ae45a61cf67a7bd5723fe4c9e518756", - "sha256": "05pgyisb2szbrfbv6wjhfi8c00gakv51jxb8j73pji30v2a9rapn" + "commit": "40aab27581279d0fdbfeb9afeb85f39d401a927f", + "sha256": "0ysd0ji3vvk2zpjcg1wl7b2hva8471vq0ypib4h6spnpjdr43vzk" }, "stable": { "version": [ @@ -54202,6 +55110,24 @@ "sha256": "1iwblf5i7k1i1ax9pjv7n8zv9q157krirdn0gwcib6dwza2i30jp" } }, + { + "ename": "js2hl", + "commit": "7c7f441e411427ed570f0aa0b04e46d088debecc", + "sha256": "09jp7cy5jgcmhrpa2x48q39shpcgw1xm3g73aqmlhcw7wfn6q1b5", + "fetcher": "github", + "repo": "redguardtoo/js2hl", + "unstable": { + "version": [ + 20200729, + 146 + ], + "deps": [ + "js2-mode" + ], + "commit": "0255339dbb9fdfb009c94beefdc60e78baae11a7", + "sha256": "19vw96z28zgkkb93zq6ndslc20yg3qip44fqzvnsf8qr9wxxl3g1" + } + }, { "ename": "js3-mode", "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", @@ -54479,11 +55405,11 @@ "repo": "mgyucht/jsonnet-mode", "unstable": { "version": [ - 20200218, - 2217 + 20200812, + 1558 ], - "commit": "d8b486c8376a4785a7f2dc8a16fe1f2d82c6bfae", - "sha256": "0xpy699jh6ia46brd7i2qrfi0zrcdrhj3dc8d275va9w8a78paks" + "commit": "c8422a617438c79ade98f8d9eeb2086dacb0378c", + "sha256": "1r2ic7gbngbwmjjcigphj8jamaff42s7bsn6xz7yfzrci0gm8jrd" }, "stable": { "version": [ @@ -54558,11 +55484,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20200504, - 1726 + 20200717, + 1915 ], - "commit": "839726af374991223ffe56f7e7d10bef81033d09", - "sha256": "0lspmp519py7adippfmz70zcd9dpz46x8a3wlda71a5pdjs5szfq" + "commit": "b5f5983d2b232c8bba4c5eff75cccdb787c19d98", + "sha256": "0pxaga920bab6n5byag6h0wql2akiybhsh9nlinfx708i9dzmvv6" }, "stable": { "version": [ @@ -54581,14 +55507,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20200310, - 1145 + 20200625, + 924 ], "deps": [ "s" ], - "commit": "5fa04de4e76e10d5ee37d4244f48ddae4503faa1", - "sha256": "1xnb3r5999ipkkvh7fl2kr0yy0j3vmnw7a6n23m9ps4fvy6hpl9n" + "commit": "d073acb6339e99edf77833f82277afd9a076f16a", + "sha256": "1p2d92mcbdl8j22qz04iwdlpkbv2qn9p8ds8n2vpf4m9mgzjplzi" }, "stable": { "version": [ @@ -54620,14 +55546,14 @@ }, { "ename": "julia-snail", - "commit": "4b80da8bdccaa0992deb07cef7ea4a582d9707ae", - "sha256": "0yljiqgamm5gjr1dbzjfqvnrijhgrpjd7gj8and1w33s1d2qh8gd", + "commit": "5510bd5788fc1dab3049100f9a993d89fcd10601", + "sha256": "0bbz4r0xygx9hcddk5r64w9hycvxqvl7y6z53smlwns1pj7n9wvp", "fetcher": "github", "repo": "gcv/julia-snail", "unstable": { "version": [ - 20200515, - 2010 + 20200810, + 1941 ], "deps": [ "cl-lib", @@ -54638,8 +55564,8 @@ "spinner", "vterm" ], - "commit": "c9aff5ffe6df951dd5343f05d6e4170203a7032a", - "sha256": "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y" + "commit": "44d06e18cf9ded6c05936ce10aca0a73f768f457", + "sha256": "0hpypirqc2hd1zga5qjcx2i7vp3h2vif76npd0j10hiimxal1kxz" }, "stable": { "version": [ @@ -54803,8 +55729,8 @@ "websocket", "zmq" ], - "commit": "785edbbff65abb0c929dc2fbd8b8305c77fd529e", - "sha256": "1l1fd062dmig3mgkwixr4ly8x12z9skh5wj18hkyc84n7rwdar47" + "commit": "360cae2c70ab28c7a7848c0c56473d984f0243e5", + "sha256": "1bn0jwpigpl5n45vpz73vv12g078151vyhkkhkwy5xqx627swxf9" }, "stable": { "version": [ @@ -54860,14 +55786,26 @@ "repo": "TxGVNN/emacs-k8s-mode", "unstable": { "version": [ - 20191006, - 849 + 20200803, + 1549 ], "deps": [ "yaml-mode" ], - "commit": "5984acee6f3891afa78acfd1d08c44a24953a233", - "sha256": "11x602pmqa3833azkzph1ghm354nypv6rr1y53k6kdrkwviwkcpm" + "commit": "9364cdbbae00055c4efa1eeb80503e0b0a215743", + "sha256": "1ap8nwlv9ha5a03gc10sva12sc6qzq1vig8hibg1igbsc1qmfkad" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "yaml-mode" + ], + "commit": "9364cdbbae00055c4efa1eeb80503e0b0a215743", + "sha256": "1ap8nwlv9ha5a03gc10sva12sc6qzq1vig8hibg1igbsc1qmfkad" } }, { @@ -54999,16 +55937,16 @@ "repo": "jmorag/kakoune.el", "unstable": { "version": [ - 20191017, - 1502 + 20200621, + 1818 ], "deps": [ "expand-region", "multiple-cursors", "ryo-modal" ], - "commit": "d73d14e69ea38076af50cc69f846808383ff539d", - "sha256": "0nk6jdy1y5mc3ryd0smiqghrk6iv34d5grc7f7migmshlbq0np92" + "commit": "ea8dde5dfe59c54d7729b141024976535b472573", + "sha256": "04ixj4cpw5iayxxwly5sr19lfnyss5cac0vsd0q1x3ys57y9v9im" } }, { @@ -55121,28 +56059,28 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20200508, - 1621 + 20200817, + 1844 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "15e2612eba2eeb223f6b4e5ac4a55dc5da09b14a", - "sha256": "0qay924qz5ab7a4d7cnancfnb7ivra33dr6knwqmy3wf089jl6kk" + "commit": "380bcb745c9bbf7328b7f190680a0e51231e3c3e", + "sha256": "1yw1c97ynjjr3md2shrhviiqycaggcmzhkb0i5y49b2w2mdvp1fa" }, "stable": { "version": [ 1, - 5, - 4 + 6, + 0 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "db1c43915fe68f31fffa00159b4198c32e87c8ed", - "sha256": "038bqg66m5cpg1w70la3jr57rq9fngmb1g67z27lpqcf3xf416xc" + "commit": "3e2c700aa1cf9f0ee17486ef9a7a68f77fb9946a", + "sha256": "07lydl1b8fz4g4q22ffrl6li9kc3zp9zq5rpqghzr9b8f56ddfqj" } }, { @@ -55217,11 +56155,11 @@ "repo": "delaanthonio/kconfig-mode", "unstable": { "version": [ - 20190818, - 2030 + 20200628, + 1721 ], - "commit": "02bb919596cf673828e95872dc329f2424a99864", - "sha256": "1h0v9528d2ssjgqa8813l3anhz15aggsmf8yln0qpphhrlrkfmpz" + "commit": "d9fdf751646abe2b75b7bbeb46e7552e0f36f290", + "sha256": "0dhkggvni5k4rnj2m6lva99hj1925b4w24dh9nv3m9w0x7b49263" } }, { @@ -55263,6 +56201,39 @@ "sha256": "0kyzcws47ch3pkw9ijb4gjr7l933c3mrxc9bsy16ddkc8dvl7yng" } }, + { + "ename": "keg", + "commit": "78d46bbc822f5df56aa83b986a4f283949533d5b", + "sha256": "1cmbpak0rn6xz0ccpn1629qp0wn7rpv40js4jr958a2z89448g3g", + "fetcher": "github", + "repo": "conao3/keg.el", + "unstable": { + "version": [ + 20200726, + 228 + ], + "deps": [ + "cl-lib" + ], + "commit": "fea2f831d84d7642c35820bb63250487e46683e5", + "sha256": "062lnv7g9ixs6d0qzp6py9ajd2rbrk7l2yrz3dn5zz8lx06hbaga" + } + }, + { + "ename": "keg-mode", + "commit": "bb72a113cefcc1e42a1fe9ea00404fbc6ee8d917", + "sha256": "13g43mfja6b84bkfzinr2f39viyrix5xf4xwg7kg66zpy12bshiv", + "fetcher": "github", + "repo": "conao3/keg.el", + "unstable": { + "version": [ + 20200601, + 333 + ], + "commit": "fea2f831d84d7642c35820bb63250487e46683e5", + "sha256": "062lnv7g9ixs6d0qzp6py9ajd2rbrk7l2yrz3dn5zz8lx06hbaga" + } + }, { "ename": "kerl", "commit": "166afdc776689b0da93576dbeaa71ff6dfb627db", @@ -55407,20 +56378,20 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20200418, - 2028 + 20200612, + 2247 ], - "commit": "a912c4db1b88390f76b14e3b47ded314fdc8f48c", - "sha256": "07gfldj9y4jfvna1rqlr7w6y6daqdsvc1fb2m7acjn37bpmfrc3b" + "commit": "038475c178e90c7bad64d113db26d42cad60e149", + "sha256": "1926khkdak2d1wgrgrfzhsv9l5f0rrl1rws78c3zw8ikwl8k7wbl" }, "stable": { "version": [ 1, 0, - 1 + 3 ], - "commit": "adb55497c0f16e90069d6e5e86b4f9f65f13624b", - "sha256": "1sprdfx0gvyqmq0fkf4bf56q3d8xxig2vxi38nzjx90llzvka35q" + "commit": "038475c178e90c7bad64d113db26d42cad60e149", + "sha256": "1926khkdak2d1wgrgrfzhsv9l5f0rrl1rws78c3zw8ikwl8k7wbl" } }, { @@ -55517,13 +56488,13 @@ "version": [ 3, 0, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "0b9bb7f4959ca54f0827b202f513ec7508c11e0e", - "sha256": "11y1vdrj2isn00mh428ynzqnfxjsg0138wx0bs619j0pv6d3j09g" + "commit": "195e0ca5b1b9967faf94a3e5a634d8975b796705", + "sha256": "0ckv9mbqb1f2lp17sv3nxjwww4ph9v3bhlxwvchvkkdlbcg87i5n" } }, { @@ -55549,11 +56520,11 @@ "repo": "chuntaro/emacs-keypression", "unstable": { "version": [ - 20200514, - 822 + 20200819, + 534 ], - "commit": "1e00bbdb451fd88bde9917526fd0b13b2a1bd26c", - "sha256": "06j8pqss8izhyahf0nw95mg34lbclhzk4f5vzfg35qcmjmbmqzg6" + "commit": "9427241f3fa539e4b5ad7581a05eb7e49f2cf518", + "sha256": "0p2pag2hzxswsf5hzjfm0nf4wpp40lsmxf1x6n9vfwfrpfk5b9ar" } }, { @@ -55571,8 +56542,8 @@ "cl-lib", "dash" ], - "commit": "41bbfc4dbed5de6ecf3ec1dba634c7c26241ca84", - "sha256": "0cm6naqlwk65xy9lwnn5r7m6nc1l7ims2ckydmyzny5ak8y5jbws" + "commit": "45ce83c4b56f064874256db37e697a63b2c69e65", + "sha256": "0fcz1qw3mw4m8albs1ybixrcz8yqgwip69fr99cd5bxfyr6zqj6d" }, "stable": { "version": [ @@ -55730,8 +56701,8 @@ "deps": [ "cl-lib" ], - "commit": "e77fcf46284afa1fd13499db695745112f41c8cd", - "sha256": "0c65qnsibcppyrf3bqp4blv2bfamisfwgxqy90z0gkbxzw9q4lxw" + "commit": "7db85a3f3004ff400e24105d1875f4e3a6eec7a6", + "sha256": "02nv6hzzr60gn24ra88smrwmkfjcb33c987dcgxqv7rzjpdjagnx" }, "stable": { "version": [ @@ -55842,8 +56813,8 @@ 20180702, 2029 ], - "commit": "c0227c5ce4011033b5f0cf2815c352d123a13305", - "sha256": "1l3fjljm7abk29ibbbvds7nq72yqrgcsy5bv42s1czbffw62zcn6" + "commit": "f34c43f235f35767ed04765a90d68b23807436ba", + "sha256": "06pgjd79kvkpznniw90hrsb7fvc0y3hhnxs6pyay869d50vbyw53" }, "stable": { "version": [ @@ -55851,10 +56822,10 @@ 0, 0, -1, - 2 + 3 ], - "commit": "78fb93b88f9941c22be02d36a786db8ca7639c59", - "sha256": "1z59fi9q32xql1w7pjh4w1jzfz1n63a0lr5x38kwjj79dpz3ccal" + "commit": "20c14b2a2bac73288a4c2808843910364565f66a", + "sha256": "1mf3if96cvxc8sqy22h4j2aq320ngw6q2286psvpq9v1mhv0wna4" } }, { @@ -55865,15 +56836,15 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20200512, - 1321 + 20200714, + 1357 ], "deps": [ "cl-lib", "request" ], - "commit": "dd02284149027694e4cf16d6f4daf1f6dd011249", - "sha256": "0zhg9467id0jd516hnz4c6aqmjp5q1s95fkhjxbk3g9j11cnfjf0" + "commit": "cb3e2531a55b896b9b41f38f97a597c26433da8e", + "sha256": "077bng1mwnd1m8ji4a44aqly94d07k09grwk0j52kgxlhvv3p3di" }, "stable": { "version": [ @@ -56130,16 +57101,16 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20200429, - 1454 + 20200812, + 2143 ], "deps": [ "dash", "s", "transient" ], - "commit": "7a0f095992cc135babfbf9706b6eb927e0d0c883", - "sha256": "0g6sr8ndbig0vgqy7791hkzn89m5lj7qfq36inh5ci9q9r343ggg" + "commit": "55099f130803b56eb1f7595ba34a313df4ec138a", + "sha256": "1sly3fgdrynazaab0nb7hbxs0vb42g0r00m7zr162kqw7n57gxaw" }, "stable": { "version": [ @@ -56165,8 +57136,8 @@ "evil", "kubel" ], - "commit": "7a0f095992cc135babfbf9706b6eb927e0d0c883", - "sha256": "0g6sr8ndbig0vgqy7791hkzn89m5lj7qfq36inh5ci9q9r343ggg" + "commit": "55099f130803b56eb1f7595ba34a313df4ec138a", + "sha256": "1sly3fgdrynazaab0nb7hbxs0vb42g0r00m7zr162kqw7n57gxaw" }, "stable": { "version": [ @@ -56351,11 +57322,11 @@ "repo": "MetroWind/lab-theme", "unstable": { "version": [ - 20200204, - 1931 + 20200815, + 2104 ], - "commit": "2cd61072d2b4c563d961f80918fc6b1dc45f7ba4", - "sha256": "0jwslzxjyclr4iw8ir0glcj5iasgx2z9i16qn7705sdmdmbzkdwz" + "commit": "9d7deb9635959d3a50ccb1082eb1207275f4b3e8", + "sha256": "0ifpg3vz84x87a1xsx0db79v14bfdnbaha6p4hcvaj67hi58qa81" } }, { @@ -56405,15 +57376,15 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20200513, - 1043 + 20200706, + 1546 ], "deps": [ "eglot", "math-symbol-lists" ], - "commit": "a3d4ae8863e268c88664ce869e9469c8a42d2e05", - "sha256": "1v8w70x1jnald6k22ipa7d9z1ggcf2imr97wbw3i48dp4iv21zqd" + "commit": "665cb18e484b8e41b0314fc442422b671cda2962", + "sha256": "0qsd30xnhzcvfdk0p2adzrbzl6hw4z5is0wwirzr79qx025zm4gf" } }, { @@ -56472,26 +57443,26 @@ "repo": "mhayashi1120/Emacs-langtool", "unstable": { "version": [ - 20200117, - 441 + 20200529, + 230 ], "deps": [ "cl-lib" ], - "commit": "a71ed02ce06920ae3cafd6708de1c21811ce14c3", - "sha256": "1ars70nx8gxb8szlp6jyqjll9gr7j9z5cd9ip1izqv00si6p1fvn" + "commit": "8276eccc5587bc12fd205ee58a7a982f0a136e41", + "sha256": "1pkfazn6qy6n4rg1rvw7b79b7nsp7xqdadhpah4xjvqxd6apqasz" }, "stable": { "version": [ 2, - 0, - 4 + 2, + 1 ], "deps": [ "cl-lib" ], - "commit": "adb80f55665db65a46fc552d364386d3cc703d94", - "sha256": "15bbyc0fqdn7d0k8zrn71jljkq9cc8a5rcllywvph46lnfnqy3p6" + "commit": "0fe79567244ca719448c55a89082505596a2359a", + "sha256": "1pkfazn6qy6n4rg1rvw7b79b7nsp7xqdadhpah4xjvqxd6apqasz" } }, { @@ -56520,26 +57491,26 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20200409, - 607 + 20200726, + 1813 ], "deps": [ "cl-lib" ], - "commit": "bf17d80b6c4b58fb66cddc2b2914f57d48468e97", - "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c" + "commit": "aa541a4461a07add17374fd56aef6e2fd1a61c60", + "sha256": "0mxwch6692mb5d9l5hzbscrg61a3sxf2wjbn66q06b5a2r2wkqvn" }, "stable": { "version": [ 0, - 5, + 7, 1 ], "deps": [ "cl-lib" ], - "commit": "bf17d80b6c4b58fb66cddc2b2914f57d48468e97", - "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c" + "commit": "aa541a4461a07add17374fd56aef6e2fd1a61c60", + "sha256": "0mxwch6692mb5d9l5hzbscrg61a3sxf2wjbn66q06b5a2r2wkqvn" } }, { @@ -56574,8 +57545,8 @@ "repo": "mihaiolteanu/lastfm.el", "unstable": { "version": [ - 20200320, - 1839 + 20200701, + 715 ], "deps": [ "anaphora", @@ -56584,8 +57555,8 @@ "request", "s" ], - "commit": "54636059512adec0176950e8fce3b9bf7423619d", - "sha256": "1ffvh71vgsdv118hhz0x2xfmqb2bayk7i3mdxc1ybs2vrdggnim4" + "commit": "cfa5e9b0b1f54884dc36ae5d8f35e3c6b841ef74", + "sha256": "1m1qf5f7kq7d720inkks6wwwn4hf40lrz4755gwnnn6d5zf0b1ix" }, "stable": { "version": [ @@ -56784,11 +57755,11 @@ "repo": "pekingduck/launchctl-el", "unstable": { "version": [ - 20150518, - 1309 + 20200531, + 1043 ], - "commit": "73f8f52a5aa9a0be9bdcf68c29ad0fa2b4a115a4", - "sha256": "154z7bhb7qagvl3dlgrlsxdg4chz2863ijglg47xs3yhjp5ypanj" + "commit": "96886b7e64d15ffd3319c8b4b04310ccdc648576", + "sha256": "0mw1c14ysh186lbgmmyp01hszdgjm605diqfq6a17a7dd7fn549a" } }, { @@ -56820,8 +57791,8 @@ "deps": [ "colorless-themes" ], - "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37", - "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn" + "commit": "736f7a105535901b4783d19534e7855920e25115", + "sha256": "1wi7wxiyk0g3k0l60hdmcyvvxr1kaapbkxvkknwd9qvdsji0ng73" }, "stable": { "version": [ @@ -56896,11 +57867,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20200511, - 821 + 20200817, + 1226 ], - "commit": "59c85a53385a3c55ce6b3b0e62a4fca1556389eb", - "sha256": "0scmdb99i20xk8rvlv2xjg54lqqvfp9gv8q9kpqa8jpcq21nbav0" + "commit": "7d2f13a103ff275f64086f4ad12308266d1fb48a", + "sha256": "1ggcbnpahxxjm4h21z9pl9164jwv7mhq4n6k5zagna863a9hlrbw" }, "stable": { "version": [ @@ -56920,16 +57891,16 @@ "repo": "conao3/leaf-convert.el", "unstable": { "version": [ - 20200415, - 1725 + 20200812, + 1306 ], "deps": [ "leaf", "leaf-keywords", "ppp" ], - "commit": "2a8ec045d5d36e85e7deb2a46aefacaecf4bfafe", - "sha256": "133id4zd9dnx962r71m0irxvqs9dwaqnv5l4b8bjd3gigijah1dp" + "commit": "d716e0bc3be91a79c791e7a4cb8335132a69d195", + "sha256": "0a2rqylqzvvfs62rrqkigga9jaxs89b2l8sdzkfb30vwp0y3d0sb" } }, { @@ -56940,14 +57911,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20200428, - 1803 + 20200812, + 1025 ], "deps": [ "leaf" ], - "commit": "bdf225b2b2cc76b87f5bf55dfa09c3a020ac1e7d", - "sha256": "0wdxxwh64l013vpkb7xpjqzyy4c0qy7h9l6l5cr4pncp7nx3bcns" + "commit": "c38d9d0d8cdb5a95df788af784e4eb989b674622", + "sha256": "19a1wrzikbzn2lswf5xwy8145a60mrj9ndj7cx29qrbr8fjcz431" }, "stable": { "version": [ @@ -56967,8 +57938,22 @@ "repo": "conao3/leaf-manager.el", "unstable": { "version": [ - 20200414, - 543 + 20200812, + 1004 + ], + "deps": [ + "leaf", + "leaf-convert", + "ppp" + ], + "commit": "baea372b3cfc7e1ad6d341d2f06e2932dcebf801", + "sha256": "031qgwc3pdxxqzkbdkaxd9lq4chngjba1s6q01wm98i5bdj4n4r0" + }, + "stable": { + "version": [ + 1, + 0, + 0 ], "deps": [ "leaf", @@ -57017,8 +58002,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20200319, - 838 + 20200620, + 919 ], "deps": [ "dash", @@ -57027,8 +58012,8 @@ "flycheck", "s" ], - "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c", - "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n" + "commit": "6b4377686128d5c2fb55d8fe61b92a9991d40fbd", + "sha256": "1zb3igic1i30mfbsx4k2sabhdpl58fsrl5c3fjvqrpn92ixi9vws" } }, { @@ -57082,8 +58067,8 @@ 20200224, 2229 ], - "commit": "e3424b3ae3f7d85ef020d030c2fa58df86ed8955", - "sha256": "0a8x2c0lxa0xihpbc9i1dvn1l00nsmawl1nv3i06r6iq5486pqdn" + "commit": "86505672be0aabc9fa1048bc453ab2fc855b27e1", + "sha256": "00j6j2n0z616r9p78wp8hk62d9s2dpzlmflfm7ilrx40dnd4nlgj" } }, { @@ -57094,14 +58079,14 @@ "repo": "DamienCassou/ledger-import", "unstable": { "version": [ - 20200302, - 943 + 20200522, + 853 ], "deps": [ "ledger-mode" ], - "commit": "955e915fef9d46c968ef9101f7770870e2d2d80f", - "sha256": "018f7k4j8q1ka36winv2higjp8vmm90vss7vwyck9hg4w708m85p" + "commit": "027a6caf173948feacd2f416a7995d82f82165e7", + "sha256": "08aqqhbrcgn72wjw4c9wq5pyxdswbhly2c2izmy316bjh3cqvbhf" }, "stable": { "version": [ @@ -57124,11 +58109,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20200509, - 1136 + 20200530, + 1710 ], - "commit": "5a517cee3dfedfd1b90c2f01d6d8e01198a198d1", - "sha256": "1gldvp2gp8vh97skrkxbcxh1qvjpndankjckm1q1h7jpkznjvc2v" + "commit": "805507fd6c14839be4efc7aee2017f9c03e36834", + "sha256": "1sil9kdkcb0r165qm8vpxll0ikfnm0cqjd3gmj8vi6k8n6awv9zv" }, "stable": { "version": [ @@ -57163,32 +58148,34 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20200101, - 1111 + 20200730, + 1433 ], "deps": [ "aio", "dash", "graphql", + "log4e", "spinner" ], - "commit": "28b78c45c86570cb1e3538f275eb4de1cf28cd04", - "sha256": "1c9zsh4ikflgqjrkjbilfqjjb0g698mqy2g5b210ssbivvkvncb5" + "commit": "153a3a6a9ffb64ffce37b3d203c13a85cc1884ab", + "sha256": "0600njpn3dvd8xrj21r5p69mc1r76ri1bjcxy2krp53dnsy3nvfb" }, "stable": { "version": [ 0, 1, - 10 + 18 ], "deps": [ "aio", "dash", "graphql", + "log4e", "spinner" ], - "commit": "28b78c45c86570cb1e3538f275eb4de1cf28cd04", - "sha256": "1c9zsh4ikflgqjrkjbilfqjjb0g698mqy2g5b210ssbivvkvncb5" + "commit": "ef59344158ae4b7842ca2531ec77c439ed6e6997", + "sha256": "0sxrzr34x43dcxw9l3ib982rz4327fpwnjmj3hi17bc5gk6zzfq2" } }, { @@ -57362,11 +58349,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20200513, - 1742 + 20200707, + 1143 ], - "commit": "afda2d80b0bc98d431a3ac7c1563c76b8ace3a65", - "sha256": "0fapzkjnm3w4fgc5464a9bz2sld3m81zzls7sy4h0yxq9rpb284d" + "commit": "a116202c82613c087440d2e8a6a504b08f1862ce", + "sha256": "1pqv4idkbqbxxvdfqxwf5rq2isl1jikba5nd0z8d7fr09wv48pv7" } }, { @@ -57410,8 +58397,8 @@ 20170121, 1254 ], - "commit": "a6c9922f31f59686bb48db1b8d5b75e74e79757a", - "sha256": "0wvk341hx0fsv4hihlr508grqzgzza0w3gfqh4c1f88mdpmm62if" + "commit": "9d15bc75a34052f7f2749bd38b3d0297ed60b29a", + "sha256": "07ysaihl24fiqz8n6hvdvaj53nyalk68dsn073zb8q88sdmzf33w" }, "stable": { "version": [ @@ -57490,11 +58477,11 @@ "repo": "merrickluo/liberime", "unstable": { "version": [ - 20200511, - 46 + 20200804, + 147 ], - "commit": "a631d3d575b5ffa2dc9a3a950c53f425c21380c1", - "sha256": "1gx3nxxcw5xz2n85xqgnghw04gaakhcnqcs9bnxx2fh4qpwkqggp" + "commit": "2a6f1bca1aff64a9136368c4afa15c0ea1042893", + "sha256": "1nvpy2mclcyi75clcnic7ap5rihccvgf7yn10an4y50sas8g2jiv" }, "stable": { "version": [ @@ -57568,11 +58555,11 @@ "repo": "buzztaiki/lice-el", "unstable": { "version": [ - 20191011, - 631 + 20200607, + 103 ], - "commit": "3ff90745cd43d1cc41216a01f55f871a00692ffe", - "sha256": "08aiwyd0cxwd37jdy1m78l1r35h7fiq7wygpys2yrms6mdl8063b" + "commit": "482e58ab83fff86ed754b00be27b62a219597e7c", + "sha256": "0yxkjyhfk8kpr8yqz54gdx6xwkj4s8bnbz60162jh12crj0bs5n7" }, "stable": { "version": [ @@ -57606,26 +58593,26 @@ "repo": "jcs-elpa/line-reminder", "unstable": { "version": [ - 20191016, - 1528 + 20200816, + 1151 ], "deps": [ - "cl-lib" + "indicators" ], - "commit": "f50f8474db7c9b26ab3cf56d08e5184209f25cec", - "sha256": "1frf77ilyadrzil8sjp3rpr6v7j1nmmk1dz84d0kf8yr2cl48d9h" + "commit": "4eafedb1f4f9b0fb9c6268ac6c72fea4b786233e", + "sha256": "1vygzd7gw9a4cwg554hdvpy4h6ywjk4gg6iffcgwxhvdwg2vmrvs" }, "stable": { "version": [ 0, - 2, + 4, 3 ], "deps": [ - "cl-lib" + "indicators" ], - "commit": "ea7fc43210b5293beac4ac453b1bdde415f5183e", - "sha256": "13vspm2c53ph25li4xd77q2v7rqwsszsy8a842ivcgn0k3qn6w0r" + "commit": "4eafedb1f4f9b0fb9c6268ac6c72fea4b786233e", + "sha256": "1vygzd7gw9a4cwg554hdvpy4h6ywjk4gg6iffcgwxhvdwg2vmrvs" } }, { @@ -57639,8 +58626,8 @@ 20180219, 1024 ], - "commit": "d083a9f0c74830bd77b794babb09fe0f0fdb3854", - "sha256": "1fgd2kfwh7gl4yxrmvv8yrv6wvvwy6y0nwibqqsy55698a1qb2fm" + "commit": "ffa07b82102945f18efb4430a6554835c450f6bf", + "sha256": "1zpqydk8s01f1qmk8aycn67pw48mll0rvrnrjd9q41p2aklhncms" }, "stable": { "version": [ @@ -57744,15 +58731,30 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20200405, - 1607 + 20200718, + 1737 ], "deps": [ "avy", "cl-lib" ], - "commit": "7440704cacb5c0fab35fff8ec59d30fbea17f44a", - "sha256": "0j609j69lxyfvr2g89gdkjrk1vy0c1qq6m0p0ay468bh7l6crs7v" + "commit": "be735e5b57dfad891a7394c116b584bf005fe3b4", + "sha256": "0vg0pmvyya3gncih6rj83zx6qjm5gh9qs4svxb8f3wd053ppnvk9" + } + }, + { + "ename": "linkode", + "commit": "8c03a8d88fa65f1ebc0b335b27be896232e8277d", + "sha256": "0wp55j17zms6zn90win35g203jzc4hjsj27500sq6iihci9gyfjk", + "fetcher": "github", + "repo": "erickgnavar/linkode.el", + "unstable": { + "version": [ + 20200607, + 2152 + ], + "commit": "675e612e30b74764c57de4117d950ea803b15f74", + "sha256": "1iqgii1zdv1q2gcknszxfgs09gvylr2l1yvyp104jriyy8qlsakg" } }, { @@ -57854,20 +58856,20 @@ "repo": "marcowahl/lisp-butt-mode", "unstable": { "version": [ - 20191128, - 835 + 20200727, + 1441 ], - "commit": "9eca319bdbb96dac4d44d19cd21937ed82a67268", - "sha256": "1biyvcwrqgyy7dmrv6i972lrcr5xhsyjq5nwc035c341jcxkp0g5" + "commit": "1b178fec96cb200574a17cb26ac0742d9df571a9", + "sha256": "01hj2kzy1mrzqc806jvgvkiyf7mkjacg944l3dblblyl7zgx8plx" }, "stable": { "version": [ - 1, + 2, 0, - 4 + 2 ], - "commit": "1ad373fd18d9db62b236d9d85603cd923f62f084", - "sha256": "0nhikhnqnxyxx6s14vafhfwd4ph2bwvxz0m7mn0arrf6hjqzw7ws" + "commit": "008d2093608ee8fac184a6682e4ccf7b461dcaa1", + "sha256": "1kxvwd9y9q5ax9509b3xy3qqjpamfxzljyvbm1fc89qy50pdjxyr" } }, { @@ -57937,8 +58939,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20200510, - 1533 + 20200818, + 1151 ], "deps": [ "ace-window", @@ -57947,8 +58949,8 @@ "iedit", "zoutline" ], - "commit": "3660a8a6acf9a7faee4af4bf5249ceb85a5d8bbb", - "sha256": "0s20wrdqf51mxfnnpll38nzp5ira59l83yz9dg0svz0vj5mrrwr5" + "commit": "0a9dcfdfbc20cadbb9cb29b224dc64b8efdd7b70", + "sha256": "13hzkh0rij40d58v6h232s784p40q1qv24n6bycd89lacn8xrcsr" }, "stable": { "version": [ @@ -57999,16 +59001,16 @@ "repo": "noctuid/lispyville", "unstable": { "version": [ - 20200129, - 243 + 20200808, + 2240 ], "deps": [ "cl-lib", "evil", "lispy" ], - "commit": "25a70126ea807653e0a8c512d4128c90ed673d7a", - "sha256": "0h4zz3k5chipswpp7abmd9agwacrss1dd5981x70wblpabdxm39m" + "commit": "0f13f26cd6aa71f9fd852186ad4a00c4294661cd", + "sha256": "0ah59s9c24addlx1rxgm11jihn7w45xrf0wrmrb7mbmqf3rj3izc" } }, { @@ -58230,6 +59232,24 @@ "sha256": "0nh14f3fv0b4i3rlx120s9a0s8gsaip0r15ki38446igl1macbq2" } }, + { + "ename": "literate-calc-mode", + "commit": "3b6b9d96bb894744f61d65ebd3a813b3c3493f42", + "sha256": "1ck61af2lg2rk0r8rlqjsh1am9xw71lk99i3sb71vi2ipd9dq9nb", + "fetcher": "github", + "repo": "sulami/literate-calc-mode.el", + "unstable": { + "version": [ + 20200703, + 723 + ], + "deps": [ + "s" + ], + "commit": "e855bd718fa7d0d70b8f43264e10664369dd3a37", + "sha256": "0mk4cig8g8ibz97mvyan79fkypyanh7r0h7h20ibafq09nb0mw01" + } + }, { "ename": "literate-coffee-mode", "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", @@ -58267,14 +59287,14 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20200327, - 620 + 20200708, + 803 ], "deps": [ "cl-lib" ], - "commit": "732d649136051a4b6d43c2fabeb5233c3e5f16d7", - "sha256": "1d4p6s9dj5368ywfpp46pysxvcqwsiacih3n1hia9c4y7p0xx4cz" + "commit": "722b7b3988336642167e0e0db12800a23410ab07", + "sha256": "19fckshqp1dxf7msjjk6cd506i0ydzqb1fqz879pfbbvhg6iclva" }, "stable": { "version": [ @@ -58343,11 +59363,11 @@ "repo": "lassik/emacs-live-preview", "unstable": { "version": [ - 20200419, - 2143 + 20200730, + 1517 ], - "commit": "7af1c74e0479c5b91d6368a4a3ff1342b83ef477", - "sha256": "0ifk0k6lfjzb0x0mgzh69jx0m166ljdg3ad69p51jw3m85c0wc6b" + "commit": "b099cd4d9d4b30d432ffd2ca76f8db1b4c13cd08", + "sha256": "1sgl9152f16wlafpd1d2sik044h3dplx0ins3b9kwkm0hxgncdfj" }, "stable": { "version": [ @@ -58367,20 +59387,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20200510, - 1939 + 20200709, + 422 ], - "commit": "38a3cf447fd7d9c4e6014b71134e178b0d8a01de", - "sha256": "0yah03sblz9i510cq6q2bj0mkz6sqdifpwhzxhs4kn8zdircr0f4" + "commit": "fdc85e5f2ddc72934be704ac90d5436d379c3381", + "sha256": "1g74m9v5818v8wg2zsm4zb74lzw28zfvlpv98b2dkqzikpxgz362" }, "stable": { "version": [ 4, - 1, + 2, 0 ], - "commit": "0a0d881d8ff30a6007b998e9bb9dddb999cca16e", - "sha256": "1mdnbbd0kr5y4vr2xbay80v4n07gg5jkkn0k3ywypsin7fz5ihhl" + "commit": "de3ce16dbb054b6d1b14f3274935bbdccadd9790", + "sha256": "1vl6v8lsid4p82clvp62079jnxhmibza3p5hb1frdlsycyc9d1bv" } }, { @@ -58466,11 +59486,11 @@ "url": "https://hg.serna.eu/emacs/lms", "unstable": { "version": [ - 20191102, - 3 + 20200616, + 1814 ], - "commit": "0967d3bada2ab70784a944d56c81691b8e87dbd8", - "sha256": "15ksvdf2cfa8hwvazdza56iln244xlv1l65gydhjw8388hr7gbr0" + "commit": "8090ba32866033c3ab580190cc79cac61463a180", + "sha256": "0l97i08k9qqr76xniac912id0hx5f56psf3v3l4mprs5k8myihj6" } }, { @@ -58514,11 +59534,11 @@ "repo": "rocky/emacs-load-relative", "unstable": { "version": [ - 20190601, - 1221 + 20200722, + 1109 ], - "commit": "dbcd7cbcca6503ef93f4b8d19bf7a9efd7f6bf9b", - "sha256": "010f2mhvlzkxarw298850khqc6srzb01l2vay0jsp46dh3jfmdhf" + "commit": "85b88d6fbf472381dfdaf0a762215b7e35ceee9b", + "sha256": "0jajdk2685d1jdw72hp4g0pq9xwbwbnls79nizkydamwhnj8sfcp" }, "stable": { "version": [ @@ -58553,11 +59573,11 @@ "repo": "rocky/emacs-loc-changes", "unstable": { "version": [ - 20160801, - 1708 + 20200722, + 1111 ], - "commit": "4d1dcdf7631c23b1259ad4f72bf9686cf95fb46c", - "sha256": "0a81933l3rrsbi9vkvfb1g94vkhl5n3fkffpy4icis97q7qh08mc" + "commit": "0a55bcba684f78417e831eef2cc32da24a207f29", + "sha256": "1fywhx8jk25mxrv0i446r519x4vjdsgvm1rzwdd0mcnjbwpv90b4" }, "stable": { "version": [ @@ -58748,11 +59768,19 @@ "repo": "Wilfred/logstash-conf.el", "unstable": { "version": [ - 20170524, - 1929 + 20200725, + 1843 ], - "commit": "4e127f9aec190786613445aa88efa307ff7c6748", - "sha256": "119yb1wk1n5ycfzgpffcwy7yx8ar8k1gza0gvbq3r61ha5a9qijs" + "commit": "131565042f8f12b9b88bd477959246dd034fa7d6", + "sha256": "1cyrmhnc38piw8q6d8j8xwyk0vl0a00mzjhmswkwd76w06adr9md" + }, + "stable": { + "version": [ + 0, + 4 + ], + "commit": "652dddecf19f3e39a36055823e44fcffc5b44aeb", + "sha256": "0xdqfkcpv1677xfp54j2rwc9wjl3mfs9542jjcs0ym2063r6fzla" } }, { @@ -58795,11 +59823,11 @@ "repo": "xuchunyang/lol-data-dragon.el", "unstable": { "version": [ - 20200321, - 2142 + 20200705, + 1822 ], - "commit": "6f53bb3971daad60bd0529d1e3889d5f9fedf235", - "sha256": "0xblv8l6krp3581m0xava95pm6wcsjm3rsl47dsvzpgns1kyz8lx" + "commit": "0deec9867bd7ba96220ee2968a9b2a94fd474431", + "sha256": "136x1yqdzjh6a2vhyd73yhgg6kmwl00c5c14ny5davlghwd5g7aw" } }, { @@ -58932,6 +59960,29 @@ "sha256": "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh" } }, + { + "ename": "lox-mode", + "commit": "8a4f385fd128097781b563ad91d4aa8301167f5e", + "sha256": "14mqn4r2jmz661gyvzm48s9qb98w75sjflmrgqg6sslaca98jrpi", + "fetcher": "github", + "repo": "timmyjose-projects/lox-mode", + "unstable": { + "version": [ + 20200619, + 1700 + ], + "commit": "b6935b3f5b131d2c1c7685cf6464274f7cd64943", + "sha256": "0yx6j44284zv1ldqk44xfgqbrkcraznr0xfpaxy7797bmn9bajnp" + }, + "stable": { + "version": [ + 1, + 3 + ], + "commit": "083a2299e188a516d1e46ef2dd1cbb89db1aec49", + "sha256": "0wwx1vs7gw8f3p63ql5mf311iydxlzar7wzbvig14k785rfzq69c" + } + }, { "ename": "lpy", "commit": "e0e7941d9efc303b8cd5d3e7b29606316307fd8b", @@ -58940,14 +59991,14 @@ "repo": "abo-abo/lpy", "unstable": { "version": [ - 20200504, - 1918 + 20200722, + 1159 ], "deps": [ "lispy" ], - "commit": "39d05463939398168dd8c8dca22d76af93aa87ae", - "sha256": "03wa94wn9a1lzdmi5fj5r446cvpqk7km9r9h8sq1hmwpr6qwymw7" + "commit": "c6744639ee313ee6dd4bc1e14b651d944b2ee1fd", + "sha256": "1vypwkx3020wx95cg34zi03pgarbjdhxpchbfvsj6bkd5v4bq6mc" } }, { @@ -58958,40 +60009,38 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20200515, - 2152 + 20200814, + 1405 ], "deps": [ "dap-mode", "dart-mode", "dash", "f", - "ht", "lsp-mode", "lsp-treemacs", "pkg-info" ], - "commit": "14d11f959dfab22a546525a0076fa3abd0d85c32", - "sha256": "0mxiy8myvk91b7r5ngidi2665vpqs87f8qraplyl0vcpywb2jm5n" + "commit": "437c548d411c9e166b7c658fd45294775235fd5f", + "sha256": "1pl7payda8i9cyca2j808inb8pmnyhh1sjc9f4qvxpbwd7b94vlr" }, "stable": { "version": [ 1, - 10, - 5 + 14, + 6 ], "deps": [ "dap-mode", "dart-mode", "dash", "f", - "ht", "lsp-mode", "lsp-treemacs", "pkg-info" ], - "commit": "14d11f959dfab22a546525a0076fa3abd0d85c32", - "sha256": "0mxiy8myvk91b7r5ngidi2665vpqs87f8qraplyl0vcpywb2jm5n" + "commit": "437c548d411c9e166b7c658fd45294775235fd5f", + "sha256": "1pl7payda8i9cyca2j808inb8pmnyhh1sjc9f4qvxpbwd7b94vlr" } }, { @@ -59009,8 +60058,8 @@ "dash", "lsp-mode" ], - "commit": "af56404c383102344f9b99e2e168e69b7d8d50d0", - "sha256": "16fsyr77bwa7gipsafsacqy1ad51kgm5im0js5yinkg2ipwi75xk" + "commit": "5053b697d1541afd436bc4a93f51b6afd8f2b79f", + "sha256": "0kxvzhrm8l99bmf3zjig7axkfm5mn0yl4l4yfxpvvfsb04iqj10k" } }, { @@ -59031,6 +60080,38 @@ "sha256": "0m5hxlx0cnx4rdcz5chxqp074z9h1wj1nvg8dzmilsnmg3kmsshx" } }, + { + "ename": "lsp-focus", + "commit": "a71079ecb60d84bded984d856f52590f64adbd9b", + "sha256": "0w0kywrs3pcs4kgdwhh4r9c1hdjblbdfcn66iz0xhrv1qxpv0zqv", + "fetcher": "github", + "repo": "emacs-lsp/lsp-focus", + "unstable": { + "version": [ + 20200809, + 1413 + ], + "deps": [ + "focus", + "lsp-mode" + ], + "commit": "c8270663c1fa8650cf0e248caa6a8e3d8f25d80d", + "sha256": "13d7s2pm7nqz06bj6qkibi50f69slqwz6dc0fik97glxnlqqqva5" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "focus", + "lsp-mode" + ], + "commit": "30a19e9d616b341e41469b141e86ff825070cb67", + "sha256": "1xzyz59bgsjpvb32x60wk2n6x6pj5pk65sfd677h898rvlxnn1lz" + } + }, { "ename": "lsp-haskell", "commit": "1a7b69312e688211089a23b75910c05efb507e35", @@ -59039,15 +60120,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20200510, - 941 + 20200527, + 2014 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "1a541e2459b918012cd655407920600ad35736ef", - "sha256": "0bmyjgydyr0mppx8c4kv4vrfivyz1lpxxg966danh7rv9c90ps3b" + "commit": "17d7d4c6615b5e6c7442828720730bfeda644af8", + "sha256": "1kkp63ppmi3p0p6qkfpkr8p5cx8qggmsj73dwphv90mdq0nrfsx8" } }, { @@ -59076,16 +60157,29 @@ "repo": "emacs-lsp/lsp-ivy", "unstable": { "version": [ - 20200418, - 1500 + 20200701, + 2043 ], "deps": [ "dash", "ivy", "lsp-mode" ], - "commit": "81e81ced99829358674c5a6bbe2c3e15cecd4ed8", - "sha256": "011126hz98qzb8zn1628z77j2s5w1hgvmb5saj2fr9wncgv1nax9" + "commit": "4cdb739fc2bc47f7d4dcad824f9240c70c4cb37d", + "sha256": "08dpn0vcfdwwysijwdpnnj91m69yw0q464i0wmp51zpj3dyd4kb1" + }, + "stable": { + "version": [ + 0, + 4 + ], + "deps": [ + "dash", + "ivy", + "lsp-mode" + ], + "commit": "4cdb739fc2bc47f7d4dcad824f9240c70c4cb37d", + "sha256": "08dpn0vcfdwwysijwdpnnj91m69yw0q464i0wmp51zpj3dyd4kb1" } }, { @@ -59096,10 +60190,11 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20200430, - 1659 + 20200804, + 1609 ], "deps": [ + "dap-mode", "dash", "dash-functional", "f", @@ -59109,13 +60204,13 @@ "request", "treemacs" ], - "commit": "bbbe4297fd470d0eb9492d011b0b4daf628763f5", - "sha256": "0qm9hwl88qwm19xwpsnv1rp9ny664440di0rd2lh3h7w1bczf76s" + "commit": "260016236fa0520b5b6ec7f51ca2086288524cba", + "sha256": "1h0hqgjpk5mbylma1fkva0vx45achf0k7ab2c5y8a2449niww90h" }, "stable": { "version": [ - 2, - 4 + 3, + 0 ], "deps": [ "dash", @@ -59127,8 +60222,8 @@ "request", "treemacs" ], - "commit": "004516ed2f0803e068f50e00d5bc3bad76af45e1", - "sha256": "1n7prbj3fppl5d2qvjfyfsw280grr3yywvazrhygjrr5920jxarh" + "commit": "811760ad89a29939c28f47d0925f58d9eeea9fa3", + "sha256": "1grcapmd9k0a128vhgpy2a5dh6iqmf8bdvz0hykl4v7d55vcm423" } }, { @@ -59150,6 +60245,36 @@ "sha256": "0r0ig73hsa0gyx8s6hr1mbdgf9m1n2zh2v7yhq3405l4if08s5m6" } }, + { + "ename": "lsp-jedi", + "commit": "65d0fa5e46e336e0e93db1bea062e79253861de4", + "sha256": "1hxw4nrjds9ir7f6j2zypazf208cc7v2621c11rdxkik8iykqikf", + "fetcher": "github", + "repo": "fredcamps/lsp-jedi", + "unstable": { + "version": [ + 20200812, + 1826 + ], + "deps": [ + "lsp-mode" + ], + "commit": "10c782261b20ad459f5d2785592c4f46f7088126", + "sha256": "0rip6fq5mwk2lsa0wwr573mx4myqvc8a7v4mqalmqxgwzcv9w7vb" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "lsp-mode" + ], + "commit": "10c782261b20ad459f5d2785592c4f46f7088126", + "sha256": "0rip6fq5mwk2lsa0wwr573mx4myqvc8a7v4mqalmqxgwzcv9w7vb" + } + }, { "ename": "lsp-julia", "commit": "ca6a06ed4de499bcccce05163ea3d54e4dca9539", @@ -59190,26 +60315,69 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20200425, - 920 + 20200718, + 928 ], "deps": [ "lsp-mode" ], - "commit": "5cd7b6bb35bc54f3e9341d6a64605a3bb50db0a0", - "sha256": "0lc3hidi1s993fz432090ab31r5pgb62ivw6y755332bgr359i4p" + "commit": "a9a26a21bf16b9444021563d844719ace0c5c3b6", + "sha256": "1waysrxhihg099czr2hydsvipdm8kf1zxw725r84lv5363cijw0b" }, "stable": { "version": [ 1, - 0, + 2, 0 ], "deps": [ "lsp-mode" ], - "commit": "d016440fe364a016935bd90ae07e22d9012bcf8f", - "sha256": "0a6nryx7vshh4k0amlw3w3fn4yr8zlqxq5py8vj3pz4zkcndhxks" + "commit": "a1376d3f4d4467aaf7fc5750c437e3edc91d2116", + "sha256": "044jivz2w6xs2kyjasndy00c0j9f63qf66s5wmkjjxbyamd7viwi" + } + }, + { + "ename": "lsp-metals", + "commit": "ee055cc258692a92f727633306adf7df31267479", + "sha256": "1nl9ay741y7qxvgdr6vywavr3aayh6z3a3bvmc4q5g5vsh3inwya", + "fetcher": "github", + "repo": "emacs-lsp/lsp-metals", + "unstable": { + "version": [ + 20200727, + 1925 + ], + "deps": [ + "dap-mode", + "dash", + "dash-functional", + "f", + "ht", + "lsp-mode", + "lsp-treemacs", + "treemacs" + ], + "commit": "039aa72439e3c52cfef4bcde416ba49d88ac0991", + "sha256": "12b2f1d07rqnbj27whdkk74c3fkqp7qrsqmwnyv0ysc870w29sb0" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "dap-mode", + "dash", + "dash-functional", + "f", + "ht", + "lsp-mode", + "treemacs" + ], + "commit": "efefcc0e936ec463f0d19b6cae7c8336dcd186e4", + "sha256": "01396r17ipmp0s5k5njm8m4vqw0g1sj9rq6dpkxv7wbad1c4izmx" } }, { @@ -59220,8 +60388,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20200515, - 2000 + 20200819, + 1349 ], "deps": [ "dash", @@ -59232,13 +60400,13 @@ "markdown-mode", "spinner" ], - "commit": "17614737b6ae881d0e94ad6f0b87a01950062dba", - "sha256": "0zh2mllm7n3gj0w5rn4y6491kx361mrf6w0fa46jgdck26fkazfw" + "commit": "4145a70ce1d4bfb2463606ba34c5965080b080d9", + "sha256": "01nji47mh79ip67vagi8yb5dd9kscnvg4070zklnfyp9v0rfl73r" }, "stable": { "version": [ - 6, - 3, + 7, + 0, 1 ], "deps": [ @@ -59250,8 +60418,8 @@ "markdown-mode", "spinner" ], - "commit": "bdbd2d0ccfe02f6721ea942e82e5178f4b216228", - "sha256": "125rpmhlyd6wmq7p71j54x3rzmk07vn1hdcvvdjjip5481raxcwx" + "commit": "4db1151dbf1fe84769433d841e90803448b0b354", + "sha256": "1z8zm7qr21hvhl6rnbznv2l9drh1pp5y4zkjrx5ac4x77b8i4aaz" } }, { @@ -59284,15 +60452,15 @@ "repo": "emacs-lsp/lsp-origami", "unstable": { "version": [ - 20190331, - 1723 + 20200809, + 1537 ], "deps": [ "lsp-mode", "origami" ], - "commit": "c7653602a2f2396b1a42d6053fd2be55fce8e0a2", - "sha256": "02qxqjiqfi82j0bqfr22a9ynxnbdw470whfky7405x90nis50k7l" + "commit": "110c40eafde81179ec7a78aab94b0b2059689374", + "sha256": "0z2z0idzpc8mql3mc0szb81j712ad54kpnxj28j6giid1a540bzd" } }, { @@ -59360,6 +60528,26 @@ "sha256": "0g9vijpq7n38b7rvgbshh4s46m1387d7k2lcvy4md17sak5ivxrg" } }, + { + "ename": "lsp-pyright", + "commit": "42a1aeef2b84b55e6e683066a3aed83331812476", + "sha256": "11dxq3419cq7lq2rnfka9kkkl4la627d0fki99djq6nrzddqf56p", + "fetcher": "github", + "repo": "emacs-lsp/lsp-pyright", + "unstable": { + "version": [ + 20200810, + 354 + ], + "deps": [ + "dash", + "ht", + "lsp-mode" + ], + "commit": "9603dda12afaae9c82608c7d3762f98b24b8563f", + "sha256": "1xh0q356q7sy68m9syfbclabamdnw5y772inspn5y8640ig4rg21" + } + }, { "ename": "lsp-python-ms", "commit": "dd67aefa5a6df2d1388a7516e529e388615c8fe0", @@ -59368,28 +60556,26 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20200501, - 1408 + 20200811, + 1204 ], "deps": [ - "cl-lib", "lsp-mode" ], - "commit": "97ad997c6c2e3bc8d12c02b2809960d47ad316b0", - "sha256": "11jad58shbrxd1r2r4amlvddx0qlx3ikbmq598sfwz2253ndzny1" + "commit": "a884a9a4eb1a3acd3d70c776aec5e968bbdc1731", + "sha256": "02fws6ph1ikpx86709dswlag180m6b34nchqcsfcvx4zp7qg2wj2" }, "stable": { "version": [ 0, - 6, + 7, 0 ], "deps": [ - "cl-lib", "lsp-mode" ], - "commit": "5d0c799099aa5810858174f390e28fff3894bc06", - "sha256": "002h0i93blsv092pnfmzsfx0pj98r9glki0ki9n7gxg1z3nb0ybp" + "commit": "7a502e6c09456cbe8b5f6c64883c79f5ce08e5a9", + "sha256": "0rkxhm9lmvsalyzq96452cgpn5cqljw7b9d9xcxkkl2cwz1745f3" } }, { @@ -59411,6 +60597,40 @@ "sha256": "05l563j1wz01rqwd4r639i88ln3bkn0m4swvj3hs11d70brlw981" } }, + { + "ename": "lsp-sonarlint", + "commit": "ee843ab9cc6188b4f1b8f31ab4a4e69688fb36df", + "sha256": "19a189aaws5i6klzjbplh4wxq7z38399wpmkgcji5cc7anzrkzqn", + "fetcher": "github", + "repo": "emacs-lsp/lsp-sonarlint", + "unstable": { + "version": [ + 20200702, + 2351 + ], + "deps": [ + "dash", + "ht", + "lsp-mode" + ], + "commit": "e0a27c07e886a147e2b8750471660af02e142086", + "sha256": "1kfgqdxynzpy98j1hc07zsygi0npw4xfm80jx3h30wyvxmgy7flp" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "dash", + "ht", + "lsp-mode" + ], + "commit": "5f519612c6a10b189292083b04dcd652b64bc7d1", + "sha256": "04xs8n0lxx54hyj1y002ps52cxwb7s79k38q3dqzzbfax1nxwfw3" + } + }, { "ename": "lsp-sourcekit", "commit": "a1e15078916dc053ca2413a6afae51df22321e9e", @@ -59437,8 +60657,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20200503, - 1640 + 20200815, + 1841 ], "deps": [ "dash", @@ -59448,8 +60668,24 @@ "lsp-mode", "treemacs" ], - "commit": "bd2c3727dd1e46e972477f11ba84999697ed842c", - "sha256": "03jlwbzkkpqn0a68m991b6zhbnpna1rvjsdjmqqvyng209lgcgph" + "commit": "3f8ca910c8e8724f93d8268a91771a51427684ff", + "sha256": "0xnbw3j7n10wp6jbzrgrr0xfzilrlhrmmzs4d00y56g1fmqn3jja" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "dash", + "dash-functional", + "f", + "ht", + "lsp-mode", + "treemacs" + ], + "commit": "08e256c45d2e95b510a98a8b88b0531e8785e519", + "sha256": "1z9cb7i546pbzvxii6lsj31jq8m70xrzscphl5z71vh93sydyhkb" } }, { @@ -59460,8 +60696,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20200503, - 1650 + 20200816, + 841 ], "deps": [ "dash", @@ -59469,13 +60705,14 @@ "lsp-mode", "markdown-mode" ], - "commit": "271b47cb33f11915295911f7cf8575f8a82a5e1c", - "sha256": "181j9anm3h5sfallls3sxik6cd7dw1fbi3q9mlfhk979wk6varjk" + "commit": "c39ae3713f95a2d86e11fd1f77e89a671d08d18a", + "sha256": "033ah4mz3pa6da3xdn6yk3lmkv6lanpj07b0icf30c6bp7rmk3il" }, "stable": { "version": [ - 6, - 2 + 7, + 0, + 1 ], "deps": [ "dash", @@ -59483,8 +60720,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "207bc8d61abff7c3024f8a484f63bc60bc4ad58b", - "sha256": "024753bi0p1jyjhw7wk8k6s16kbwab5ar4cfasvbn8g08acf293b" + "commit": "449f3a6b80a60d88c4ed300e69d64eb8e875f1c7", + "sha256": "09dmhhxmfjnzdc5kygwsjf8nwqlnq9rbgrca679s2wy93miqj7vc" } }, { @@ -59550,14 +60787,11 @@ "repo": "sjbach/lusty-emacs", "unstable": { "version": [ - 20200415, - 1456 + 20200602, + 228 ], - "deps": [ - "s" - ], - "commit": "1b7053b41083666c6805bcaeb55ece6dcc0d77cb", - "sha256": "1y3nzp6rpg7anv5xscbp4lzmfdvzffcxha9vx3mrclhjg6giz510" + "commit": "a746514ccd8df71fc920ba8ad0aa8dca58702631", + "sha256": "0sjs3gn7mrmm60v0yi77fha9b6wdqfnydqz9f4dg2fvwj4a9w2rr" }, "stable": { "version": [ @@ -59580,8 +60814,8 @@ 20200507, 1518 ], - "commit": "87873d788891029d9e44fa5458321d6a05849b94", - "sha256": "1b6davg1jqcxqzf9aqv8av8c78fgdri97m9q44xzvr1xfbmvkl8g" + "commit": "112e689f75b59398d8eca79ac6562dca12b8a959", + "sha256": "0famsjgsgd61fm3l5m9mqg4szf8lcgcb57paxlg8rxnsmxmwga7d" }, "stable": { "version": [ @@ -59874,14 +61108,14 @@ "repo": "zk-phi/magic-latex-buffer", "unstable": { "version": [ - 20191106, - 241 + 20200816, + 648 ], "deps": [ "cl-lib" ], - "commit": "8597f4db70732d6e479396e2f2a7e78742387253", - "sha256": "16zv10rir99wl16d79479204h5fbdx78wpgahlg6kf74001fr3sv" + "commit": "8a6e33f79a930d2c1977409f1980afc4cc99b909", + "sha256": "1f052yx0fib6vv2kqr21fv1nlsxc1b0mlcxasppxr6kig1jbj2x9" } }, { @@ -59916,8 +61150,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200514, - 1330 + 20200816, + 955 ], "deps": [ "async", @@ -59926,8 +61160,8 @@ "transient", "with-editor" ], - "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", - "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" + "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe", + "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n" }, "stable": { "version": [ @@ -59955,15 +61189,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20200428, - 9 + 20200516, + 2028 ], "deps": [ "cl-lib", "magit" ], - "commit": "ef5dce6267e9118a5eca82a22bcad0b67826c23a", - "sha256": "0vzkydgl889cq173zjl89g2vrddb9abc4a8gljiz3b4a7n5b1nrd" + "commit": "c5ecb4b53ea2461e737ea00242ef1e69e35da398", + "sha256": "0f1psh03hsb57h3r66zfa0jmwkky12121lhvpynlgj330ryxl5bj" }, "stable": { "version": [ @@ -59999,6 +61233,25 @@ "sha256": "10iinizl99aivrf9zihykabb5lyg62kxbmydwaf7swzxf4dgxn2k" } }, + { + "ename": "magit-delta", + "commit": "6e045d09ceec253bbd033b561ab077d897e9b6b2", + "sha256": "0r7g8p7g348cfz31q0mgxxa591n8clwpaack487ycc1nzsqbj726", + "fetcher": "github", + "repo": "dandavison/magit-delta", + "unstable": { + "version": [ + 20200518, + 2205 + ], + "deps": [ + "magit", + "xterm-color" + ], + "commit": "d988abd99882c6b89f21f2746f721a4d7ece6ad4", + "sha256": "1dj2kw2wzxnms4z54pk7qngylvy903jwd84x3k5ys3wsydmk4bbf" + } + }, { "ename": "magit-diff-flycheck", "commit": "a5d28982425519157a6116c077fbc4be7cfa53be", @@ -60185,14 +61438,14 @@ "repo": "magit/magit-imerge", "unstable": { "version": [ - 20191105, - 2245 + 20200516, + 2029 ], "deps": [ "magit" ], - "commit": "3b588991d30a69d2209dbcbb041777ae8af62bd0", - "sha256": "19fyrann61k8viak05y0f5v9xr2p531ysrcq05d8pq8qf3vna1y1" + "commit": "f4b88f0c127faa154f138907bf4e98b1baf12fb6", + "sha256": "10l0z0c0q6sbf3id5dajws30cxzjvi5rgx1hl8jf6nxr5zcmcmm1" }, "stable": { "version": [ @@ -60254,8 +61507,8 @@ "libgit", "magit" ], - "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", - "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" + "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe", + "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n" } }, { @@ -60335,26 +61588,26 @@ "repo": "magit/magit-popup", "unstable": { "version": [ - 20200306, - 223 + 20200719, + 1015 ], "deps": [ "dash" ], - "commit": "b8e886c4f2242d6c58f84d4549af712e86360db1", - "sha256": "14l989m5pxzxk6164z8lgvshy45aq0ab78mjz5f6zw58h5rvnbdg" + "commit": "d8585fa39f88956963d877b921322530257ba9f5", + "sha256": "0znp6gx6vpcsybg774ab06mdgxb7sfk3gki1yp2qhkanav13i6q1" }, "stable": { "version": [ 2, 13, - 2 + 3 ], "deps": [ "dash" ], - "commit": "df9abf1a1bce3fadb5e0657eb8f4c7026efa3c69", - "sha256": "1ifhph1mj7wjar62d65fjx45qsjwsyslbj7liih3v0r4by5gyxmw" + "commit": "d8585fa39f88956963d877b921322530257ba9f5", + "sha256": "0znp6gx6vpcsybg774ab06mdgxb7sfk3gki1yp2qhkanav13i6q1" } }, { @@ -60383,16 +61636,16 @@ "repo": "jtamagnan/magit-reviewboard", "unstable": { "version": [ - 20190211, - 2244 + 20200727, + 1748 ], "deps": [ "magit", "request", "s" ], - "commit": "f3d5ed914243e3930f9c06f59021305e7e43e67d", - "sha256": "0xlhy328h2wxklpy71dhy1fk7zv6hs2v4jrl1mm9x5mnrbrdfvxx" + "commit": "aceedff88921f1dfef8a6b2fb18fe316fb7223a8", + "sha256": "0agk53san02n49jna6g2ndw4wbqkpr0kfd4ravbs9b4w6l3r30xb" } }, { @@ -60403,14 +61656,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200513, - 1503 + 20200816, + 955 ], "deps": [ "dash" ], - "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", - "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" + "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe", + "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n" }, "stable": { "version": [ @@ -60484,14 +61737,14 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20190918, - 6 + 20200519, + 418 ], "deps": [ "magit" ], - "commit": "0162390581c1165a0c4c68081d8fc5ffae4cf1a9", - "sha256": "0blwbgr4by0rawzw2hdpc5jcckmj96p0dxvgcml61rg3andsqyyl" + "commit": "e52e8ab4906996c410f6c6db890b9bfe0951d4ce", + "sha256": "0mp466bnm63pas8z0p6b0684i3rakb6cs5xzkz8jv3z3x34ak12c" }, "stable": { "version": [ @@ -60994,26 +62247,26 @@ "repo": "jcs-elpa/manage-minor-mode-table", "unstable": { "version": [ - 20200302, - 1517 + 20200717, + 809 ], "deps": [ "manage-minor-mode" ], - "commit": "cd126cbeb2e99c8d00b48310938a85448ebc2e1a", - "sha256": "1lk2rmv0qhzfyg57h461qdxgqciwqjggipl9i146m9bpjp7bjjvx" + "commit": "d377094c4ff5e93321e12f53892113083148bdaf", + "sha256": "0dpljs8qmpvpb0y2cvcr71ashzrm2ypb8p6anay4sjmiphkb60p5" }, "stable": { "version": [ 0, 1, - 1 + 3 ], "deps": [ "manage-minor-mode" ], - "commit": "0636f376d9bc169bd1bd20c5847eb9f029b9467c", - "sha256": "1n4a9msfzspk0dfkr1i515ibrwg5yk3hyap2kym05yqpn4wq5xwp" + "commit": "d377094c4ff5e93321e12f53892113083148bdaf", + "sha256": "0dpljs8qmpvpb0y2cvcr71ashzrm2ypb8p6anay4sjmiphkb60p5" } }, { @@ -61277,22 +62530,19 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20200514, - 16 + 20200815, + 203 ], - "commit": "705c77b9533970a425b09fb4c2fabf3b406117c7", - "sha256": "0i40pp0157azw2jkkr08f4cbal9ansp9dbscdbdzmlp9lf27kqjs" + "commit": "ef2cb4d94af68908a4963afa492afba876725128", + "sha256": "0pi971jgil2wpfnrg7j7i9hh3a418nxf82jkammzry2ijv2q5kj5" }, "stable": { "version": [ 2, - 3 + 4 ], - "deps": [ - "cl-lib" - ], - "commit": "cde5c5d2bcce470c494b76e23cfe1364b6291c20", - "sha256": "1zm1j4w0f3h01bmmpsv4j4mh6i13nnl8fcqlj2hsa1ncy1lgi8q7" + "commit": "7b854c8e70b6d6edee12aec4194f4eb239586804", + "sha256": "0g0ja4h651yfabm3k6gbw4y8w7wibc9283fyfzb33kjj38ivl5d7" } }, { @@ -61383,30 +62633,30 @@ "repo": "ardumont/markdown-toc", "unstable": { "version": [ - 20200502, - 742 + 20200517, + 1233 ], "deps": [ "dash", "markdown-mode", "s" ], - "commit": "a9f13eecd0c7d8be960055dbc2d6f5d3fe6f40ca", - "sha256": "01xls8jd6l8c8xiyx8l15j5ca96gsln1m32prnhw4sfmrlw996h6" + "commit": "9565eeaa1d26bc0ab83eb65bd30470888f724044", + "sha256": "1l49hi4nwralx5kg4aqjj2b592y71ba4i91vmlzk5rrcjmdnc6b0" }, "stable": { "version": [ 0, 1, - 4 + 5 ], "deps": [ "dash", "markdown-mode", "s" ], - "commit": "e6de0f5c4c6dfdb8da37b34a16fe7e8edc88765c", - "sha256": "1xqrrf4gwcr64xgbyvgplmcrcl7knfsm0v8yzrhscq65pb7zf3zj" + "commit": "9565eeaa1d26bc0ab83eb65bd30470888f724044", + "sha256": "1l49hi4nwralx5kg4aqjj2b592y71ba4i91vmlzk5rrcjmdnc6b0" } }, { @@ -61426,10 +62676,10 @@ }, { "ename": "markless", - "commit": "5542e142d47f6f52839a44b8ee16327f88869f50", - "sha256": "1a5kp46xj4b5kgcypacxcwhjjwi4m7f6shdda8l8my3s3x8ji5bj", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1nd7np60h0k1p9pwp3dn8068584h7r7lhfl9j7yn2jrf2r51806h", "fetcher": "github", - "repo": "shirakumo/markless.el", + "repo": "Shirakumo/markless.el", "unstable": { "version": [ 20190306, @@ -61521,20 +62771,20 @@ "repo": "jcs-elpa/marquee-header", "unstable": { "version": [ - 20191017, - 1017 + 20200720, + 1034 ], - "commit": "cb694a9eee79ea807dbc1587c47e209dd7e250fc", - "sha256": "0h191mip2yjvj1ha6cqvghd45g5ccd3p0qsvh9l2g0gg9d2salxk" + "commit": "d8e83b837bacdd45d274be42fe2d172fd1cbbba2", + "sha256": "1iy8vg2wlrzb01nc6sx21ijg62ak94k2x2w6gy56krp7frakacrv" }, "stable": { "version": [ 0, 0, - 8 + 9 ], - "commit": "77e4becd8a812377eb219c77641a22a77b4fdfef", - "sha256": "0a51aw567gkdxz58v7h2vdfs2rmnvyllqhq4a1yy4gslr0xsqk9c" + "commit": "d8e83b837bacdd45d274be42fe2d172fd1cbbba2", + "sha256": "1iy8vg2wlrzb01nc6sx21ijg62ak94k2x2w6gy56krp7frakacrv" } }, { @@ -61633,19 +62883,19 @@ "repo": "cpaulik/emacs-material-theme", "unstable": { "version": [ - 20171123, - 1840 + 20200620, + 943 ], - "commit": "b66838d220ad380a16da1d8878936974b26f815d", - "sha256": "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2" + "commit": "2710e61ecee1bbec943538305c26af4fe4fca68a", + "sha256": "1qg59w216iv1yk594xjgazfqx5qhw3jgjqf32pcwwbkcnyj5f6zw" }, "stable": { "version": [ 1, - 2 + 3 ], - "commit": "b66838d220ad380a16da1d8878936974b26f815d", - "sha256": "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2" + "commit": "2710e61ecee1bbec943538305c26af4fe4fca68a", + "sha256": "1qg59w216iv1yk594xjgazfqx5qhw3jgjqf32pcwwbkcnyj5f6zw" } }, { @@ -61712,11 +62962,11 @@ "repo": "rudi/maude-mode", "unstable": { "version": [ - 20160222, - 1607 + 20200725, + 2035 ], - "commit": "c9543bb8a172fa77af592388e7f520a4a6d38987", - "sha256": "1sn9bdaq3mf2vss5gzmxhnp9fz43cakxh36qjdgqrvx302nlnv52" + "commit": "008f372631a1efe15be033792cfb1686b1736aeb", + "sha256": "07a51iwlzj88b6jaxzz8p8r7l9kcbflw8l11h67sx5y0gv23a6vv" } }, { @@ -61760,8 +63010,8 @@ 20170120, 1705 ], - "commit": "daeb5c35bb677a23df69336b4843ea59517e57ed", - "sha256": "1qpzha7j7g5fw1lazw5l6mspgrnsnqybqgpq48icbx2vvil9y3q7" + "commit": "f7048ce95443f2c06cb6b140814451e3a037103a", + "sha256": "0kjhfc2jlhq9qdwigx1iq8wpvzfr7jlv8jfqa2j2va8h0jp2jnp6" }, "stable": { "version": [ @@ -61972,20 +63222,20 @@ "repo": "hexmode/mediawiki-el", "unstable": { "version": [ - 20170813, - 555 + 20200718, + 1529 ], - "commit": "8473e12d1839f5287a4227586bf117dad820f867", - "sha256": "03rpj3yrk3i1l9yjnamnx38idn6y4zi9zg53bc83sx3g2b4m5v04" + "commit": "932497604fd417964e4f04614e28d96f4eee028e", + "sha256": "1446vihy9cpg0hbvqjrp82ya1k889gpvgbsmw9bk7kyd983jhfar" }, "stable": { "version": [ 2, - 2, - 9 + 3, + 1 ], - "commit": "8473e12d1839f5287a4227586bf117dad820f867", - "sha256": "03rpj3yrk3i1l9yjnamnx38idn6y4zi9zg53bc83sx3g2b4m5v04" + "commit": "5178a1a1dbe37a144d9c82622eb683bd3c61bef1", + "sha256": "1d05jw2sa19rgzskvavh21bfmbh07yza1drfbgypsvay3nkjfd2z" } }, { @@ -61996,30 +63246,30 @@ "repo": "mopemope/meghanada-emacs", "unstable": { "version": [ - 20200506, - 743 + 20200628, + 247 ], "deps": [ "company", "flycheck", "yasnippet" ], - "commit": "e119c7b3271281d60892b80a0cc6488503baf38f", - "sha256": "11nvhvxm39pcxjknzik6n07l309x9r5maf24pnlgk2wxkr28xmzs" + "commit": "1e41f7f2c7a172e9699f3557c97c3f39a149bfc2", + "sha256": "1cplw3x94xc2yqvvimkjgppbb36mnj8n3gcx0k2gy7zwzdvzg4c6" }, "stable": { "version": [ 1, 3, - 0 + 1 ], "deps": [ "company", "flycheck", "yasnippet" ], - "commit": "83ee6c6520a8cf063742e1b16fef3efebbcf8b73", - "sha256": "1hk4953dk93pa7srlgnjh9pskpl67f90gm9g0iv9zffwsxw4kwaw" + "commit": "1e41f7f2c7a172e9699f3557c97c3f39a149bfc2", + "sha256": "1cplw3x94xc2yqvvimkjgppbb36mnj8n3gcx0k2gy7zwzdvzg4c6" } }, { @@ -62186,15 +63436,15 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20200510, - 154 + 20200727, + 851 ], "deps": [ "cl-lib", "dash" ], - "commit": "56e7ba100eb0ae92a37bcd0fcce77affa26d2fb8", - "sha256": "1jz0jpdr4imzs7rr21q19j59y04kw518qpisrrsmyw6fywi8k22g" + "commit": "c9296491e923a678ac9a42a2743f21ce1e0552c4", + "sha256": "00636in9cgcnij1sz6vj5y5vijdd13g5akwj1facf0v4lrlvacpn" } }, { @@ -62208,17 +63458,17 @@ 20191025, 851 ], - "commit": "db957668fa2be7b9d076f0c066178a65c48dd085", - "sha256": "0abg2c0lcdiwmf1jlybrjw0n17hwqfmj29r7gbvrsm16snf27rag" + "commit": "3751cbfff75022c396c4ff4dc1729048f80daa4f", + "sha256": "0vbzbjajm0ww864cl7aaj70s3fkgg79cq8srdf5dmw1vwdrqq6ld" }, "stable": { "version": [ 3, 3, - 4 + 6 ], - "commit": "21f4ba18acd9ca3dc5c8263acfc46042a6aa557e", - "sha256": "1sp1g70wy8qp34641hlpk5xaf7vv359xgwc7z8cw7yvj39mn98va" + "commit": "464df1a60775fd2bb70f4efff4f8603eaf834b74", + "sha256": "0yw3a8mhjsjh9359cvk7kr5ch6dhwvhv9zilk12fgyii9iw08mlz" } }, { @@ -62258,14 +63508,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20200420, - 2258 + 20200804, + 2107 ], "deps": [ "f" ], - "commit": "b8673381ff8bbfbdf3f165ae928e7c775a3117e9", - "sha256": "14w2mwqiksmng8pzm4l0c458q0i2m3p4wcfvvmagyqk6mfl05m4l" + "commit": "795bcf830d9345474fad864602180408891b292d", + "sha256": "0qdpbayxar0vkan0m83k4jir8saqy47nq2240608l8h9bjv48hz2" } }, { @@ -62276,11 +63526,11 @@ "repo": "wentasah/meson-mode", "unstable": { "version": [ - 20200216, - 2254 + 20200806, + 1325 ], - "commit": "bc6c09136c7f7de6f4b6ce9294e9b998e24b93c7", - "sha256": "113vj7z8zk80653ldq4sfxkk3pja8yjscywb0cwpkaq0088n5jf7" + "commit": "b471b9282724d6f324dbd6fa25d083635fc4293a", + "sha256": "0y5a1sfk4h4szv4v6693i3ylrf3xiwf8khrahdaz0bx210h2qmpg" }, "stable": { "version": [ @@ -62302,8 +63552,8 @@ 20200428, 124 ], - "commit": "a8b761d665c17694a04eccf1c2bc135d35bdf482", - "sha256": "0rg34w1nsvmwxn9z3aipj32fk26fykzqxkr0x7am7icigg02dsbn" + "commit": "ce506b27b15cc39a47c58ff795026eaea8632e2f", + "sha256": "0wpj3ich8wisq0jy304fngj0nkkvdqzfkfcx0s8ib6l04v29ypa5" } }, { @@ -62401,17 +63651,17 @@ 20191018, 242 ], - "commit": "60eae1c8a7f82fbcc2660d785b33601daaa29f4b", - "sha256": "06ia4ba6c1yph259wr4y5sdkl1ry6pzbwhx807ia675rp0clp9hz" + "commit": "a56346bf1517118b2a960eaadbf138ae1695ddd1", + "sha256": "09iycpdj6dkvz5axfx85bkrrf5128ws7clg1jn9yli06rjsw36ba" }, "stable": { "version": [ 1, 1, - 8 + 10 ], - "commit": "0177fc4e7edd705db59b82c83a24db51dc405890", - "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1" + "commit": "19aa8a17428d6ee42f54e464c26eeab17a6478ab", + "sha256": "198ahgxji0kh6ynygrrdvllj9fwcqrnma4sd8msj2aq18xij9glr" } }, { @@ -62422,20 +63672,20 @@ "repo": "ianxm/emacs-tracker", "unstable": { "version": [ - 20200503, - 1425 + 20200602, + 1032 ], "deps": [ "seq" ], - "commit": "6d68118eee409a2b671537129eae1154421ba82c", - "sha256": "1i7fzla9i3s4439ckkny09fq3r2q0q2153qzyhxsfbcxb47vbx26" + "commit": "6283e1fc5ddb65323513eb77638181551bda967b", + "sha256": "12sw627rhvqldbg8cvgg4fim91h3r9qlki5ni1fi0y5sa9iqh20j" } }, { "ename": "metronome", - "commit": "2f77239fecb41487a6aa03e6fc219cba96dee18d", - "sha256": "1kkm7s6hiyk3h1bnf9pfnsikmfpp998041wg0bwqnpzhzzlq6fy4", + "commit": "123d2788dc05d53862ebbf31476cfd3a43f2f348", + "sha256": "0arsx39lrbwp3a4krjn8pggqrqm250c8sk3c6z37q8d2g3sazp11", "fetcher": "gitlab", "repo": "jagrg/metronome", "unstable": { @@ -62478,11 +63728,11 @@ "repo": "sggutier/mexican-holidays", "unstable": { "version": [ - 20190506, - 245 + 20200622, + 132 ], - "commit": "663633be1d693f6081d7d000e05d15ddbf71aa10", - "sha256": "09b0292d87xm5mrhfhv7j11ljl4j9hv8h5dibzrrlh1b3vsg2xkj" + "commit": "5b5dd6e71505e8938bac9e9733b30bd394631923", + "sha256": "04d4148nq3lmrpkxvzzkn88j30iv2l2466ps035x7v8hc83wxnjw" } }, { @@ -62745,14 +63995,14 @@ "repo": "kiennq/emacs-mini-modeline", "unstable": { "version": [ - 20200424, - 647 + 20200801, + 1554 ], "deps": [ "dash" ], - "commit": "4f1dce78916cccd2e7066345ae2be3394a675c46", - "sha256": "0qbd6jdaqfs43i9cgs4n4d8vkv3nbcxcmwkd9xrj1d03rdmyzxh0" + "commit": "754a28efdf043e193922a897fc724ad9b9f2e8de", + "sha256": "1jx1baw6zskpnfdi02as59736jx4iy0q1n4x5n5ypvr7csrs1nz3" }, "stable": { "version": [ @@ -62887,8 +64137,8 @@ 20190113, 2132 ], - "commit": "063b4d8ca33d55d04c341f0b2b777ec241a3e201", - "sha256": "0lvg7iym6sxhgl4ab9a6x8c2mh2d32vkf0033bs3vphx657gra6l" + "commit": "221b43aad320d226863892dfe4d85465e8eb81ce", + "sha256": "1zsabgn5mi63ry8jg1li866jcix9mf588ypdfajk8747a6127qd0" } }, { @@ -62899,26 +64149,26 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20200204, - 1950 + 20200522, + 1052 ], "deps": [ "dash" ], - "commit": "bc1edab09d3fc1b248c17775ae2eb7d35b96be40", - "sha256": "09z5wynw3xaxx2jr55ymlnhczryp5c5zgb1g9nr99k2rksq2j980" + "commit": "36d39bd25ae58d1359d17f99142520339bea5974", + "sha256": "1rvsfg9aabvyzzxd38kvjwkm9675zcmrfhzj5x6wj0ba3n0k34q5" }, "stable": { "version": [ 0, 3, - 3 + 4 ], "deps": [ "dash" ], - "commit": "c331c1516111b9d2136e632a218c1d7707215356", - "sha256": "095yx8zg61nka6f7biyj1binbp8g872vq275ycwgmd2ix462zyf4" + "commit": "36d39bd25ae58d1359d17f99142520339bea5974", + "sha256": "1rvsfg9aabvyzzxd38kvjwkm9675zcmrfhzj5x6wj0ba3n0k34q5" } }, { @@ -62992,8 +64242,8 @@ 20200306, 1220 ], - "commit": "d1e04ca03aadb942dc4bee82f44848c3ce52b25c", - "sha256": "1yrjmyh8a0xqijyg16v20iqh13s7j4pf410f0214a4m9lp07pxpx" + "commit": "e4dcdec3a4472a507d6b249ae2194dacaa885ecb", + "sha256": "03m4rnfdfsbs44cfqjy8j2z6nbxs2yzhzgizlpsvg64441hdkfa0" } }, { @@ -63137,21 +64387,33 @@ } }, { - "ename": "mmm-mako", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn", - "fetcher": "bitbucket", - "repo": "pjenvey/mmm-mako", + "ename": "mmm-mode", + "commit": "ddf7604d914273aef49e75ae1d45c2a9a4bbbedc", + "sha256": "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw", + "fetcher": "github", + "repo": "purcell/mmm-mode", "unstable": { "version": [ - 20121020, - 651 + 20200714, + 1714 ], "deps": [ - "mmm-mode" + "cl-lib" ], - "commit": "5c9ff92137b547569264eeca1ab2a86e4ba12f55", - "sha256": "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr" + "commit": "9ffe364f3a31c7a771fe3401b8924642609953e8", + "sha256": "1yr7nd6kmvy3mc5k6vvwaikzy9cvly4617l4s9zrfrbnldpsyjk7" + }, + "stable": { + "version": [ + 0, + 5, + 7 + ], + "deps": [ + "cl-lib" + ], + "commit": "ff0b214f27d5dddeb856acb4216e77a864dcc0b2", + "sha256": "0lxd55yhz0ag7v1ydff55bg4h8snq5lbk8cjwxqpyq6gh4v7md1h" } }, { @@ -63168,8 +64430,8 @@ "deps": [ "cl-lib" ], - "commit": "6d3eedf4fae3c88dee33691aa2856514122adc8c", - "sha256": "0fykf7svgsbcjfcsbp1r571mgjhxwkdvmmhhl2clyi5z3mwg0s1g" + "commit": "d7729563e656a3e8adef6bce60348861ba183c09", + "sha256": "05f218f0lncgx2bbipjz7db09rrka8fq0qf5qkvbgssagxyl7rav" }, "stable": { "version": [ @@ -63240,15 +64502,15 @@ "repo": "scottaj/mocha.el", "unstable": { "version": [ - 20180321, - 2322 + 20200729, + 1130 ], "deps": [ "f", "js2-mode" ], - "commit": "cfd5b1a8a32162575f1c30b82e17b74efb67cf1c", - "sha256": "015pinqd2bxac372dvmcxnc7z9qayq4xpa254sp31bdzn4r5xns4" + "commit": "6a72fa20e7be6e55c09b1bc9887ee09c5df28e45", + "sha256": "0xp0xps5xvamp7jdxq6hkmyp63ww9ca7imf0nz35xivwwkk17ri6" }, "stable": { "version": [ @@ -63335,8 +64597,8 @@ 20190713, 1335 ], - "commit": "8f71e0a85c2f6039111663e65d9a13f3310f12ed", - "sha256": "0vz58nk044jm97wh77v02h24571nwg57j1vx2v4rx9wmwrnifwid" + "commit": "4b2b92b14ed0b64fb0a0fa80a374ec9f87fbfeb6", + "sha256": "18dbnicaqryq4xhv4d7hds61k85kj3bnpcqv7rippvlyrqm2r6wx" }, "stable": { "version": [ @@ -63433,11 +64695,11 @@ "repo": "ludwigpacifici/modern-cpp-font-lock", "unstable": { "version": [ - 20190331, - 1528 + 20200530, + 1010 ], - "commit": "02f104701bc34c146d22e3143ae59ef362999098", - "sha256": "14vxxvvm12jnq4llb759h8y4w3cv71d3xic1mbp0jmyd0j4dkqzp" + "commit": "865955d0035382a17a7f03add0d00d0bd812b103", + "sha256": "1x04jgc94gpdci24rahb1awvkjii1vdv7bdr9gyiksbry75dsxi1" }, "stable": { "version": [ @@ -63451,10 +64713,10 @@ }, { "ename": "modern-fringes", - "commit": "c765214f003426ac7a0e98c5764b14dd61ccce52", - "sha256": "0acp18v97k2iahbd5kp240g46wqdmrk4ddrsgvckzm0chsmjmm8q", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0rkcpjhcw4nfsmsr83zng941cf1mpdparbmqn5ps3qwifiw19m5f", "fetcher": "github", - "repo": "specialbomb/emacs-modern-fringes", + "repo": "SpecialBomb/emacs-modern-fringes", "unstable": { "version": [ 20200321, @@ -63495,20 +64757,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200513, - 601 + 20200819, + 628 ], - "commit": "4b3f6a383642fb81a3407dde5d887e2d937ec471", - "sha256": "0adbyyfpwzcc1y2vlbdf5kxwxsspm1cnxpd21rjnvcc06pvxzq4s" + "commit": "26a211835b6e62e4ad29b2feee75472e02046fa8", + "sha256": "12rqgyrnk6x2a7b635wg4c5ihyh9s8ig7s1431xqj91pdx7756kx" }, "stable": { "version": [ 0, - 8, - 1 + 11, + 0 ], - "commit": "89a31f6242dac52071ee6be18feadcb604b548d7", - "sha256": "0kax2pl2x37yvn9zg3vnr9vp39sfgm7650lz2svp535srhki80il" + "commit": "c376b08059028737390f41fb82f64d748c42970c", + "sha256": "08alhr6d7shmm1fcvca0a0ipi9mvnaqp5klvqdb1d171h457fcv3" } }, { @@ -63519,20 +64781,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200513, - 601 + 20200819, + 628 ], - "commit": "4b3f6a383642fb81a3407dde5d887e2d937ec471", - "sha256": "0adbyyfpwzcc1y2vlbdf5kxwxsspm1cnxpd21rjnvcc06pvxzq4s" + "commit": "26a211835b6e62e4ad29b2feee75472e02046fa8", + "sha256": "12rqgyrnk6x2a7b635wg4c5ihyh9s8ig7s1431xqj91pdx7756kx" }, "stable": { "version": [ 0, - 8, - 1 + 11, + 0 ], - "commit": "89a31f6242dac52071ee6be18feadcb604b548d7", - "sha256": "0kax2pl2x37yvn9zg3vnr9vp39sfgm7650lz2svp535srhki80il" + "commit": "c376b08059028737390f41fb82f64d748c42970c", + "sha256": "08alhr6d7shmm1fcvca0a0ipi9mvnaqp5klvqdb1d171h457fcv3" } }, { @@ -63695,11 +64957,11 @@ "repo": "belak/emacs-monokai-pro-theme", "unstable": { "version": [ - 20200504, - 237 + 20200525, + 1430 ], - "commit": "06f907e4a954688ec2096420fea1c9935d819e07", - "sha256": "1k73bnwyjnmgvx4664pqrk1ig0rr0rwxzlf165dh5fspzqkmrjqh" + "commit": "d1bc669200bf5753cf1963e5e65269e0d60648d5", + "sha256": "0zqrn1pvlrgbf0yc34bycahvrl8sl67jmc0436yx3lgjwpkvhf0f" } }, { @@ -63749,11 +65011,11 @@ "repo": "sanel/monroe", "unstable": { "version": [ - 20190912, - 1624 + 20200703, + 1254 ], - "commit": "508f5ed0f88b0b5e01a37d456186ea437f44d93c", - "sha256": "01dwnb7f6c49q8vr3qb9m5h1wh9h119axxalqa71wahi1ygrcydc" + "commit": "b540e13cf767055086c37b2878e551fd3eddf5c5", + "sha256": "0sfj0b7j3385la01d8vq1s8ynpl5vzwdx7vdpyhbi3hrh02xkcqh" }, "stable": { "version": [ @@ -63773,20 +65035,20 @@ "repo": "jessieh/mood-line", "unstable": { "version": [ - 20200429, - 309 + 20200722, + 2327 ], - "commit": "5ff7cb514d7842901b592fa5132b75bc2b0df2e8", - "sha256": "135cl8fksl0hyh7jxmdmwng1ppcv3lc3i39v7vslkwi2xp7b0xfk" + "commit": "64cbd61c3d9ebf8eb7e1b6366279e32382405f90", + "sha256": "0fh9j9fkgl433nykfzjnzap5labi4sdndfk1nv4f904ij69pmvxb" }, "stable": { "version": [ 1, 2, - 2 + 4 ], - "commit": "5ff7cb514d7842901b592fa5132b75bc2b0df2e8", - "sha256": "135cl8fksl0hyh7jxmdmwng1ppcv3lc3i39v7vslkwi2xp7b0xfk" + "commit": "64cbd61c3d9ebf8eb7e1b6366279e32382405f90", + "sha256": "0fh9j9fkgl433nykfzjnzap5labi4sdndfk1nv4f904ij69pmvxb" } }, { @@ -63797,20 +65059,20 @@ "repo": "jessieh/mood-one-theme", "unstable": { "version": [ - 20191029, - 743 + 20200730, + 18 ], - "commit": "77ff4bfd954d46bc7580175ef443a9168938f9cd", - "sha256": "02aqp3na2401n0mc6fbqvlwrfvbq283kyn9fhan4d0i6mrgvdblx" + "commit": "00e2d3797a271c0b3ecb0bab56dc705558015311", + "sha256": "0cq5y5fcx581vv8fzbxn5k71r95ss92yvddw4nk85h3710scclds" }, "stable": { "version": [ 1, 0, - 4 + 6 ], - "commit": "98c2f3ca27dce87cec1bd7ffd322b48129213588", - "sha256": "1rs9az5d4279jqldvx963qx0plbxp49c3crksmcq6si0x1iwg86x" + "commit": "00e2d3797a271c0b3ecb0bab56dc705558015311", + "sha256": "0cq5y5fcx581vv8fzbxn5k71r95ss92yvddw4nk85h3710scclds" } }, { @@ -63831,10 +65093,10 @@ "version": [ 0, 5, - 3 + 4 ], - "commit": "2751d36152abcc2ac1479225392182b53f1e02dd", - "sha256": "1xyw4l42053595r76lj8safsx6pj25as0107wd96by3h7dg9m586" + "commit": "f6bebfe6fe51b728ebd013b7084becad23cabad3", + "sha256": "0n8p864yj5m3n7f9qiq9hy24dwfvv0a0wchx2818rppff6vfq3hf" } }, { @@ -63845,20 +65107,20 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20191118, - 902 + 20200725, + 126 ], - "commit": "f16c8c509990932f3db7570a838a441d5c22dec3", - "sha256": "172ih3wa3n6q46i7hcjddvnpy4h3vjldj42wvid4lpny0ibjazfy" + "commit": "d6dc1f42ccf0d53c8f5d5a327442ae52b2de7aed", + "sha256": "0s0liwc9sriv2ar6905n2vsdf9x8l85mwfyw05kr6vmxh9w08wbx" }, "stable": { "version": [ 1, - 2, + 3, 0 ], - "commit": "536eac1dd2b187f65ed85ad8efc95f7e2bcaadb2", - "sha256": "12v2m66dlvnggmraxgmcfq4ycv6wdc56dv63gggrcy7zhlxwi9vp" + "commit": "1d8344cec018a417cb5845c0717c7400c281caa1", + "sha256": "0ig5j4dzb0vxx145yv4ly93hndc2hkbx6dfng2zy7agf124ygh37" } }, { @@ -63966,6 +65228,29 @@ "sha256": "1yxy6m5igvsy37vn93ijs0b479v50vsnsyp8zi548iy2ribr0qr5" } }, + { + "ename": "most-used-words", + "commit": "5c240664b29e0e455d3d2503381b9db1ed0ea20f", + "sha256": "1129wbn7myzqijzcs1bsy3fh6iizijfpkpa1mw6j9s618anj282p", + "fetcher": "git", + "url": "https://github.com/udyantw/most-used-words.git", + "unstable": { + "version": [ + 20200808, + 931 + ], + "commit": "f712879493660c3c3ee3793470b8f8939b79c2b0", + "sha256": "0aim8kzs95xjf6ldc4qy9xma1crxybmafs40sqaq35cbfszg0mf0" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "90c09da92b30c6497e9141f0edfe7842440c4d53", + "sha256": "0bcqg5p7v6wi3g68c9qpv3rvi9lh6427dd0gmmnwvs1qysz28f1b" + } + }, { "ename": "mote-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -64029,20 +65314,20 @@ "repo": "wyuenho/move-dup", "unstable": { "version": [ - 20200506, - 2305 + 20200819, + 940 ], - "commit": "fa9be365fcd6a2b89388b4d27dec93928d506678", - "sha256": "0pb5xfzk5lfdz613hqsr9x1f0i5ls61xc0np43kqaxnr4xjz2fld" + "commit": "c5a346d3058011b8152cceeb45858f9b4cef1b69", + "sha256": "1dfsfxy7v85qc2gl14gxhngnvkcdbq9gadnsabs1fq56qdgmq814" }, "stable": { "version": [ 1, - 0, - 0 + 1, + 2 ], - "commit": "dae61de7aa5e2bf56a7bab1fa36fa3a39520a3c0", - "sha256": "1mrrxx2slxi1qgf483nnxv3y8scfsc844sfnzn4b7hjpfpali0r8" + "commit": "c5a346d3058011b8152cceeb45858f9b4cef1b69", + "sha256": "1dfsfxy7v85qc2gl14gxhngnvkcdbq9gadnsabs1fq56qdgmq814" } }, { @@ -64233,8 +65518,8 @@ "dash", "mozc" ], - "commit": "01f09b6c0b308e9f7057fb2aa80171e2ce328bb8", - "sha256": "0vgyx7v79224mg3ci8i5kjasnh1w0c48jzwgxbjj270lrra3gfsr" + "commit": "90a6eb1db8fa1283b944432cfb83739286b37f92", + "sha256": "03pqqzzca9z3a1nbrfdkvfczzi7nr3bn75x7m4mdww9z3wxxda2c" }, "stable": { "version": [ @@ -64611,20 +65896,20 @@ "repo": "mkcms/mu4e-overview", "unstable": { "version": [ - 20200218, - 546 + 20200817, + 2046 ], - "commit": "151d5d9e0dd5e8e8c775035203d3e17538151f33", - "sha256": "1gvlh306pcn1g4b7j5pk5m2n2wa72bl9vscfsp0gqr4fwrfnm3r6" + "commit": "467a7dfda4e534783469a137545193ded8a66723", + "sha256": "08lwvgwfsxmvm5bnw0sl96dry57h4wcjsi2fr2mmfq190kdjrizy" }, "stable": { "version": [ 0, - 1, + 2, 0 ], - "commit": "c34f45b3ab9cce892835e14c6701b531a4f54cce", - "sha256": "1jc291xwym2ddiqvn83s2b2jw6a08dd63x0f6526qv8g3yr1jl1s" + "commit": "467a7dfda4e534783469a137545193ded8a66723", + "sha256": "08lwvgwfsxmvm5bnw0sl96dry57h4wcjsi2fr2mmfq190kdjrizy" } }, { @@ -64657,6 +65942,25 @@ "sha256": "1wpcv4wdk735w701d9bm9qqji98mmzg7l7qkq1jmjw1hbpqhnwl2" } }, + { + "ename": "mugur", + "commit": "7f218af9e4a50c53d0cacdd3fbbfc514d2f98e8d", + "sha256": "05qn7b3jsprdcyc4p6h70qvaydgq3b71y2hb4jfqx19prcbcly7k", + "fetcher": "github", + "repo": "mihaiolteanu/mugur", + "unstable": { + "version": [ + 20200602, + 642 + ], + "deps": [ + "anaphora", + "s" + ], + "commit": "5333d0ff56cb4d1448e4cdf48278abcbc32e96eb", + "sha256": "07xglyc05d42inlh4j3nvdyi55pa0cy013c5yk8rv94xs31pjd8k" + } + }, { "ename": "multi", "commit": "c9fea5cf529bcdf412af2926e55b8d77edc07eca", @@ -64689,14 +65993,14 @@ "repo": "ReanGD/emacs-multi-compile", "unstable": { "version": [ - 20160306, - 2223 + 20200517, + 1747 ], "deps": [ "dash" ], - "commit": "bd0331854774e7a269ce8a7dd49580cd397c0ec2", - "sha256": "1aswpv1m02n26620hgkcfd38f06bzmmijlr9rs5krv6snq5gdb8g" + "commit": "e3772f7e68968f7fa2c97615115cd3fc0f701229", + "sha256": "0r1ahchfhyqjyc0q0xp5x0p34d6hg4ga3cga1l6dlaw1xjflrsq2" } }, { @@ -64809,15 +66113,15 @@ "repo": "suonlight/multi-vterm", "unstable": { "version": [ - 20200329, - 940 + 20200614, + 548 ], "deps": [ "projectile", "vterm" ], - "commit": "11f1b0cc97a24aba66fb561a0a94e9a66375b30f", - "sha256": "0pzcwn13yj21qcga2agcv8as0jyrmw055fr8nbzvkp1jml4l3vwj" + "commit": "723658c162d483acc07fccf2dd8ae5b8582616f7", + "sha256": "1wgsqrr6jxv8dwf89406m53w1xzsvq45hrcc72x12hxkc1hay2vk" } }, { @@ -64961,16 +66265,16 @@ "repo": "Wilfred/mustache.el", "unstable": { "version": [ - 20190905, - 2214 + 20200726, + 553 ], "deps": [ "dash", "ht", "s" ], - "commit": "6443e1563ddf4eee2236ca1bb1fe87ddfde4b2bb", - "sha256": "0wbmknx4pjgfw6y1482a3y1fxv054r0k2qj3qzc47xrkdsjw47y8" + "commit": "4649a47340b63214c7b8f1dcc178806d96288839", + "sha256": "1vwngm8fvfmh6p7p54pf01gqsmcg7f86nbyg18qphny9zsss1zjl" }, "stable": { "version": [ @@ -65159,6 +66463,30 @@ "sha256": "0cf0c9g9k2lk1ifi2dlw7c601sh1ycxf3fgl2hy5wliyd6l9rf86" } }, + { + "ename": "mybigword", + "commit": "77cae5811b20615f356c520e200f771805642976", + "sha256": "1v7llcas9hzv2gwjvsxb0i29zcqizg7qgmzx3zyrkbww3ciwwfmp", + "fetcher": "github", + "repo": "redguardtoo/mybigword", + "unstable": { + "version": [ + 20200818, + 1059 + ], + "commit": "182a972cc48c30ba73ebf5424cdf27601a77399f", + "sha256": "1k3bxxc3fyh5zimwvw1b0fis95x0q9kp0cxdgdy3y2iayavm203r" + }, + "stable": { + "version": [ + 0, + 0, + 9 + ], + "commit": "182a972cc48c30ba73ebf5424cdf27601a77399f", + "sha256": "1k3bxxc3fyh5zimwvw1b0fis95x0q9kp0cxdgdy3y2iayavm203r" + } + }, { "ename": "mykie", "commit": "e10504a19e052c080be2ccc9b1b8fd2e73a852e0", @@ -65238,14 +66566,14 @@ "repo": "mallt/mysql-to-org-mode", "unstable": { "version": [ - 20200503, - 1239 + 20200602, + 2019 ], "deps": [ "s" ], - "commit": "7dcd6486f374814908bdb3c6d4c88cd6cece1e2f", - "sha256": "1jpz68pf8j7f4jin5qk4lrkxfzjwyqs16fn3j9ll21z4lc2mj2a8" + "commit": "f3afc506f8b0d037238e49290de4b028c6ad9dd1", + "sha256": "19g21zvvamlhy1yrqhqbd1x3km6q2m650xsvl613rpcdqsk8l2ic" }, "stable": { "version": [ @@ -65592,10 +66920,10 @@ }, { "ename": "nash-mode", - "commit": "c8bd080c81b163a6ddcfffc710316b9711935b4a", - "sha256": "1d6nfxn7fc2qv78bf5277sdwfqflag2gihgic8vxrbjlpnizxn1p", + "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", + "sha256": "1rkqcf8whk6g8ic0vlahf9m0kphd83515cr4yqv21qg2yx8irf2w", "fetcher": "github", - "repo": "tiago4orion/nash-mode.el", + "repo": "i4ki/nash-mode.el", "unstable": { "version": [ 20160830, @@ -65637,11 +66965,11 @@ "repo": "CeleritasCelery/emacs-native-shell-complete", "unstable": { "version": [ - 20200424, - 1635 + 20200814, + 2301 ], - "commit": "0f290514564d3733b35e4b48d70446c1a6eb4b41", - "sha256": "0i8bss7ipwsjfrgfri7d3f9pbpkdbfh8aqz8cawr2wvf4yayk8q5" + "commit": "be7ced29c5a86e29c364f19d248634b8b54d0e52", + "sha256": "1lyad89byq54fva58njf7wiq2rw3767fxif1ykijirzx7q14ahxd" } }, { @@ -65869,8 +67197,8 @@ 20161029, 2023 ], - "commit": "f5fe5832889d7b6eab7d45724e051f4edbe1983f", - "sha256": "15ljrcmmpfwqxvci0ilmn3xgjxj19wq638zvij0wh2g0n6nil6xx" + "commit": "db4bc9078f1b6238da32df1519c1957e74b6834a", + "sha256": "07axi57f4q7rvsk3w15jrbql20fwmxn2rk07cc9ahqkzys66jfv1" }, "stable": { "version": [ @@ -66034,16 +67362,17 @@ "repo": "felko/neuron-mode", "unstable": { "version": [ - 20200503, - 930 + 20200806, + 833 ], "deps": [ - "counsel", + "company", "f", - "markdown-mode" + "markdown-mode", + "s" ], - "commit": "4329de608ca14dc67448ad576645eabb084009ef", - "sha256": "0wk4cjcj98yym1cca2k1wgail9rvxaqs7n9fkccnxv9bddjmymv9" + "commit": "18d230ce6b126fe7193db9c20ac93811ccfe779d", + "sha256": "18s7phs285jc4whd54x3dvbajqil7yff18xirbvf9pjlzivqwfk5" } }, { @@ -66099,14 +67428,14 @@ "repo": "AdamNiederer/ng2-mode", "unstable": { "version": [ - 20190524, - 1912 + 20200703, + 1610 ], "deps": [ "typescript-mode" ], - "commit": "52fdfe27247548b46f6171eebaf887a90dd67463", - "sha256": "1g8za385clky1waba4ggi5bl2q4h26gz00lkzghn3zvxg5nbh47d" + "commit": "d9feee65d882723b955483d2b8af01e49df21652", + "sha256": "0i0xad3h6rnkrbglmv10vv0zs3nf8kda19n176h6v4zy5bazgrqi" }, "stable": { "version": [ @@ -66196,11 +67525,11 @@ "repo": "aaronjensen/night-owl-emacs", "unstable": { "version": [ - 20200118, - 1513 + 20200622, + 1943 ], - "commit": "b52fbf83ffef1ca265c9ea273bf51827532cef67", - "sha256": "0blgf7wx8i7am943m1jc7q4ndkb7pdczfgigrdnqsaf861m0nhng" + "commit": "4b9b5cb4fead9c5f145ba399d172c7e6bf577121", + "sha256": "0hkjy8qnpjwqc6c8zczb68s7kg5cx8wq9067rvwx4hraxv1bjqmm" }, "stable": { "version": [ @@ -66274,11 +67603,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20200203, - 1941 + 20200812, + 915 ], - "commit": "32c5c88502aec1afb6700a798c215b7fc6ce6101", - "sha256": "1s0f7wgik5383ffkys27376s0gzhhz6m0rap7l8iqq67yz0k6hxw" + "commit": "1a828c1fa0574503014afe8dda3229fb76a4bf64", + "sha256": "1qapsq7mxayjjr7y376p9vb7k871rwjgmyvmv756xg98lf7vm3fb" } }, { @@ -66292,17 +67621,17 @@ 20181024, 1439 ], - "commit": "c6148b0c3377a7d12b679f99f35e09cc7f36e940", - "sha256": "088znrs8hygsfx0ndqhpfdgra3l3jf6dyfwz2l6h4s7w4kc8mlnk" + "commit": "9ddd3c917793bb97eb19d571429cdedf07501c03", + "sha256": "0lrj3k5ng748faarz63rspnd4sh38qvkxxcgbmk81h4cqvv529fy" }, "stable": { "version": [ 1, 10, - 0 + 1 ], - "commit": "ed7f67040b370189d989adbd60ff8ea29957231f", - "sha256": "1fbzl7mrcrwp527sgkc1npfl3k6bbpydpiq98xcf1a1hkrx0z5x4" + "commit": "a1f879b29c9aafe6a2bc0ba885701f8f4f19f772", + "sha256": "1bmv7zfqwp48ga6vnqvy0gzkclv40xgq19q4ihl58r6cn4swccn3" } }, { @@ -66343,11 +67672,11 @@ "repo": "akirak/nix-env-install", "unstable": { "version": [ - 20200113, - 751 + 20200812, + 1305 ], - "commit": "b343a7e885206e78544da7313b860442abbd7440", - "sha256": "06sq5biv15pgz8azp1kkbkj6ifi2xpa688gx8hj3xvkms9hy6b29" + "commit": "79c34bc117ba1cebeb67fab32c364951d2ec37a0", + "sha256": "12f16pfki1jwnw1ghdsqcrb11039njffl9hz3aa7sflwr95g2pbb" } }, { @@ -66391,20 +67720,20 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20200515, - 410 + 20200811, + 1947 ], - "commit": "e20afb51a48b5d014292d123487f53a678c7c3f7", - "sha256": "1gbq9pmz1wv6kc128pyzi2hrsv9ax20myjmq02bwc4x5sqg6rdzq" + "commit": "0cf1ea1e0ed330b59f47056d927797e625ba8f53", + "sha256": "0wsiyvv23jcazh7jrbkg3d0qs1y5i88ahsdi3pp2s8q9h3lyhwnb" }, "stable": { "version": [ 1, 4, - 2 + 4 ], - "commit": "e20afb51a48b5d014292d123487f53a678c7c3f7", - "sha256": "1gbq9pmz1wv6kc128pyzi2hrsv9ax20myjmq02bwc4x5sqg6rdzq" + "commit": "e4e604ae3ac91748c4e7d51a591cb9ee60961b7c", + "sha256": "19f36kl00pxm2a18hn4cdsdvxlfsdx1pnnm6s6zxd8nw6y8ynvn0" } }, { @@ -66482,8 +67811,8 @@ "deps": [ "reformatter" ], - "commit": "cc8ee143d4ef45a8c540901852326ccdf6ff8482", - "sha256": "0a1ih8w8xk8rdd96k7236v6xh2xr1r6gaiv2b6js95k04igdqxnh" + "commit": "213251f82a69edc033766ec96948e83aeb428cd2", + "sha256": "1hx13p9rs33j2ajbg0dp6a371hr0dcxbcyzr5xlvkg6gf746lmg8" }, "stable": { "version": [ @@ -66575,8 +67904,8 @@ "repo": "dickmao/nndiscourse", "unstable": { "version": [ - 20200418, - 2355 + 20200524, + 1649 ], "deps": [ "anaphora", @@ -66585,8 +67914,8 @@ "json-rpc", "rbenv" ], - "commit": "103eb5c13ad2d154c9386b2aa9dbea532435ee7a", - "sha256": "04nympxjg1dhahk7m71769c5lzsxxsnd9c62lqrkn22gvfzm0wm5" + "commit": "e8d99d132d649e179f7cc81b80d873436b4e8ce1", + "sha256": "03iqbb3svidczzci0l8b19zk8yx9xdslf9y0hpn2y8fzhf4gszrp" } }, { @@ -66597,8 +67926,8 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20200407, - 1525 + 20200730, + 1052 ], "deps": [ "anaphora", @@ -66606,8 +67935,8 @@ "dash-functional", "request" ], - "commit": "d5e58b373ab6c5f13174e76f5ae62539dc5cfc95", - "sha256": "0gqqdjmasjs1p6nal9s2yhas1xr2nm99rd3rns2b8cd5j04ccvaz" + "commit": "ad20d17f196a1b99c683ad2ffc39a9b4b2fada58", + "sha256": "1b5jnprpvlsn7cnxj6pab8kr0kdzm8xqrzhsga6dlaww6max26xp" } }, { @@ -66633,8 +67962,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20200417, - 1757 + 20200524, + 1647 ], "deps": [ "anaphora", @@ -66643,8 +67972,8 @@ "request", "virtualenvwrapper" ], - "commit": "7f6e3bdbfa872af8e92ed339671772b46bc7f7f0", - "sha256": "1dbb4pm2dvyvgw6lxjhhdqplb1b1jbvnywy8d3abr5dpzfqzij8s" + "commit": "4f41473221ea3312085c9f562db59d8f22bf8910", + "sha256": "0b42z866igmh8lvykcmac19zb6irdyvaag5dnaa54w2xc9ms52hj" } }, { @@ -66670,26 +67999,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20200426, - 2105 + 20200817, + 1831 ], "deps": [ "cl-lib" ], - "commit": "e67d7edac513892c5997468899f177a6e7956906", - "sha256": "0b1f1lxzp2i2liysl8fs1lqcyrz220m232pzk8h6l7iq8y5fp15q" + "commit": "85629e5979f2159ab8cc77814dd4cb219e6ba69c", + "sha256": "0ii19sbmsl35y1glj2mz309aila8954rmpah7y7mr2b34ami6hdw" }, "stable": { "version": [ 1, - 0, - 3 + 1, + 2 ], "deps": [ "cl-lib" ], - "commit": "d1d6965c70fc6ce0cfb38a5115d0e112aefac1d7", - "sha256": "17is06l0w6glppabv2kaclrnqi3dqb6p6alpslpg7lrjd8vd45ir" + "commit": "aaa3c36b25e07017595b54e91e190f69f0de0487", + "sha256": "0v642qbd65w5jq44zsl4vy525vjmhr948p1jmpq4mpvhfgmxx88c" } }, { @@ -66806,11 +68135,11 @@ "repo": "abicky/nodejs-repl.el", "unstable": { "version": [ - 20200320, - 1645 + 20200802, + 1310 ], - "commit": "6fad7d764fa0d818ba497450bd722ae10cb8efed", - "sha256": "0saky39n0p8w7lmalg3j4da0crrx40yz0rz1zdjzwpd2bd9v2izg" + "commit": "3b841055cad00f442e4a9159b1056f59411b6646", + "sha256": "0371lz9378x3vjj2kqir89sjy0l5d5j6ha5yz1381nkh15dcww15" }, "stable": { "version": [ @@ -66846,21 +68175,6 @@ "sha256": "1s19sshsm4cdx8kj5prmsq8ryz4843xcqmdayvlfl99jxsp9j4pm" } }, - { - "ename": "nodenv", - "commit": "272df58a1112c8c082c740d54bd37469af513d4a", - "sha256": "15wqlpswp4m19widnls21rm5n0ijfhmw3vyx0ch5k2bhi4a5rip6", - "fetcher": "github", - "repo": "twlz0ne/nodenv.el", - "unstable": { - "version": [ - 20181023, - 1543 - ], - "commit": "832fb0cbac4513edde7ebd6d1ab971c54313be36", - "sha256": "0hn29y8gv9y9646yacnhirx2iz1z7h0p3wrzjn5axbhw0y382qhq" - } - }, { "ename": "noflet", "commit": "df33a7230e0e4a67ce75e5cce6a436e2a0d205e8", @@ -66908,11 +68222,11 @@ "repo": "arcticicestudio/nord-emacs", "unstable": { "version": [ - 20200108, - 833 + 20200620, + 1122 ], - "commit": "d828752e270978a56bde19986c98b1bbe8f51386", - "sha256": "096f8cik4jz89bvkifwp3gm9iraqrd75ljy2q9js724v7yj88711" + "commit": "4f5b64605709d5803285953026137e905756c35f", + "sha256": "032lgin0pn07ysshsdfdfqd5ck1fhrwdfz64sxwwc4gxlg5p4p98" }, "stable": { "version": [ @@ -66938,8 +68252,8 @@ "deps": [ "colorless-themes" ], - "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37", - "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn" + "commit": "736f7a105535901b4783d19534e7855920e25115", + "sha256": "1wi7wxiyk0g3k0l60hdmcyvvxr1kaapbkxvkknwd9qvdsji0ng73" }, "stable": { "version": [ @@ -66968,21 +68282,6 @@ "sha256": "1yin5i38jdp47k6b7mc0jkv9ihl8nk5rpqin4qmwbhb871zxn7ma" } }, - { - "ename": "nose", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1xdqsxq06x2m9rcfn1qh89g0mz1rvzl246d3sfmciwcyl932x682", - "fetcher": "bitbucket", - "repo": "durin42/nosemacs", - "unstable": { - "version": [ - 20140520, - 1648 - ], - "commit": "194d7789bf797f31ea0adc45f08beb66ae9ea98e", - "sha256": "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm" - } - }, { "ename": "nothing-theme", "commit": "8f69a676e9adfb45f8fbd4467e86a4cb0fbf6ae8", @@ -67006,20 +68305,21 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20200427, - 1036 + 20200816, + 1342 ], - "commit": "627460d7bbbb6b95a07084c2b6fc7f647a5547e1", - "sha256": "07fm4ndg42c0fw2dhj2rl32yrdnyprhidgkrwyckghwj02gjfwrj" + "commit": "8776faf6d5118e8152ecfacf94accf35ccebf1d2", + "sha256": "0r4f12m2xbwzl0fhqcz2vv7dcr0psnhy8ahhv6b5gsdfdfd2w4w3" }, "stable": { "version": [ 0, - 29, - 3 + 31, + -1, + 1 ], - "commit": "a59ef7d02cb229c2ec3569024918024003568aea", - "sha256": "0w9k7jfhcp34inkqciisrjfgflrx8h5q4svfa6bij9p93g1hig0b" + "commit": "75ec89dfb4c254ba0b88ddb479e6ede6bfb7d0c7", + "sha256": "1pc4nkbhxmx1qlamnjzd1arzr3sgp0m95vn1jmmfivgddy3xh8b0" } }, { @@ -67089,28 +68389,28 @@ "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20200506, - 1245 + 20200813, + 821 ], "deps": [ "dash", "esxml" ], - "commit": "55a3b41aa71740826a1cd410fa8d24a313f27b7c", - "sha256": "0zw6iq2iwv06jixb5cv73b832y576v0vs51l0j80d8w5d09zpfz3" + "commit": "6cfd80124038504038bcb5d4cf2e8b037c36841a", + "sha256": "1zr8q9kl3i1900vp08c52ywx2lpwp4iyqs8vm3kb8a7dsc4hpggf" }, "stable": { "version": [ 0, 3, - 0 + 1 ], "deps": [ "dash", "esxml" ], - "commit": "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596", - "sha256": "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz" + "commit": "3d32aac0f895c8605e254c8b7f246537816744f5", + "sha256": "13r7lvyyyv62m57m4s4xjs4qz2ckhqk6ib514px7qzc7mdzcz9i9" } }, { @@ -67160,14 +68460,26 @@ "repo": "shaneikennedy/npm.el", "unstable": { "version": [ - 20200406, - 1429 + 20200812, + 1850 + ], + "deps": [ + "jest", + "transient" + ], + "commit": "26d5cf79dfd1a2a74a66c44de129483d26354345", + "sha256": "0akjjb5xqpzg784qi6hbjfjm335mixqszzrxwz69ggl50iy9s6rk" + }, + "stable": { + "version": [ + 0, + 1 ], "deps": [ "transient" ], - "commit": "187ddd2732deb49df1e87fbaace153afb8a3e7e1", - "sha256": "0kh8y0izab3rra5vb1229h77ykz704wh28m7vv0bsfn5lg02ridx" + "commit": "a699cba6a8798af709b2576f2df54abd7eb1701b", + "sha256": "1w9a9pjpp3lchl4k8y1zhdpdnmd090s8vp7vbfb89xawp1gavhxg" } }, { @@ -67255,8 +68567,8 @@ 20181022, 2154 ], - "commit": "1efc30d38509647b417f05587fd7003457719256", - "sha256": "0px64jsdps477s9xiw96mhcf1fmgxf0gsp30gzhqfb1b1k4f306j" + "commit": "60273e764bf8d95abc40dd2fdc23af87ea9ee33b", + "sha256": "0cr0y0mflqr434223rfwlzzp2zdaddqymsrysbsrbv3qhh157sk3" }, "stable": { "version": [ @@ -67487,20 +68799,20 @@ "repo": "TeMPOraL/nyan-mode", "unstable": { "version": [ - 20170423, - 740 + 20200526, + 1054 ], - "commit": "a85ac925367ddc542827182a2d9f0133b421c41b", - "sha256": "1178zinzaq0hj1n57yhbpakgky952jhj7dfwhwvsvfclmk9dlrr1" + "commit": "06e67ab2c490756d3eeed4a68aba7c33e508a5d5", + "sha256": "0d0hdjliad8afz4br38gwidph9zhmm5s09y45n95kqlazq62jfsx" }, "stable": { "version": [ 1, 1, - 2 + 3 ], - "commit": "4195cd368aca8f05a71cbff4e60cfa9dde10319a", - "sha256": "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7" + "commit": "06e67ab2c490756d3eeed4a68aba7c33e508a5d5", + "sha256": "0d0hdjliad8afz4br38gwidph9zhmm5s09y45n95kqlazq62jfsx" } }, { @@ -67797,8 +69109,8 @@ "repo": "zweifisch/ob-cypher", "unstable": { "version": [ - 20170725, - 1420 + 20200521, + 936 ], "deps": [ "cypher-mode", @@ -67806,8 +69118,8 @@ "dash-functional", "s" ], - "commit": "114bdf6db20ee0ade060bb5df379ddee48ff4f26", - "sha256": "142d91jvf7nr7q2sj61njy5hv6ljhsq2qkvkdbkfqj07rgpwfgn3" + "commit": "da9f97339474a48d759fc128cee610c0bc9ae6c0", + "sha256": "0r4dsbrdxhyyh708pm8fqn423v21xk7a940nbajw9y07n28y5hgk" } }, { @@ -67884,14 +69196,14 @@ "repo": "BonfaceKilz/ob-elm", "unstable": { "version": [ - 20200102, - 2000 + 20200528, + 1857 ], "deps": [ "org" ], - "commit": "8b49ca0ecdff9df7c3f428bac22a96ed675ee5dd", - "sha256": "0prc0bddyppdzckfkjd6h2j5qg9plfzccg2gyn4jkmjhkx0gi09g" + "commit": "d3a9fbc2f56416894c9aed65ea9a20cc1d98f15d", + "sha256": "1wdlr0cbsb2drdmcn2bnivjkj1f2v52l6yizwsnjgi4xq3w6k56h" } }, { @@ -68075,6 +69387,24 @@ "sha256": "0ganip7077rsi681kdsrmvpjhinhgsrla34mll0daiqid7flnk4g" } }, + { + "ename": "ob-latex-as-png", + "commit": "5a9c900e82ff9e9726ce9cad98d8067752a53fdf", + "sha256": "0r355k7h5nq91dir1rvmq0hbrx6pr9kan6qblls6fzi1r0f4d1ph", + "fetcher": "github", + "repo": "alhassy/ob-latex-as-png", + "unstable": { + "version": [ + 20200629, + 1013 + ], + "deps": [ + "org" + ], + "commit": "d21d436814e9605cf2a942b709f957695298dc70", + "sha256": "0zmckisi9q9kv25jh0jn0ab9xbh2b7d4mzyyi1sdgnkg0ayzvvhb" + } + }, { "ename": "ob-lfe", "commit": "d595d3b93e6b25ece1cdffc9d1502e8a868eb538", @@ -68150,6 +69480,30 @@ "sha256": "02k4gvh1nqhn0h36h77vvms7xwwak8rdddibbidsrwwspbr4qr1s" } }, + { + "ename": "ob-napkin", + "commit": "675b76ed3aa7b3bea74ff7103f004589b6cc6b74", + "sha256": "1v6s28ahc8xzd4hdl9v4cnigg21978rj6z7xnryv35nzm6kdxn15", + "fetcher": "github", + "repo": "pinetr2e/ob-napkin", + "unstable": { + "version": [ + 20200816, + 1245 + ], + "commit": "7af5e8af08da8455c489909afbd9528a61f570e7", + "sha256": "1rmfxbnl2y6yx1869sm5203k7hch481wh5dq6lik5bj00cf3knc6" + }, + "stable": { + "version": [ + 0, + 9, + 1 + ], + "commit": "7af5e8af08da8455c489909afbd9528a61f570e7", + "sha256": "1rmfxbnl2y6yx1869sm5203k7hch481wh5dq6lik5bj00cf3knc6" + } + }, { "ename": "ob-nim", "commit": "35763febad20f29320d459394f810668db6c3353", @@ -68227,10 +69581,10 @@ }, { "ename": "ob-sagemath", - "commit": "dc074af316a09906a26ad957a56e3dc272cd813b", - "sha256": "02ispac1y4g7p7iyscf5p8lvp92ncrn6281jm9igyiny1w6hivy7", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1xb8s4xm9wzfpdlhj5rym2lh4naz3h13v4sjqh71zxw6hy82gba3", "fetcher": "github", - "repo": "stakemori/ob-sagemath", + "repo": "sagemath/ob-sagemath", "unstable": { "version": [ 20191106, @@ -68515,14 +69869,14 @@ "repo": "clemera/objed", "unstable": { "version": [ - 20200403, - 1500 + 20200815, + 1504 ], "deps": [ "cl-lib" ], - "commit": "e89d8dae3b2d4331a4455d2a7b203500537d184d", - "sha256": "1xjcbfqxpda73l8imw1pj9my71qqacri269cv7wnzsfrphqh526x" + "commit": "dea5a64a4da32e8947fe5b45de569e293aaa8a96", + "sha256": "1jmr14bfs489g0czpmn987gpmmdqx72blkzcnd8sn1sfyk5n18ng" }, "stable": { "version": [ @@ -68733,26 +70087,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20200503, - 853 + 20200813, + 1540 ], "deps": [ "org-re-reveal" ], - "commit": "b5ac03800294272d2deba115bcd08c9176580691", - "sha256": "08rimp8652jy54p7gnhk774gv023wn1bh73zkarxrwqrlvjkh5m5" + "commit": "165eaf9d151c589226f7a4e0edc3a3100c0a9efb", + "sha256": "06740c4qdpdrim5wj88gw973lbh59h6sx4kzrpl37cqjvdsawbzv" }, "stable": { "version": [ + 3, 2, - 12, - 0 + 1 ], "deps": [ "org-re-reveal" ], - "commit": "b5ac03800294272d2deba115bcd08c9176580691", - "sha256": "08rimp8652jy54p7gnhk774gv023wn1bh73zkarxrwqrlvjkh5m5" + "commit": "7a99fa342eae234069344893b5bc851280ff2dc9", + "sha256": "1fsp6li73dk2272lgj4kxapd1sqw2pqj42rlcbl5hhh35hva714h" } }, { @@ -68777,6 +70131,48 @@ "sha256": "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b" } }, + { + "ename": "oj", + "commit": "f271f03feaa578e3e8ad9b02e0ca3ac99142fd60", + "sha256": "0qzyl7h8rdwyy1d6xralzcxgrc4nwx1hq30n5daa0cy3l5yix5xz", + "fetcher": "github", + "repo": "conao3/oj.el", + "unstable": { + "version": [ + 20200811, + 517 + ], + "deps": [ + "quickrun" + ], + "commit": "2dd65324ac9833e07eaed5fb04acebafc6d5cbd2", + "sha256": "00lxjl1i6kcvj9lym2m59xb5hrx2gcdpvsvq972d8iczp2jmcfxr" + } + }, + { + "ename": "olc", + "commit": "1e21abd021d72c491ed1503146c51761e18c56c4", + "sha256": "0kcqwnhhy5wa0r61yqg9gly9jd6b1846q2w43fmhzk3l4nzky32r", + "fetcher": "git", + "url": "https://gitlab.liu.se/davby02/olc.git", + "unstable": { + "version": [ + 20200818, + 1221 + ], + "commit": "d2dc62dbc3cf6460cc12bd96857a988bc80ac37e", + "sha256": "176w03pybs5rg87cj94s0dy365pxp981mlkbh3zv3d34kpmrzh10" + }, + "stable": { + "version": [ + 1, + 5, + 1 + ], + "commit": "d2dc62dbc3cf6460cc12bd96857a988bc80ac37e", + "sha256": "176w03pybs5rg87cj94s0dy365pxp981mlkbh3zv3d34kpmrzh10" + } + }, { "ename": "old-norse-input", "commit": "84780a6ebd1b2294b86ae8c6df5bd6521cf4e85a", @@ -68815,20 +70211,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20200430, - 519 + 20200702, + 601 ], - "commit": "b23a05f442e3b1230f014e8054ebe3e57d22fc42", - "sha256": "18ln5i3pjzgakpyqdwd4ii8n49l9kxbdp092bsx9s92miknkl2mp" + "commit": "0bc5e98b8456493084d1bd3df35e92a12c5da3b2", + "sha256": "121dzm051jivskssfvxs5kxkviqivf1j0fr3q8rkfqii7rxdw84r" }, "stable": { "version": [ 1, - 9, - 5 + 11, + 1 ], - "commit": "b23a05f442e3b1230f014e8054ebe3e57d22fc42", - "sha256": "18ln5i3pjzgakpyqdwd4ii8n49l9kxbdp092bsx9s92miknkl2mp" + "commit": "57ca8e70bc9ee975f0e2a60bfc4121064dadd2e0", + "sha256": "0rghxjdzyfykd4qc2zkavvbyf9xc899k1b8hbk890f1y3vakqvqz" } }, { @@ -69122,11 +70518,11 @@ "repo": "balajisivaraman/emacs-one-themes", "unstable": { "version": [ - 20190424, - 740 + 20200720, + 1444 ], - "commit": "e62e4ebef7ef8ccb1e90781d613638d30cf24d7a", - "sha256": "13vjlgac3ikd5xr6cjqb3aaj8qr201lc3ndvwhj3k617474312jh" + "commit": "0e77d31f9fc0cd55f3d92ec0db79513d616b2efd", + "sha256": "0dc2xkgnl5x542332cnlilbzy9ps060gjx0hkg8pfhismvavr4mi" } }, { @@ -69380,19 +70776,19 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20200504, - 706 + 20200614, + 1920 ], - "commit": "5b292ac136b891d574f0d9827904e6ad527a9c35", - "sha256": "0973fksap71cya30g3a58jqdd4hxkv4ia603dgl06qgirjvpl820" + "commit": "1f1e0380e2a8cd4fc29b8cc2e00cb01b56d86fbc", + "sha256": "15an4y0xdaih86p33zmb6r7qx5n0cs54flcnnq50jakkxlg9s8xh" }, "stable": { "version": [ 0, - 3 + 5 ], - "commit": "b69b52289fdb0023a3123b1ddec5b490125345a3", - "sha256": "0vxpaqsad3x1lqga1ky7sipm8lk8ps66wpcvz52jdqasxmxzvrjm" + "commit": "c6432b086f9c8ccb50b3656ba5895750f2a15541", + "sha256": "032lfwflkpaxbcxl4jf438vapswsdagipjczcn30sc4dfdh3p42c" } }, { @@ -69587,16 +70983,16 @@ "repo": "diadochos/org-babel-eval-in-repl", "unstable": { "version": [ - 20191204, - 18 + 20200723, + 838 ], "deps": [ "ess", "eval-in-repl", "matlab-mode" ], - "commit": "e111b4b5c6844bb389317354ea172cd96a8bb658", - "sha256": "0j1z1kp85fvn874l7s8h0cf528khaa38bs5ccx5dwf8mkb68vjgm" + "commit": "85136ac7397fcdf0a4700a860de44d7912bb6b4c", + "sha256": "0pkp1w8ivgbr7jy90fymws2k9bambayrfq9rcad9qfzl76i412z9" }, "stable": { "version": [ @@ -69644,11 +71040,11 @@ "repo": "scallywag/org-board", "unstable": { "version": [ - 20190203, - 1424 + 20200619, + 1016 ], - "commit": "2e01e801abc04b8fb718ca4bc19636242ac0cb52", - "sha256": "044nqxrg11qk0lnipzvhvdyd37vjkklaksyasrn6k1ifcfdx2qp8" + "commit": "1393bd46d11a81328ed4fb8471831415a3efe224", + "sha256": "1kryrg988c3sbxyp1sdgc6xdv2iz6kiflpzn2rw4z3l4grzab53b" }, "stable": { "version": [ @@ -69693,8 +71089,8 @@ "repo": "lepisma/org-books", "unstable": { "version": [ - 20200510, - 844 + 20200522, + 1800 ], "deps": [ "dash", @@ -69703,14 +71099,14 @@ "helm-org", "s" ], - "commit": "44aec8dcdf4a498e13a80362dff4027cfa4b74a1", - "sha256": "10ws56ww3hhqx5gghxaygiyi5vkfb5snjf4v0djaam53yn03jl90" + "commit": "49617901d087f532d7cae1aa23637671fd153d20", + "sha256": "09nq7na9r39pl6aljrf5vpkfih92ms7s081nxdrhxcscaysk08kb" }, "stable": { "version": [ 0, 2, - 18 + 19 ], "deps": [ "dash", @@ -69719,8 +71115,8 @@ "helm-org", "s" ], - "commit": "44aec8dcdf4a498e13a80362dff4027cfa4b74a1", - "sha256": "10ws56ww3hhqx5gghxaygiyi5vkfb5snjf4v0djaam53yn03jl90" + "commit": "4b93bb1e20e2e66b9e64819b21ca75f36c389370", + "sha256": "1ksvdl8liqv74am1r7brn8slkwgbc83jv7l92qk9md7s1krcb6y0" } }, { @@ -69731,14 +71127,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20200516, - 1343 + 20200625, + 2050 ], "deps": [ "org" ], - "commit": "3ce2a33b81ce611695ad74bf21cb911ef90d9a1a", - "sha256": "0br8mqhxfx9pf1nslvlqk4x5rdlpjagixi6il0i0xpxhca7z3fya" + "commit": "671db0e08b91c7d2637d765a7afca8b2561275c8", + "sha256": "17i0lnp9xyzbky0xh1qi6q7jpnpz950j2zxwv2hg007zziqd21ks" } }, { @@ -69836,14 +71232,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20200512, - 2102 + 20200729, + 2021 ], "deps": [ "org" ], - "commit": "1dd73fd3db0e9382fa34d3b48c8ec608e65f3bdc", - "sha256": "0wfl416hd7f42j1fidap0f9zlcm3vhgjs12k99k672fggl0459h1" + "commit": "5b461ed7d458cdcbff0af5013fbdbe88cbfb13a4", + "sha256": "171ybf5n6a6ab3ycghc2z016qxbgqyj13kkcdsfqy0691wx7dcqb" } }, { @@ -69869,15 +71265,15 @@ "repo": "dfeich/org-clock-convenience", "unstable": { "version": [ - 20200123, - 1029 + 20200705, + 1527 ], "deps": [ "cl-lib", "org" ], - "commit": "4e522706a90a504c75d377161005f9543575ea02", - "sha256": "08d0hv2shpbw01pjh8ks04avyl4zc0zcyqlmn4hbdhwjz7lzp8dv" + "commit": "efc9773a8dedf834cf4a78fb6f5f8fffe55ef8eb", + "sha256": "0xnzw4p0wvahkfnxpj2ysz9nylzndp4pvy90vlf0l0d2ff5dymbh" } }, { @@ -69888,15 +71284,15 @@ "repo": "atheriel/org-clock-csv", "unstable": { "version": [ - 20190418, - 1505 + 20200714, + 2109 ], "deps": [ "org", "s" ], - "commit": "e2fbaa1ad1a1be40fceecde603a600b292b76acc", - "sha256": "1fpjga40v2wlkvq4ap75hd844m47gm55dkraznqz078k5f8fx8kk" + "commit": "499b961f26e1f9a9898bf0b1725b49d783893639", + "sha256": "08li6il9rhbm62pcb15cd40b6vjqjlywk07jcs9m85q589v6q2yg" }, "stable": { "version": [ @@ -69981,11 +71377,11 @@ "repo": "thisirs/org-context", "unstable": { "version": [ - 20200418, - 1540 + 20200615, + 1554 ], - "commit": "bbef096dc20b206b792b0ef310f2eed7c70ca3a0", - "sha256": "05s73wn2q3a0mfc14qlgcb1bas9addby0m43id2v8ljvxyigicr8" + "commit": "8ef429124c13b1a68f7672cb6e6cb9c8b9d9db93", + "sha256": "178hpp3ylafmr2n3ydcqwqjxa8avlb8g1n3swzndc3jjk0gy6vck" } }, { @@ -70056,10 +71452,10 @@ }, { "ename": "org-doing", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "10vg0wl8dsy12r51178qi4rzi94img692z5x3zv8dxa29lmn26xs", + "commit": "8377b69021bda729b9e96e59a5d7ce2c120838c5", + "sha256": "1hbdyvfqybbgzmcllys6bqip799j79j6h4b28pp6mnlyfqi64msp", "fetcher": "github", - "repo": "rudolfolah/org-doing", + "repo": "emacsattic/org-doing", "unstable": { "version": [ 20200510, @@ -70104,14 +71500,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20200506, - 1829 + 20200818, + 1117 ], "deps": [ "async" ], - "commit": "d248fcb8f2592a40507682e91eed9a31ead4e4a6", - "sha256": "1m8683hkxs70754kqxxw6sb0wfvjkb9ghf9ny7zsyzvz0yj02gkm" + "commit": "67b3c744f94cf0bf50f7052ce428e95af5a6ff3f", + "sha256": "0f94drnfkyd1vpdhkr463zv952lk1v895dwrzk1251j8fb9vdf9m" }, "stable": { "version": [ @@ -70397,14 +71793,26 @@ "repo": "io12/org-fragtog", "unstable": { "version": [ - 20200215, - 2217 + 20200703, + 229 ], "deps": [ "org" ], - "commit": "8eca8084cc025c43ce2677b38ed4919218dd9ad9", - "sha256": "0irr4l40djgmgvg41gx7kqza6zwi2mz69drq7dyrr10pz5hd0ikp" + "commit": "92119e3ae7c9a0ae2b5c9d9e4801b5fdc4804ad7", + "sha256": "0hyhwbfhb7gj3wjv0722gmz637pd3l0k0gnk4z100v3crnk9rfs6" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "org" + ], + "commit": "92119e3ae7c9a0ae2b5c9d9e4801b5fdc4804ad7", + "sha256": "0hyhwbfhb7gj3wjv0722gmz637pd3l0k0gnk4z100v3crnk9rfs6" } }, { @@ -70415,8 +71823,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20200501, - 24 + 20200809, + 2137 ], "deps": [ "alert", @@ -70424,8 +71832,8 @@ "request", "request-deferred" ], - "commit": "2ee2b31547e6f4e33db70fb812d552e55d612fd6", - "sha256": "1gwz1avfbvn5pf72qfg3q6v8qhjihs89avzgx4v7mx6x34fgnpby" + "commit": "2cad2d8c175975dea42903cd4e3fd8bec423c01a", + "sha256": "013h09gdd7zlcrrvwf2i2ipyazvsjg2hwcfracb9bbv4r5bc0syf" }, "stable": { "version": [ @@ -70442,6 +71850,38 @@ "sha256": "1pxfcyf447h18220izi8qlnwdr8rlwn5kds8gr5i1v90s6hpa498" } }, + { + "ename": "org-generate", + "commit": "7bbcd2fe177abe7d823dd5576cce6ba50054e51a", + "sha256": "18hlqlzvlgs2gnabsawjxbp9gn6w3b9fgkzg4sp3plxaqayhayas", + "fetcher": "github", + "repo": "conao3/org-generate.el", + "unstable": { + "version": [ + 20200815, + 736 + ], + "deps": [ + "mustache", + "org" + ], + "commit": "98825efb73c4537f05f653ce40e639a220d2ee5d", + "sha256": "0p4xc4rznkq0vp0bbm1k69bfbmlp46lap12q75wdpkdrn5k4sr2p" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "mustache", + "org" + ], + "commit": "0c25f12cd25d835428dece427f26df53f1d60ce3", + "sha256": "0z2frp5mn3lp2xskwanw2rncrwa50x3aphy87vfxmhx4fqlqrzy8" + } + }, { "ename": "org-gnome", "commit": "4f7ebd2d2312954d098fe4afd07c3d02b4df475d", @@ -70493,6 +71933,42 @@ "sha256": "10jwqzs431mnwz717qdmcn0v8raklw41sbxbnkb36yrgznk8c09c" } }, + { + "ename": "org-gtd", + "commit": "26f2af3e31a2ddbf8600cb9a625d138c924d8a53", + "sha256": "1k264yb9n544zzf8ivzm16vqrklghrhiqs6jfwyx85675088vp6m", + "fetcher": "github", + "repo": "trevoke/org-gtd.el", + "unstable": { + "version": [ + 20200809, + 2319 + ], + "deps": [ + "f", + "org", + "org-agenda-property", + "org-edna" + ], + "commit": "6837b4b192c850ae45b042a78b79f4e7cca2d56e", + "sha256": "1m3na0xswmndhjmgpqh1m5pj9cy5jp3vjmga74x2igrhk40ba8ly" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "f", + "org", + "org-agenda-property", + "org-edna" + ], + "commit": "ee10b8cb70d27d01280de8f282d9602f3497b8ab", + "sha256": "0j555cfi312j0kkpba91np3vwly26y7hyyyaxr2lcg84jd17frjg" + } + }, { "ename": "org-id-cleanup", "commit": "2d59dfe413397ba07a74b7d344e9f9a73c0e3db0", @@ -70501,15 +71977,15 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20200516, - 1339 + 20200523, + 735 ], "deps": [ "dash", "org" ], - "commit": "05d57840893d9ae8146ed41d29d1f0571c05ded8", - "sha256": "1rsw4zgvxp77ncq4z98hcy6qsg6j72glx1y69rwfblg87lz3mj6d" + "commit": "e79540b64e0ee5ef11adfeb932a9b04beb905680", + "sha256": "0qn85515lzhqhn49byf0vpyhbgfwyibf21f7xl2j7cj306x1f79c" }, "stable": { "version": [ @@ -70609,16 +72085,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20200505, - 137 + 20200714, + 41 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "c3c69aaeff743da4be415579444732c2904e9d3b", - "sha256": "02bl3qgplfn45wqj5gi43cz54j0i3c2nd2yn1ay2wjmdscm6akb0" + "commit": "5c90dce918fcb873754bff375e988b17dcc69701", + "sha256": "1d38szx1vq4k1pfdisr3czwaasfw7jkwa2vswfcrnk3d65akkgzk" }, "stable": { "version": [ @@ -70644,23 +72120,26 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20200514, - 1648 + 20200815, + 1335 ], "deps": [ "org" ], - "commit": "2c43b10eed0659f8e47797e5e53d2973f939284d", - "sha256": "1ppzq6hx7nc2iy6pnpgxd39znc701mgqbi2v4v71a0yp8zl6kbgs" + "commit": "a2728e25b854af21cea8e8d313714c993eb1c848", + "sha256": "1rvlrn0jlw6a3p48zg50vw4nll2cffk9nkng0qvh8ws0a161w2j1" }, "stable": { "version": [ 2, - 0, + 1, 0 ], - "commit": "8eda1119f561561b993eea72a550a6b1f0ef35e1", - "sha256": "18dqd0jy2x530lk0h4fcn9cld9qh4w7b3vxa60fpiia628vsv1dg" + "deps": [ + "org" + ], + "commit": "f7bfc592ec11e9e5d0b0bfa377961167b68bba72", + "sha256": "1imrfvzc52l976598df2243s4jdwicznnxs3q91m5vrjsk23zfp2" } }, { @@ -70686,30 +72165,30 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20200329, - 543 + 20200729, + 2120 ], "deps": [ "dash", "org", "s" ], - "commit": "544aac80f1c7113cfe42cf1a2b89f5ca6bd9ead6", - "sha256": "0sx4mvr5g2ipj1s1jg82vr1q90jkq9lm0pg5cdab8lrx464lqf2c" + "commit": "70b4c9823b32ae299f3da521966b6c5abacf73e2", + "sha256": "159g13m1zpc1b2ggs9iw2l51pj0h433y1x00bgznhc9fvamysasd" }, "stable": { "version": [ 0, - 4, - 23 + 6, + 1 ], "deps": [ "dash", "org", "s" ], - "commit": "93f8135f2b7ae2d5ed807cb92954640796bbe273", - "sha256": "1wxc4y5swldqv3jqdz9gj1gx30r4xzis8g2m572bbsrdfjf04c26" + "commit": "fbb27c3983ad735a333c766815642a6615cea2ed", + "sha256": "0xclk323hq4lszqmvba4v8785v57bxfxln5n1hy0vaf0f45hfkjw" } }, { @@ -70761,6 +72240,36 @@ "sha256": "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8" } }, + { + "ename": "org-linkotron", + "commit": "6105d5302a5fdec261f30168f811fa1e277bcb21", + "sha256": "10smvy4h178cqrn0d6kj86mqjnj23np1a2z9q8hp0n1dxyisjfhg", + "fetcher": "gitlab", + "repo": "perweij/org-linkotron", + "unstable": { + "version": [ + 20200112, + 2235 + ], + "deps": [ + "org" + ], + "commit": "d0adc5247b205bc73d2f1a83d4a512d2be541eb5", + "sha256": "1w80kwh17b4svw0md7is8ajc732cbkknychsqcp1ia42qxqq4y8r" + }, + "stable": { + "version": [ + 0, + 9, + 3 + ], + "deps": [ + "org" + ], + "commit": "d0adc5247b205bc73d2f1a83d4a512d2be541eb5", + "sha256": "1w80kwh17b4svw0md7is8ajc732cbkknychsqcp1ia42qxqq4y8r" + } + }, { "ename": "org-listcruncher", "commit": "5bed5078a3e56a825be61d158ca8321763b92f7c", @@ -70839,14 +72348,14 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20200502, - 1133 + 20200520, + 1100 ], "deps": [ "cl-lib" ], - "commit": "484bf3b0b8af461805b9e30d175510c031bcfbc3", - "sha256": "1shp3xfjifvwcj67mvfiv0dwpwyz846s6xa5zs269fwbvdvmx65q" + "commit": "9bb6351b25c62835c7881fc64096028eb8ef83ef", + "sha256": "1h9dv1rw42c4yhdxp2cnxpyv49aklxgljhbw1adl4p7sp4zgrqbd" }, "stable": { "version": [ @@ -70863,10 +72372,10 @@ }, { "ename": "org-mind-map", - "commit": "3c8683ee547a6a99f8d258561c3ae157b1f427f2", - "sha256": "07wffzf4dzfj8bplwhr9yscm6l9wbz8y01j0jc8cw943z5b8pdgs", + "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", + "sha256": "0qgh74dzvpkij8xzdgwyd70wnfmjhjbmvqyw0zgkabw7s059yysk", "fetcher": "github", - "repo": "theodorewiles/org-mind-map", + "repo": "the-humanities/org-mind-map", "unstable": { "version": [ 20180826, @@ -70880,6 +72389,38 @@ "sha256": "0mkmh1ascxhfgbqdzcr6d60k4ldnh3l8dylw4m7wglz15hm3ixbm" } }, + { + "ename": "org-ml", + "commit": "95cc2843698e2341697a223a463c4d51348aec5e", + "sha256": "013rlpq5in8mq02pnlpsl0mbgflv6bwx2cr18j0jcyd4sd1r1srz", + "fetcher": "github", + "repo": "ndwarshuis/org-ml", + "unstable": { + "version": [ + 20200806, + 2244 + ], + "deps": [ + "dash", + "s" + ], + "commit": "e3df332fac6dea0810db0286ef154e917c971c49", + "sha256": "1pdl13hmvyznvk1k1096pid628rmhfif09bhryla7xjqkczpv25g" + }, + "stable": { + "version": [ + 2, + 0, + 1 + ], + "deps": [ + "dash", + "s" + ], + "commit": "c36f8a7f6b15dddcfa9e270a86d48a5e5f2beea3", + "sha256": "0vv8rk1mn7vhwz5riadg1fdjx5nmvm8h578yb9b85a100nq7av2w" + } + }, { "ename": "org-mobile-sync", "commit": "f0a8eb0eefe88b4ea683a4743c0f8393506e014b", @@ -70930,14 +72471,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20200513, - 1617 + 20200722, + 2238 ], "deps": [ "htmlize" ], - "commit": "d8a571c720b2b7dec9115fd85b114ae46d4ac4b7", - "sha256": "094nrd7fy7m7m758gks14kz7yfdcclcwvbz8p90dwg3dv311hii2" + "commit": "2db6725c4a4f4342a9c61895b7c3c82795b01fee", + "sha256": "0ijll4fbm0231zig9ia3bpm2padjyj9w0c89nv5aqpilx2fk84v8" } }, { @@ -70948,8 +72489,8 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20200419, - 1833 + 20200810, + 1055 ], "deps": [ "dash", @@ -70957,8 +72498,8 @@ "org-ql", "s" ], - "commit": "8b056103d6f5320563e9fd794a008fd4e0719702", - "sha256": "1xmj2p9hcpf1nld0gsnxq12kaljh0p195fy24v23l8ygykhmqw17" + "commit": "2541e1b0798a1c9d4b4b8778e6c97a579ac3fa14", + "sha256": "1mcpbq1qylkxpd6nzq04jrji6p1xll5a30dc7dpxpcjrkgvbzf39" }, "stable": { "version": [ @@ -71296,8 +72837,8 @@ "repo": "org-pivotal/org-pivotal", "unstable": { "version": [ - 20191116, - 530 + 20200607, + 1505 ], "deps": [ "a", @@ -71305,8 +72846,8 @@ "dash-functional", "request" ], - "commit": "f073f3ed8c2e78f5080c617d01b1f6bb3df63d1c", - "sha256": "13bqcwlappxz0gsiyvklrf0xv4an6s4id48s3ydi0hki1na9fzzk" + "commit": "125e70f9a682751e4ed7c3a350b2794af9600f47", + "sha256": "1w91wb6l3vsri015awig1kfs986zf49466x4ni0m24hcg00n2m7n" } }, { @@ -71374,8 +72915,8 @@ "elnode", "org-present" ], - "commit": "d66aa2022eea65c83b6e5e5b99a1331284a7ec30", - "sha256": "1ji1qqhp6hpsmri0lgwzvvn1477njlcv60958xf6akvryk6azqh3" + "commit": "ba7e07af3bd1142e310e868893b919286758a007", + "sha256": "1vzipij1wy3g1lh13igbmf16p16llgnm90ydjrr6mlb35d141i20" } }, { @@ -71522,8 +73063,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20200501, - 1131 + 20200713, + 309 ], "deps": [ "dash", @@ -71538,14 +73079,14 @@ "transient", "ts" ], - "commit": "c847afe0b538a1a44c73e40b067831cbea132ba7", - "sha256": "0x1dymh7brhfznr6xkgc2vib4p1s5aqxq9kfjlcvi8q0cfasg9b4" + "commit": "6633dbb276d51767c3f401d0f68ef99e7b9364b6", + "sha256": "0rqhdf9g6n14v1ixwnb3d6jl85zxlarg28fz0jpzzikj4spiy772" }, "stable": { "version": [ 0, 4, - 5 + 6 ], "deps": [ "dash", @@ -71558,8 +73099,8 @@ "s", "ts" ], - "commit": "5a031bf5c19d274934f80d616d6fde62a6db5786", - "sha256": "133x49kr7nf7jhi5r7ww5pydgq8wq3g31klirwgkc29698sd6n78" + "commit": "00800556907408ee11a23de3a4982061d08d3b85", + "sha256": "08xax4fp9rzi8iimkyw2gvp2rd0lgb2f83qrhhnhnc1kgpkdl6y1" } }, { @@ -71638,28 +73179,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20200512, - 1701 + 20200813, + 1104 ], "deps": [ "htmlize", "org" ], - "commit": "a9e9d4ef88417b3af7741a8d8f444ece820e7a3b", - "sha256": "0lkqq5n4dspnpiywaparn95wriwh7ffypdykz0a3mmlnv96rizyi" + "commit": "7fe39d5d03ccc75d2811445d25cbbb473b53de76", + "sha256": "1cmvqr97vx22lw510z0k2nsy5xfgnz2lvchmx5sdxrqz54pz1wfq" }, "stable": { "version": [ - 2, - 12, - 2 + 3, + 1, + 0 ], "deps": [ "htmlize", "org" ], - "commit": "fa6f656f561ebb8377bfd904795aec90b4332bbd", - "sha256": "19nz77f2r49hqavz50ri222prhrd5890vhvc7jfazbascbcdjbqv" + "commit": "7fe39d5d03ccc75d2811445d25cbbb473b53de76", + "sha256": "1cmvqr97vx22lw510z0k2nsy5xfgnz2lvchmx5sdxrqz54pz1wfq" } }, { @@ -71670,15 +73211,15 @@ "repo": "oer/org-re-reveal-ref", "unstable": { "version": [ - 20191022, - 1426 + 20200624, + 615 ], "deps": [ "org-re-reveal", "org-ref" ], - "commit": "1f56a1fc9a52f3815bb2115ebeca3c355688d722", - "sha256": "1xrswpkr7hgsb9pj991z4m0820f1nksfad184x0j7kir2xcx0myg" + "commit": "d60e7b000e863c60485f866f14f552506317f5b4", + "sha256": "03p3fhrllrx42dzx4v2lc4w6bpw5wxgncd8mivg3lqhkm8sb5qwj" }, "stable": { "version": [ @@ -71770,8 +73311,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20200509, - 1756 + 20200814, + 1307 ], "deps": [ "dash", @@ -71785,8 +73326,8 @@ "pdf-tools", "s" ], - "commit": "4ce80644377f2369efb475bd58a57cf6950d8c41", - "sha256": "1j15agy19n0qc4a1750qpyz6wbkwlzasq0cnk16isyq60bszgxx4" + "commit": "831fe96c242bf178f0c55b93fd076dfb549f7791", + "sha256": "18r9n6vln65czjvk46r5lbr7d2rd2dpcqrzhs37jffz9qj93cpcc" }, "stable": { "version": [ @@ -71841,14 +73382,14 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20200325, - 1003 + 20200812, + 1340 ], "deps": [ "dash" ], - "commit": "afac070eb64cc24917c0ab0e14686258da4916f6", - "sha256": "1737r8c5kpb68yb2sixp88fm7fcmr7rvpkpywyxzwgqk30xpsjgq" + "commit": "e0b04fe953de43bec51dd867d5fe12498099f2b4", + "sha256": "0r5vkx5la5dvw8vbrmmbxfffxjmhjmzdfbwy6c31lr60p55m5m7d" }, "stable": { "version": [ @@ -71910,36 +73451,36 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20200516, - 1203 + 20200818, + 816 ], "deps": [ "dash", "emacsql", - "emacsql-sqlite", + "emacsql-sqlite3", "f", "org", "s" ], - "commit": "265182a698be6babcbb11718c2821c747b1cff52", - "sha256": "159zi0a392p1f8bzlxvfkwmx12xm749cia5m0b3paz23mvvhgzgi" + "commit": "c33867e6bc282ff0a69d4ef4a020db82604039bb", + "sha256": "0nklci9ixnkawa0ryffcnxvj7hm4vhklsv7whdynhr9w6aw6f7kq" }, "stable": { "version": [ 1, - 1, - 0 + 2, + 1 ], "deps": [ "dash", "emacsql", - "emacsql-sqlite", + "emacsql-sqlite3", "f", "org", "s" ], - "commit": "27a63b59b176f9d2048de69eb0f525f3c7be8f5f", - "sha256": "18ljww204kf1pbgrrnx7bn6177lw1bs3npywbx2k1b5j35c3j8xv" + "commit": "89e9121f26cf03bb7820d257cd9d9106916cd1e9", + "sha256": "10s7mcyshgj6yva4k1j086xm61k9zck3r586f1maar5b2z6hwvsa" } }, { @@ -71950,34 +73491,66 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20200516, - 1742 + 20200803, + 1209 ], "deps": [ "bibtex-completion", - "f", - "org", - "org-roam", - "s" + "org-roam" ], - "commit": "4d60c7824e028b4bcdbe5dd589e416ec682a63c8", - "sha256": "010vgf2dlafx3673dpcpy94273i65pffpn5rz5vqvh0k3wwxhqyn" + "commit": "a92d9e6f523f449314e72911ba300192a42fc4dc", + "sha256": "1np029bspw14lcv8qzzgfyqimjz697wx2isasad06qbnhqbyc84m" }, "stable": { "version": [ 0, - 2, - 3 + 3, + 0 ], "deps": [ "bibtex-completion", - "f", + "org-roam" + ], + "commit": "ed148cee7d09538664fd22fc6bdf72adbe225617", + "sha256": "0a7jhpmjkb4d66zakgajs5anr4nrhs94l60x62s5qdxh5dn0m7gh" + } + }, + { + "ename": "org-roam-server", + "commit": "40932819ae514a015f998a687d3cf651b30a79a1", + "sha256": "1bizzzmi1bx996n9g9rmkvpm229ipmpdacmh2jd3pvn8kx6252bm", + "fetcher": "github", + "repo": "org-roam/org-roam-server", + "unstable": { + "version": [ + 20200816, + 819 + ], + "deps": [ + "dash", "org", "org-roam", - "s" + "s", + "simple-httpd" ], - "commit": "02803c85cb312608172343c2d33bf9684d4bcefe", - "sha256": "0403ic5zc2sbrg3ryxk55n52ii4qzg1373h4j8bibfal2jv5i3ir" + "commit": "5ea3d1403bd68af49ac0593a8cdff7514595d025", + "sha256": "0ajsid9p5znxqz7bq39jbf779s46ymmxwpfki4yxpa9308pwjwgc" + }, + "stable": { + "version": [ + 1, + 0, + 4 + ], + "deps": [ + "dash", + "org", + "org-roam", + "s", + "simple-httpd" + ], + "commit": "fe0364ef63928337f442c1d987d17cfe9619df2d", + "sha256": "0a5b625i7gv467xm8p92nvrh2wzgmldm8gzcbrc15al1gvnwpbqm" } }, { @@ -72006,8 +73579,8 @@ "repo": "tyler-dodge/org-runbook", "unstable": { "version": [ - 20200504, - 648 + 20200523, + 2004 ], "deps": [ "dash", @@ -72017,14 +73590,14 @@ "s", "seq" ], - "commit": "fb4026df05b8e05c6aefd9483bec0e8f43d87d7e", - "sha256": "1qf0hpcscplpxd8xzf0yzkh87chbv3fgsfrr7bxh81g0akjiw03j" + "commit": "27dafe2a470d54a2c664164b5f9cbd2a1e5d921e", + "sha256": "1bl8f7azkr2657izhcwxy8w8jz7qs2wkk843q2bzzdzixqadlabs" }, "stable": { "version": [ 1, - 0, - 6 + 1, + 2 ], "deps": [ "dash", @@ -72034,8 +73607,8 @@ "s", "seq" ], - "commit": "53e8876a1587190ec4d103f9e94380f34797ce49", - "sha256": "1cyb956s3vshh2i4gd37m1cjxwq5s0xj55pwysgganwgxxw22c8n" + "commit": "27dafe2a470d54a2c664164b5f9cbd2a1e5d921e", + "sha256": "1bl8f7azkr2657izhcwxy8w8jz7qs2wkk843q2bzzdzixqadlabs" } }, { @@ -72084,11 +73657,11 @@ "repo": "lordnik22/org-shoplist", "unstable": { "version": [ - 20190809, - 2156 + 20200603, + 1515 ], - "commit": "9591a4747eb2e5cab53203a120f9b854c75e629b", - "sha256": "1b721xp6dn54x2j73ysnzw9qxd9fxpvnqiy2y0issmz6xmccgzac" + "commit": "e1e465ef815500140940c3a247d508b8f7dd09c5", + "sha256": "03a39q495ivxn0bc9wsdl61d2qlxs2w618d5f3lkny9567wcrxgx" } }, { @@ -72215,28 +73788,28 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20191224, - 1909 + 20200812, + 1341 ], "deps": [ "dash", "dash-functional" ], - "commit": "4c0f01a493a6dc9ab3fec50e0b458aa0d35464f9", - "sha256": "1c2vjxgscngg0k7qxr67ad0cws9yv88yhmdrn9qq4rxzc9fdjkzg" + "commit": "dc69138a42745aac79dec9e8de1b6aacde3a4511", + "sha256": "0vshlr6kzri4c86yd54g3xccgj6q0vbi920858lg5ij3si4a2z2x" }, "stable": { "version": [ 0, 2, - 6 + 8 ], "deps": [ "dash", "dash-functional" ], - "commit": "7ea72ec530a340af61da215327a7fbb66a07ad2a", - "sha256": "0y1i4zpgmk6i2nj5l6dvdvqkp5a8cww8y4vcpps85blj586xgby3" + "commit": "64ed31f7c012f37219f306a4b232de2767c1911e", + "sha256": "04zdh6rw07zy6mf69hy754vp8p7kp56ny56dcnsns8ay7dd581zj" } }, { @@ -72254,21 +73827,21 @@ "org-starter", "swiper" ], - "commit": "4c0f01a493a6dc9ab3fec50e0b458aa0d35464f9", - "sha256": "1c2vjxgscngg0k7qxr67ad0cws9yv88yhmdrn9qq4rxzc9fdjkzg" + "commit": "dc69138a42745aac79dec9e8de1b6aacde3a4511", + "sha256": "0vshlr6kzri4c86yd54g3xccgj6q0vbi920858lg5ij3si4a2z2x" }, "stable": { "version": [ 0, 2, - 6 + 8 ], "deps": [ "org-starter", "swiper" ], - "commit": "7ea72ec530a340af61da215327a7fbb66a07ad2a", - "sha256": "0y1i4zpgmk6i2nj5l6dvdvqkp5a8cww8y4vcpps85blj586xgby3" + "commit": "64ed31f7c012f37219f306a4b232de2767c1911e", + "sha256": "04zdh6rw07zy6mf69hy754vp8p7kp56ny56dcnsns8ay7dd581zj" } }, { @@ -72279,20 +73852,20 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20200508, - 654 + 20200720, + 715 ], - "commit": "38a74456af863e07ab0b838c10830ce796886302", - "sha256": "1zmmv4izv5na0y29a55df1fa309xj25jdvhpwir879pfa15807bl" + "commit": "58019b6dd1ae1323b72d491e65bf9636a9278dd6", + "sha256": "00yhgxg87mfaflrkh0i905hr873yd03a7znw5hkrps43zxha9kb9" }, "stable": { "version": [ 1, - 3, + 4, 0 ], - "commit": "afe250fc43cd1beffd7946b54692d712d9263ff2", - "sha256": "15iy3z8rglaqbx1fz14inh18ksgjsmq30b8hyv3lgjvcc9ssaiw0" + "commit": "58019b6dd1ae1323b72d491e65bf9636a9278dd6", + "sha256": "00yhgxg87mfaflrkh0i905hr873yd03a7znw5hkrps43zxha9kb9" } }, { @@ -72370,26 +73943,26 @@ "repo": "integral-dw/org-superstar-mode", "unstable": { "version": [ - 20200416, - 2354 + 20200818, + 2257 ], "deps": [ "org" ], - "commit": "09ddc28383d363a4b353348a433e24535b4af0e3", - "sha256": "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0" + "commit": "94f35c20f8b84a63defa145e3e6ae735fa33dd5d", + "sha256": "1aklp6nk05ghpq7ybsbvn28wrygfwqvq58k1hjll97nbhd7h0gyb" }, "stable": { "version": [ 1, - 2, - 1 + 4, + 0 ], "deps": [ "org" ], - "commit": "09ddc28383d363a4b353348a433e24535b4af0e3", - "sha256": "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0" + "commit": "94f35c20f8b84a63defa145e3e6ae735fa33dd5d", + "sha256": "1aklp6nk05ghpq7ybsbvn28wrygfwqvq58k1hjll97nbhd7h0gyb" } }, { @@ -72512,6 +74085,43 @@ "sha256": "11rfn0byy0k0321w7fjgpa785ik1nrk1j6d0y4j0j4a8gys5hjr5" } }, + { + "ename": "org-taskforecast", + "commit": "757def05a6104d8aab2dde9977762bdaef63241a", + "sha256": "1xbck5kdbfzjw55amjfxsjscmdj7yl3fyrfzgqpdicdih0fas7kz", + "fetcher": "github", + "repo": "HKey/org-taskforecast", + "unstable": { + "version": [ + 20200817, + 748 + ], + "deps": [ + "dash", + "dash-functional", + "org-ql", + "s", + "transient" + ], + "commit": "fc160ce255a98da36c59da4d49a628dd7f742087", + "sha256": "063myyg4p2qwbvhb8kcgnz15xp48rv8zhcb86kxh51bm92ifwgb0" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "dash", + "dash-functional", + "org-ql", + "s" + ], + "commit": "036da7c14e0defb85917293f00a5fa9ac0977da4", + "sha256": "0lz6c1hq35qw44fllzsrzv9p4r4sjikciyzvi6nyf0fw189b0c4h" + } + }, { "ename": "org-tfl", "commit": "d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf", @@ -72582,15 +74192,15 @@ "repo": "leoc/org-time-budgets", "unstable": { "version": [ - 20151111, - 801 + 20200715, + 1016 ], "deps": [ "alert", "cl-lib" ], - "commit": "1e81ea29af1ccc7b4ddb42fe4e3fbfc0adf891b0", - "sha256": "0cqk9q26qby2y1l6x39jfrdrw9x9419mlx2zhndmlb6gv3lv35f9" + "commit": "1d6bfc323013bbf725167842d9e097fad805de03", + "sha256": "0cny7ck4acj8s2l6hzp48mvz0v0yk7q91mmzxn8vgrggsb02qm5k" }, "stable": { "version": [ @@ -72734,11 +74344,11 @@ "repo": "takaxp/org-tree-slide", "unstable": { "version": [ - 20200114, - 2334 + 20200611, + 1143 ], - "commit": "7bf09a02bd2d8f1ccfcb5209bfb18fbe02d1f44e", - "sha256": "1pzgb1z5k8zsbdqiaa7l94xlrncji1l09zqxvq62fyc0slxcf4ix" + "commit": "7126a4365072a32898f169ead8fb59265dabc605", + "sha256": "0lbqq3kzh8pd991c3s76parsl49ci5sclfq3sx0aqbcla0qzvh3y" }, "stable": { "version": [ @@ -72850,11 +74460,11 @@ "repo": "flexibeast/org-vcard", "unstable": { "version": [ - 20191130, - 703 + 20200720, + 638 ], - "commit": "4f5d71225e946999f45ac9f96996705fee83df5a", - "sha256": "1w8miq52d2rlyslbss5173gnbv7rmkn2cicd9h272v6ybb585hcd" + "commit": "1ae97371b207dabfecaf6b4f7118abafe6cc5e2b", + "sha256": "0k9slz20gxcdpvpz8kgvvwff6cif74wybpqgg9x03wqqqda3f37v" }, "stable": { "version": [ @@ -72874,11 +74484,11 @@ "repo": "tesujimath/org-wc", "unstable": { "version": [ - 20180610, - 253 + 20200731, + 2244 ], - "commit": "0716c1e8276f6953e139e357e97566e792c8be19", - "sha256": "0wx4z6y3wn6948bz2pgrpffd4jzwgplvjkh0rnra4gihrapg1bv8" + "commit": "dbbf794e4ec6c4080d945f43338185e34a4a582d", + "sha256": "0j58591jnj182hps1zc9an692hhnxinlpbw762l7xdc0sa5pjrgb" } }, { @@ -72963,20 +74573,30 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20200516, - 1341 + 20200819, + 708 ], - "commit": "c8c66a97e9adf84a4778f68e100259eaba67905b", - "sha256": "1h5ivbvzj46zkl3rgvcc0l50bn161g2q17miybm1mk70574q9fwn" + "deps": [ + "dash", + "org", + "s" + ], + "commit": "d6f2d1ebcfe0b6ccb3a799f04ba6842ca86c9115", + "sha256": "1lkf497qpydvw5f7vi0v7yr43j9v03hys16qz6nsqkbizr54b5jh" }, "stable": { "version": [ 2, - 2, - 1 + 3, + 4 ], - "commit": "c8c66a97e9adf84a4778f68e100259eaba67905b", - "sha256": "1h5ivbvzj46zkl3rgvcc0l50bn161g2q17miybm1mk70574q9fwn" + "deps": [ + "dash", + "org", + "s" + ], + "commit": "d6f2d1ebcfe0b6ccb3a799f04ba6842ca86c9115", + "sha256": "1lkf497qpydvw5f7vi0v7yr43j9v03hys16qz6nsqkbizr54b5jh" } }, { @@ -73009,8 +74629,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20200317, - 2136 + 20200814, + 543 ], "deps": [ "htmlize", @@ -73018,14 +74638,14 @@ "metaweblog", "xml-rpc" ], - "commit": "60eae1c8a7f82fbcc2660d785b33601daaa29f4b", - "sha256": "06ia4ba6c1yph259wr4y5sdkl1ry6pzbwhx807ia675rp0clp9hz" + "commit": "a56346bf1517118b2a960eaadbf138ae1695ddd1", + "sha256": "09iycpdj6dkvz5axfx85bkrrf5128ws7clg1jn9yli06rjsw36ba" }, "stable": { "version": [ 1, 1, - 8 + 10 ], "deps": [ "htmlize", @@ -73033,8 +74653,8 @@ "metaweblog", "xml-rpc" ], - "commit": "0177fc4e7edd705db59b82c83a24db51dc405890", - "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1" + "commit": "19aa8a17428d6ee42f54e464c26eeab17a6478ab", + "sha256": "198ahgxji0kh6ynygrrdvllj9fwcqrnma4sd8msj2aq18xij9glr" } }, { @@ -73099,32 +74719,28 @@ "repo": "ardumont/org2jekyll", "unstable": { "version": [ - 20200516, - 1727 + 20200622, + 1519 ], "deps": [ "dash-functional", - "deferred", - "kv", "s" ], - "commit": "36d7789b7b3dfa2f4739a83692d322b601a0f4ea", - "sha256": "1j1cckvvghz9656bjkdxrc3gsfpz1wjvq3hlh6zblmnlbhhvbsan" + "commit": "571249c977e0340edb3ef3af45b7841b62ec8065", + "sha256": "1hjqawygbmvdlvzi908b2l4k7ca3g0dg32mpk7vld8xwi49hb1kp" }, "stable": { "version": [ 0, 2, - 2 + 7 ], "deps": [ "dash-functional", - "deferred", - "kv", "s" ], - "commit": "7be4a71ce55f2fdc7fe7f6414f03d58f19d43410", - "sha256": "0cxhmbbznvv9d3nmqfn0ggr164fa6yjbfac9wqi3c58vm3zri00k" + "commit": "c05ba707190cfab20938afd1b5d4966511ca63b7", + "sha256": "03ddrc40qab285i7sj438kicaxxmixkk0b6d8512cn44f42zczyq" } }, { @@ -73179,11 +74795,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20200510, - 1645 + 20200717, + 1937 ], - "commit": "2a88a70a5c2a57150c80d306f2475e351a59039c", - "sha256": "1y3g180q96vx7l8qs0l2jwjv2wbmk6aqzfm2p1h130h05lhgv31w" + "commit": "01fe614086e31e166d2a2f1d6b34e301f060458e", + "sha256": "1hsidgcyqsbm96gh0nfrdpnm4vq1sw8777d0zslsczr1fp51il6d" } }, { @@ -73194,30 +74810,28 @@ "repo": "jcs-elpa/organize-imports-java", "unstable": { "version": [ - 20190922, - 1520 + 20200717, + 757 ], "deps": [ - "cl-lib", "f", "s" ], - "commit": "8299bdfd65105feb8d7fb85d2951954d73671cd2", - "sha256": "023gkvhaxx54gcfz6m3pc0yhygf2y43391r1dghivk8420savdjg" + "commit": "c431b338d34c94345217b2b904d9c6f331d4015c", + "sha256": "1dqvx49lcfi5472aq17nd7y7v7d2ljxcmy5zhks2mfbhhzgdp8n6" }, "stable": { "version": [ 0, 1, - 3 + 4 ], "deps": [ - "cl-lib", "f", "s" ], - "commit": "de094d6d56c85aa9820c77055b54287ae6b46d20", - "sha256": "0hgdgz1jx292dfxcm1av4v9v6400jpnyp1j21d4fzfi0wj2srfrr" + "commit": "c431b338d34c94345217b2b904d9c6f331d4015c", + "sha256": "1dqvx49lcfi5472aq17nd7y7v7d2ljxcmy5zhks2mfbhhzgdp8n6" } }, { @@ -73260,29 +74874,64 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20200417, - 1720 + 20200714, + 1943 ], "deps": [ "magit", "org" ], - "commit": "e147f055772cc934fe1f1d8619059badeb647c93", - "sha256": "1q3v22drqbjzzr6d0zdwczz1rq37iyh78k2nk1wirbs5z4ixfyx8" + "commit": "ac9b1a42863a864fde9d225890ef5464bffdc646", + "sha256": "08amzcvw483dpfq5r34ysn84wzd538qk0jblc94vgcaidspx6481" }, "stable": { "version": [ 1, 6, - 0 + 3 ], "deps": [ - "dash", "magit", "org" ], - "commit": "e7cddf39e301c87c36c7de13e429dee74874d5c8", - "sha256": "00s3a8i221didw8phlbvdvihj9pxkq9k9j9vh1g1mzd7cz58dm07" + "commit": "ac9b1a42863a864fde9d225890ef5464bffdc646", + "sha256": "08amzcvw483dpfq5r34ysn84wzd538qk0jblc94vgcaidspx6481" + } + }, + { + "ename": "orgit-forge", + "commit": "d180f7bb9d937d574726326b788f3721266e31a8", + "sha256": "1v1a8cz2r84f9y1arzlhpff2fkqyx598pd1lqf81fr6l6l2y9j5n", + "fetcher": "github", + "repo": "magit/orgit-forge", + "unstable": { + "version": [ + 20200621, + 2144 + ], + "deps": [ + "forge", + "magit", + "org", + "orgit" + ], + "commit": "63a19d1df1434e583aac1329ba4dcfa2ee59d7c1", + "sha256": "1vd7wnas53z0985if22sv0wpww2dp0g8b0z9hwlzdhlcrsjay5fz" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "forge", + "magit", + "org", + "orgit" + ], + "commit": "63a19d1df1434e583aac1329ba4dcfa2ee59d7c1", + "sha256": "1vd7wnas53z0985if22sv0wpww2dp0g8b0z9hwlzdhlcrsjay5fz" } }, { @@ -73293,28 +74942,28 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20200413, - 2124 + 20200719, + 917 ], "deps": [ - "dash", - "org" + "org", + "seq" ], - "commit": "a5f5da06174d22dc21bbac167a8c2361fa84bf2b", - "sha256": "0sxali4vnqzk6mj0m7d82yr2ixvxxj5lzmxffyznpa7j6yndi2mm" + "commit": "2f1939488204f67d2a427f224b45596361b402b1", + "sha256": "0ipy1p2cr5i0465hchqazmgn9jrgwzbyrb3prfgkl7z2m1gd7fcg" }, "stable": { "version": [ 1, 1, - 4 + 6 ], "deps": [ - "dash", - "org" + "org", + "seq" ], - "commit": "988ad54db45708b0fe835829d512eb6d5f6cf161", - "sha256": "1mswfbwz7fm9lriab365g7hq8hn85gxcsg8y41by9j0n8hb3hj5q" + "commit": "2f1939488204f67d2a427f224b45596361b402b1", + "sha256": "0ipy1p2cr5i0465hchqazmgn9jrgwzbyrb3prfgkl7z2m1gd7fcg" } }, { @@ -73364,11 +75013,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20200516, - 1344 + 20200708, + 2131 ], - "commit": "7426df13512f5eee921c26aa68cfc6e32e3061fc", - "sha256": "18n2xzwpqq8159qwqy7hy0b93a5qxdb5rjh0ls4jk8lmahk5jrqk" + "commit": "99c6bc8c9b72dc9ce886a09540ed24ec83bcc056", + "sha256": "03q02cxz76wnx20rhwqiysxnskzs7caw428ij3jj4nsmjkhxdfv0" } }, { @@ -73394,14 +75043,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20200512, - 721 + 20200708, + 2127 ], "deps": [ "cl-lib" ], - "commit": "5bfe2f6d53798d0fe071f9990e03d7428623e4a7", - "sha256": "16xcps2qlzh5z8c20sl0cnc0mlj8153vk6j1dnfd6l3a6kni88af" + "commit": "1aa352a09a2c543352fceb32a505c44e080efcb3", + "sha256": "0aczwlssnhn1xpgk3s7l2smrxmhb8af6gg9xjdsfysss4ybbcgy6" } }, { @@ -73448,6 +75097,35 @@ "sha256": "0ycjbsn03cjzx6adabcvi1j7f92yhx3xjzj3xc68m1hw9r2f2gzf" } }, + { + "ename": "origami-predef", + "commit": "0cda4d6554f8c99928973a0bf718766b7135ffeb", + "sha256": "1wr0fs0a2p43yr9fsbdm52z767rbj4j1w3m25w299zf71h263pc9", + "fetcher": "github", + "repo": "alvarogonzalezsotillo/origami-predef", + "unstable": { + "version": [ + 20200615, + 1044 + ], + "deps": [ + "origami" + ], + "commit": "edcba971ba52a14f69a436ad47888827d7927982", + "sha256": "1r3dbnjwmg7y1zsimvqw3bi4168ikwdd5fqkjqd6gm905w32hwc0" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "origami" + ], + "commit": "edcba971ba52a14f69a436ad47888827d7927982", + "sha256": "1r3dbnjwmg7y1zsimvqw3bi4168ikwdd5fqkjqd6gm905w32hwc0" + } + }, { "ename": "ormolu", "commit": "ab315f96d9b8d01ffc3b4748d01c70861daf8c1a", @@ -73466,6 +75144,39 @@ "sha256": "1j7q9rmcn6fkhbcvfh8w4y9dir2y0hhhqmjpsafs8m4zm1rvffbn" } }, + { + "ename": "osa", + "commit": "df18def95ae792387da2e21f1050cfc25af772fb", + "sha256": "1knzkwvdq9wwy2x7kgl1nf0p564247l2y82ms77r0j5vfqhsfd9s", + "fetcher": "github", + "repo": "atomontage/osa", + "unstable": { + "version": [ + 20200522, + 2103 + ], + "commit": "615ca9eef4131a23d9971691fa0d0f20fe59d01b", + "sha256": "1p651fqivyfyqjs6zz9p4n19r9d23xiswhyjz7r93llmsqs702qi" + } + }, + { + "ename": "osa-chrome", + "commit": "b9c83566892095706033869da370a12e8eccc590", + "sha256": "1spihfihcd5iblsl1xp19ayk65mn9ik32jlqn2pg15jwhyfmvyfs", + "fetcher": "github", + "repo": "atomontage/osa-chrome", + "unstable": { + "version": [ + 20200627, + 1344 + ], + "deps": [ + "osa" + ], + "commit": "07894b9cb40171702b4c89b75542af1f1ac1403c", + "sha256": "0brhn6qlminzamwl90ynaik03xvaw3rlkdccdyxfpckjd5npa9wr" + } + }, { "ename": "osx-browse", "commit": "081aa3e1d50c2c9e5a9b9ce0716258a93279f605", @@ -73729,20 +75440,20 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20200429, - 2055 + 20200720, + 1954 ], - "commit": "b616b0d90a7c3d7b87bd164f2d213a5e009c39eb", - "sha256": "1b2mjzym8x42rz3qvmr0va21naw3aycvc2blfxx91i7pwpp8n3qg" + "commit": "cb9c529bb992c6f60b054caf4e993b03c7b3ba9e", + "sha256": "1s76zfzpwhcql2c4kr5maxc53vznqw6p7hx9n8nihxjgz2rywcas" }, "stable": { "version": [ 0, - 1, - 3 + 2, + 1 ], - "commit": "d6247aaec44f60a9bd161c1d56960f80ab314a49", - "sha256": "0mscnbbv6cap818zhzz3ig6ychrw0zw84zyl2g1rksir0qj4hznf" + "commit": "cb9c529bb992c6f60b054caf4e993b03c7b3ba9e", + "sha256": "1s76zfzpwhcql2c4kr5maxc53vznqw6p7hx9n8nihxjgz2rywcas" } }, { @@ -73975,11 +75686,11 @@ "repo": "fishyfriend/owcmd", "unstable": { "version": [ - 20200427, - 633 + 20200517, + 2039 ], - "commit": "cdd2280f34328f65fe470046c928b0018914584a", - "sha256": "15601vbng2vn45zcdp51vkgycfpcfkaw0xidrq13rg5544x9h7lz" + "commit": "05fb8f8f81838b5888fdec8b3947096dd2222e61", + "sha256": "0y9ldprxhp6nq8m5bxmhw4iq4n78wvdx2jmr5w9wbd0znvi4cbfz" } }, { @@ -74064,8 +75775,8 @@ "htmlize", "org" ], - "commit": "bd36f9fb4e3b1b9e8686b993b02ccd780ff75a96", - "sha256": "03wj3gx09lbfmsanfhqfbzz61zaszia1mhfvlywhygknpagxr3lp" + "commit": "f5eac28734ea33d0b7a3dbe10b777907a91cf9f9", + "sha256": "05ndpkqr4kh2942ygjsa1w53056d60qvl0gmp30dxmzc57v0wb2x" } }, { @@ -74175,14 +75886,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20200501, - 1317 + 20200722, + 1939 ], "deps": [ "org" ], - "commit": "8f36181977377383cb54803651d93b24e370122d", - "sha256": "1rxkbkgvylwnh5n6zc6hiqa9zhxwc8j1if7mxribw44xrg3150a1" + "commit": "75b849e9561c4a6022babf6eaf0e037310ded7c1", + "sha256": "1xsxljf99h2pyvpp9gvma6g42q1n2xmhnwvpmciwj5rajw5xqc5v" }, "stable": { "version": [ @@ -74198,10 +75909,10 @@ }, { "ename": "ox-impress-js", - "commit": "e5e79b4b897daca80f26440107abaddf0a480db9", - "sha256": "0p0cc51lmxgl0xv951ybdg5n8gbzv8qf0chfgigijizzjypxc21l", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1n7g5ykn95565z7kp83pqvm4y8r4p1jmwh0g7pl3kbw48y1521vc", "fetcher": "github", - "repo": "kinjo/org-impress-js.el", + "repo": "nullpofy/org-impress-js.el", "unstable": { "version": [ 20150412, @@ -74271,14 +75982,14 @@ "repo": "stig/ox-jira.el", "unstable": { "version": [ - 20200218, - 2301 + 20200616, + 2310 ], "deps": [ "org" ], - "commit": "00767df8ba024eb1ef09fe16c3aed30d729d6add", - "sha256": "0fbic43vzp0dp8wbx12cq22ca192v2jl2w131xcqmbhbww6j5xv2" + "commit": "e9a47ef51862f11a5c006cf9e8c5f4ec5517aced", + "sha256": "1ws3myl2z6vv3idq28m8q97zlrmsfg5z3i8y3adsbm56ga9jqvdj" } }, { @@ -74340,6 +76051,25 @@ "sha256": "15wxyzsfp4gilnravs2h4h8vwk0rf8ylzsxzdzlqx0i62wbb79l9" } }, + { + "ename": "ox-leanpub", + "commit": "20e1ea346ac6d912e3fbb597b7c65c98a6785132", + "sha256": "10nz3dy7dmy8p70fsglbc0gdfhhvr286wby5yccjfaacjkg77ifj", + "fetcher": "gitlab", + "repo": "zzamboni/ox-leanpub", + "unstable": { + "version": [ + 20200818, + 1116 + ], + "deps": [ + "org", + "ox-gfm" + ], + "commit": "8c8d026aa3a31cb6dcd2530ac5902e551b161343", + "sha256": "0i88bzcczvhsylcbk7nwx19gn6ydiw8vrgwl2p5njm10vngrjlny" + } + }, { "ename": "ox-mdx-deck", "commit": "13d1a86dfe682f65daf529f9f62dd494fd860be9", @@ -74471,14 +76201,14 @@ "repo": "0x60df/ox-qmd", "unstable": { "version": [ - 20170402, - 1657 + 20200813, + 408 ], "deps": [ "org" ], - "commit": "3a24c7a0b3ec80e494b977e14a3dfb94c9f1d8ec", - "sha256": "030nay81c49ings96akzzy108a6agg91rvpmg0pf05qmjysfysmf" + "commit": "8c3d8ce2a21044fc85e5e4e06be0220900d7ba4f", + "sha256": "1j6zmjy3s2l2wj500q9i75xd3hf8wlh04ycmmad45swrkgp70f2s" } }, { @@ -74489,14 +76219,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20200429, - 1533 + 20200802, + 710 ], "deps": [ "org" ], - "commit": "e8b2801ab2210187ab1cfacad09bb07e4b61ca56", - "sha256": "0xa34y0v6z78gpida59jc3gzng68n0has5dnkccv4vdxi4yb6ii9" + "commit": "553e1a9d678e74c2646e4c19bd9f6c08d8a00486", + "sha256": "18khlffdmg88pd50vwg00vz143ysqhkdkvva9h4bkw618inz70wq" } }, { @@ -74525,14 +76255,14 @@ "repo": "msnoigrs/ox-rst", "unstable": { "version": [ - 20191013, - 551 + 20200815, + 1511 ], "deps": [ "org" ], - "commit": "9158bfd18096c559e0a225ae62ab683f1c98a547", - "sha256": "11v1h45ipjh95ksk6cdgp0azfmb7y3i8hdd46m7psmda08x8kqm5" + "commit": "99fa790da55b57a3f2e9aa187493ba434a64250e", + "sha256": "0dxadzbha2fvg42jh4ng8hjb582mv7avlzmpxlzf32qxf6x8r638" } }, { @@ -74683,20 +76413,20 @@ "repo": "marsmining/ox-twbs", "unstable": { "version": [ - 20191216, - 1011 + 20200628, + 1949 ], - "commit": "cf56accf8633f72c741fff19a49c24cc8bdd8974", - "sha256": "12w58nvpzn0fbica3m679n08hczzikqr1xi1n4k7a6h1l60qykl7" + "commit": "e8a27dc78b7be494d9918f26db7a3bbb6b45020b", + "sha256": "0nffy7ivs8fw0dj3s66hbsby0riz5wrv7xzm8g9mrfvhki938pqa" }, "stable": { "version": [ 1, 1, - 2 + 4 ], - "commit": "cf56accf8633f72c741fff19a49c24cc8bdd8974", - "sha256": "12w58nvpzn0fbica3m679n08hczzikqr1xi1n4k7a6h1l60qykl7" + "commit": "e8a27dc78b7be494d9918f26db7a3bbb6b45020b", + "sha256": "0nffy7ivs8fw0dj3s66hbsby0riz5wrv7xzm8g9mrfvhki938pqa" } }, { @@ -74877,14 +76607,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20200426, - 2253 + 20200601, + 1939 ], "deps": [ "cl-lib" ], - "commit": "5fe5156491145c667286cb92be4191a348eaa31e", - "sha256": "1r9ir8jqfi2sqjjx9yxs4phxrpfw8x35nm58xfrqsjw158dspzai" + "commit": "4cb0f98a21729f9ef0189f095384555c9d2b6fe4", + "sha256": "0ij6p7i5x0fs0yn8zxcx7gf9ldanflh7mj7mblr8snpgbzx3jwnz" }, "stable": { "version": [ @@ -74921,27 +76651,27 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20200419, - 406 + 20200816, + 24 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "495da67557d35acb146ec1f38f7576126aec6bfc", - "sha256": "0nb83rs2hb097pvv63pkvdlyqx136mrcbzdjkyskwg3rd3rwvimq" + "commit": "c4b16a90196d6d83d6ba668923c1ce725e13a5d6", + "sha256": "0kz8snjl0802ypxzag2n7552f6ssmj0hxx4lkal4v421pr2cqka6" }, "stable": { "version": [ 0, - 12 + 13 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "f86705d0d4ed81ea8ea14e00fe59714f11f7c2ba", - "sha256": "00inrfla7f824yh10rxlr0xq1cmyqigppsrfspd637d58239l6sw" + "commit": "9e28a5cd08e94db0ba4fb8847fa970c98316facc", + "sha256": "03pim9ijqmjqyv0qlkap5jw47iv9qsw1d7s2p9vrqjnpf4jxcq70" } }, { @@ -74958,19 +76688,19 @@ "deps": [ "package-lint" ], - "commit": "495da67557d35acb146ec1f38f7576126aec6bfc", - "sha256": "0nb83rs2hb097pvv63pkvdlyqx136mrcbzdjkyskwg3rd3rwvimq" + "commit": "c4b16a90196d6d83d6ba668923c1ce725e13a5d6", + "sha256": "0kz8snjl0802ypxzag2n7552f6ssmj0hxx4lkal4v421pr2cqka6" }, "stable": { "version": [ 0, - 12 + 13 ], "deps": [ "package-lint" ], - "commit": "f86705d0d4ed81ea8ea14e00fe59714f11f7c2ba", - "sha256": "00inrfla7f824yh10rxlr0xq1cmyqigppsrfspd637d58239l6sw" + "commit": "9e28a5cd08e94db0ba4fb8847fa970c98316facc", + "sha256": "03pim9ijqmjqyv0qlkap5jw47iv9qsw1d7s2p9vrqjnpf4jxcq70" } }, { @@ -75128,8 +76858,8 @@ 20200305, 244 ], - "commit": "314b397910b3d16bb7cbcc25098696348e678080", - "sha256": "106w2n01i9d6z2r43lwwrm7hlppi9bkf8g8nsqd91f0f06921plw" + "commit": "f8c4cd7fc67638ae4113551dcffdf87fcd252d9b", + "sha256": "1jh7mdry3ysgl9dvrrbx7b9f5dh4bm6gccibpcdnm9pgpfj2bm29" }, "stable": { "version": [ @@ -75181,11 +76911,11 @@ "repo": "danielsz/Palimpsest", "unstable": { "version": [ - 20200211, - 641 + 20200804, + 2308 ], - "commit": "389ec5b4c5067fa903c543b7fe1d804f30b6ced5", - "sha256": "1yki1sl2m7fj4m52gmb768h2qkv0j93lmd72jv21n20bnzvjp73v" + "commit": "f474b3ad706373d9953abdc401d683a2a023d28e", + "sha256": "0wzxl1zcbm3svspjpjzvx92is1k9sz7g0a99r8q066j2364la0zh" } }, { @@ -75252,11 +76982,11 @@ "repo": "sebasmonia/panda", "unstable": { "version": [ - 20200424, - 2206 + 20200715, + 338 ], - "commit": "bdd9f80283d8ae4a69f8789e5f18b1560b94fe43", - "sha256": "1ld4igmmjk7p7dxm0mnfks3k0cqpqjxrvlmjdi0m7w11ba8dsah9" + "commit": "6508ac3228975c39d10a1caa70b9ce34ff3ed21d", + "sha256": "019nigy5yh1qrzw0agp2kgjfpfm503fgkj07c9m2xqs9hww781x1" } }, { @@ -75440,14 +77170,14 @@ "repo": "ajgrf/parchment", "unstable": { "version": [ - 20200514, - 2047 + 20200812, + 1259 ], "deps": [ "autothemer" ], - "commit": "4fa14adbc043497fc942568fdb78505ca549e5b7", - "sha256": "1ply18yzdf1lxyia8knn6fk8wb4yzwicgdiscr2z87bpk8p5d2pb" + "commit": "271ab4b7d023d730e3d684a1505cc77e2d0cc14a", + "sha256": "138n4fs33cv2ly89cvs7lkh372kghldhw8pw18zsi39qfvggw6wm" }, "stable": { "version": [ @@ -75470,8 +77200,8 @@ 20191121, 2328 ], - "commit": "814999bb320e6d5aaa9c8ff663b1933157129571", - "sha256": "0jb3qwx8bxr7x17cgqbd6v53634i9lmrcnqn847bnnlsvy0j094x" + "commit": "8330a41e8188fe18d3fa805bb9aa529f015318e8", + "sha256": "10zm5nfs8sx1cmjifjcy6xj3285hx1936xc3kbf6ndzpcqgb9yd5" }, "stable": { "version": [ @@ -75622,6 +77352,30 @@ "sha256": "0v97ncb0w1slb0x8861l3yr1kqz6fgw1fwl1z9lz6hh8p2ih34sk" } }, + { + "ename": "parinfer-rust-mode", + "commit": "b35f28995db0c21ecaadd5504a10aa2ee5ac2070", + "sha256": "06003hh19k1087s8lvsbl04as2yph1zw9qr844s4rbyi838d4pc1", + "fetcher": "github", + "repo": "justinbarclay/parinfer-rust-mode", + "unstable": { + "version": [ + 20200802, + 2026 + ], + "commit": "9e2e91cf1697582a396a5365f24d74634acfc744", + "sha256": "1ii73zlpdvi5fxp6ajyn8h7xvxgc5iz58zr5g4vk0flm1vw6v5kn" + }, + "stable": { + "version": [ + 0, + 8, + 1 + ], + "commit": "9e2e91cf1697582a396a5365f24d74634acfc744", + "sha256": "1ii73zlpdvi5fxp6ajyn8h7xvxgc5iz58zr5g4vk0flm1vw6v5kn" + } + }, { "ename": "parrot", "commit": "b1b393ffb9b7691e8fc99bee5fc676463038a68d", @@ -75669,28 +77423,26 @@ "repo": "jcs-elpa/parse-it", "unstable": { "version": [ - 20191209, - 549 + 20200720, + 1047 ], "deps": [ - "cl-lib", "s" ], - "commit": "ff9f9049ac039473f0ba5d070ac0e6d89cfbf851", - "sha256": "05ckrhkxffzcz1igqwznbkxc1hpidvsnwv6cxp8n4q6kmniagx4i" + "commit": "abf2b7528ea2ec5c45f99664a6ab9509ccd954f3", + "sha256": "1v4a07gnaccqnl1r0r8yhw6ka6f8nh0p8j0lr562ik6cbfljf04a" }, "stable": { "version": [ 0, 1, - 7 + 8 ], "deps": [ - "cl-lib", "s" ], - "commit": "318cb29153c6ae0032ddceb69bb8c1f2a7df5ef6", - "sha256": "0f2fjb0a0yj62dy3j820fgxlpg2gsv1awaswwrb2rv7mp44drr4f" + "commit": "abf2b7528ea2ec5c45f99664a6ab9509ccd954f3", + "sha256": "1v4a07gnaccqnl1r0r8yhw6ka6f8nh0p8j0lr562ik6cbfljf04a" } }, { @@ -75933,8 +77685,8 @@ "s", "with-editor" ], - "commit": "07b169ec32ad6961ed8625a0b932a663abcb01d2", - "sha256": "1dl3bck16zwhpspjrms11dknqgadnmpjqhcplkvv3v4f7vbnij6v" + "commit": "06f499994071bb6131244218b25d637103afe1d5", + "sha256": "05w0jkl7m55h30szvgknbwg7xayilk4bh3nf70hrsy3czisxmccx" }, "stable": { "version": [ @@ -76568,29 +78320,6 @@ "sha256": "1b7csqypqkalkzq6vrbq5ry1gdk0qnhnk43rlj514mph0s1nywdd" } }, - { - "ename": "peg", - "commit": "9b9b55a02e903ae7e75f8b636fdb1cf907c5db7c", - "sha256": "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm", - "fetcher": "github", - "repo": "ellerh/peg.el", - "unstable": { - "version": [ - 20150708, - 641 - ], - "commit": "081efeca91d790c7fbc90871ac22c40935f4833b", - "sha256": "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n" - }, - "stable": { - "version": [ - 0, - 6 - ], - "commit": "081efeca91d790c7fbc90871ac22c40935f4833b", - "sha256": "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n" - } - }, { "ename": "pelican-mode", "commit": "aede5994c2e76c7fd860661c1e3252fb741f9228", @@ -76639,14 +78368,11 @@ "url": "https://hg.serna.eu/emacs/per-buffer-theme", "unstable": { "version": [ - 20191101, - 2333 + 20200527, + 1256 ], - "deps": [ - "cl-lib" - ], - "commit": "7df4d2f4be64dbcf0bf10a2b9ac3db858fbcd9c8", - "sha256": "04s14x3qi5aa18bfcr3zjbb109nm2pgwgnl36g7fw2crj8mz03v4" + "commit": "f29b5c57198ebfedbf142f95129190c6c00b4822", + "sha256": "0b39m8zmy4yfj3z93q3gqqqhhmyb10kd76fl7347pm6xgq4sl1g0" } }, { @@ -76793,11 +78519,11 @@ "repo": "Bad-ptr/persp-mode.el", "unstable": { "version": [ - 20200222, - 1106 + 20200617, + 2154 ], - "commit": "391a7dc248c9c04b7ad424c696bdff578e14dd2c", - "sha256": "0b4y7a6j70s9lvr37riyy9k5kh3yvmx0m6nd9c0c8572ji4ij65g" + "commit": "14325c11f7a347717d7c3780f29b24a38c68fbfc", + "sha256": "1kb5v7pl2vhx6zdwf9kip38qjk8nkd9xpgdy74q8p3c56ap9lg6g" }, "stable": { "version": [ @@ -76871,25 +78597,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20200513, - 1416 + 20200814, + 554 ], "deps": [ "cl-lib" ], - "commit": "1fc13646623f42e1d70cf1f651c4b154e12070ca", - "sha256": "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g" + "commit": "74e811ccbada09dd9a3d90b983e78d146542121b", + "sha256": "1xfcm69nd6f9chwlqfz5vd8nnyl5mwharxjrn1m515568dqrk62x" }, "stable": { "version": [ 2, - 8 + 10 ], "deps": [ "cl-lib" ], - "commit": "1fc13646623f42e1d70cf1f651c4b154e12070ca", - "sha256": "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g" + "commit": "74e811ccbada09dd9a3d90b983e78d146542121b", + "sha256": "1xfcm69nd6f9chwlqfz5vd8nnyl5mwharxjrn1m515568dqrk62x" } }, { @@ -76929,8 +78655,17 @@ 20200321, 504 ], - "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023", - "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih" + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "43447a2c70f98edd1139005e32f437d3f142442b", + "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a" } }, { @@ -77039,15 +78774,15 @@ "repo": "emacs-php/phan.el", "unstable": { "version": [ - 20191125, - 1408 + 20200805, + 356 ], "deps": [ "composer", "f" ], - "commit": "2a6e1b66c2aad25fddb8b4f706a28a1aafaaa4c7", - "sha256": "1ivkkmjg9drp22l5hvira5m0ialca8kzw6pzj01wm4ykqsaajnlf" + "commit": "b7d523630bb072c4dbcfa9995dc734b25b72a69f", + "sha256": "0xif2hmlfcnhf716964zmzzldxsyhmpp2y40i9l1cxlcliszwscv" }, "stable": { "version": [ @@ -77071,14 +78806,14 @@ "repo": "zk-phi/phi-autopair", "unstable": { "version": [ - 20191220, - 311 + 20200816, + 535 ], "deps": [ "paredit" ], - "commit": "5685b9541c4c9d4cc8a892743fdf245aceea1682", - "sha256": "16kib35s7pffcs8kiljydbf5z1qq5l2d04dqqcnbbi0539y979n5" + "commit": "3e78793f9c480adf79b12d441fae5571e97b9e5f", + "sha256": "003dnixrnn7qcm25dbibc4rc8yrqsj9jci9rxp9l7ci6ya1bi0i2" } }, { @@ -77089,14 +78824,14 @@ "repo": "zk-phi/phi-grep", "unstable": { "version": [ - 20190920, - 908 + 20200816, + 1027 ], "deps": [ "cl-lib" ], - "commit": "06b740e3fb20074be9bae87530f5616a122c3aca", - "sha256": "0lwqlz6jp44dq7yhj5yvfrhnjlxlihkpqjil6d2ma20b2946n9ny" + "commit": "d9dbf69dcf0e06944dcfb89375b09d0d2b0ef4ee", + "sha256": "1lgixvg5668kb1y8a2xxm1nlbppj5a8sswjrcxasqnxmrif6lkls" } }, { @@ -77107,11 +78842,11 @@ "repo": "zk-phi/phi-rectangle", "unstable": { "version": [ - 20151208, - 654 + 20200816, + 650 ], - "commit": "0c12716afc71d803d1f39417469521dc465762d9", - "sha256": "0d2c579rg8wdfmn94nzaix9332jch4wlr939jszls330s38d0iv4" + "commit": "4ea8b40a614c1cc9087b9c0bd924a2d9d6cc0a83", + "sha256": "1ajjdpx4xbgig11380lyy10gqfmp23k5zwb77pwdl1rhapsdpjp8" } }, { @@ -77144,14 +78879,14 @@ "repo": "zk-phi/phi-search-dired", "unstable": { "version": [ - 20150405, - 714 + 20200816, + 1542 ], "deps": [ "phi-search" ], - "commit": "162a5e4507c72512affae22744bb606a906d4193", - "sha256": "1b44947hncw4q42fxxrz6fm21habzp4pyp0569xdwysrx2rca2fn" + "commit": "f014a9fb0b6a94af2df0e22f91ef79ce6996afd7", + "sha256": "0ivb7d33qajccvs1sz4fc3h031qkqmz8w93k6di47qyfzd4vrvjm" } }, { @@ -77347,17 +79082,17 @@ }, { "ename": "php-mode", - "commit": "2e41dc09413eaa93704e7d9f55bd2bd01f658806", - "sha256": "1gqmcynz2wx09xjnk70db1a2pbnrh1vfm5vd6mks1s10y59bh0zq", + "commit": "5593a586ce7579fd3a136e2416b89721157f98e1", + "sha256": "1xa9dmjinm6qm4cbzqanw5njmif71sg3jxnvgvi17jj9j3125d9f", "fetcher": "github", "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20200507, - 1755 + 20200812, + 1129 ], - "commit": "a7687e454adc2e6c1e13d90beac122af32169eb8", - "sha256": "1nlikgyflksdzbd8k2l3f0nmv3gisj145fi45kw971ianihq476x" + "commit": "f4c7c6995dadcdc6da5fefadfd362f8418b2eec1", + "sha256": "0vg8xzpm4lbahlldgfsc63wfans3wx0nfkm2x2k3qkgp9r7wbh38" }, "stable": { "version": [ @@ -77369,6 +79104,30 @@ "sha256": "0wnkcxg6djy4jvxhshiy1iw6b5cf79pjwjhfd1a060cavhfm4v5c" } }, + { + "ename": "php-quickhelp", + "commit": "955f58195517df08f69dd4c85cba31c94c88d345", + "sha256": "0w9r3h5pqbsg88ki3zny6mznmz39w5cq21lzzg2521a4hddi8g44", + "fetcher": "github", + "repo": "vpxyz/php-quickhelp", + "unstable": { + "version": [ + 20200818, + 1944 + ], + "commit": "f1d79fbed01b667495f64438687f1fbd6bf486c6", + "sha256": "0lnjd0ris288ia6i2wvw30yg57fmh5xgq1dln243s57yvm1wccfd" + }, + "stable": { + "version": [ + 0, + 3, + 4 + ], + "commit": "325668a47127bee77f094ed2b09171b8656c7429", + "sha256": "16cm754r1cg1rb6blfqcja41klr4hy90gkhg6p9p79qgxjrnbbbd" + } + }, { "ename": "php-refactor-mode", "commit": "ad4a9bb43e131e2eb0d8b09b13245bc268c524a5", @@ -77445,18 +79204,17 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20200405, - 1544 + 20200618, + 1845 ], "deps": [ "async", - "cl-lib", "composer", "f", "php-runtime" ], - "commit": "860d7e8784b261ee71deba354d01c3038cd777ab", - "sha256": "1d3fijh11g70xhx3a47l75mrp64bvkk7hh9lg83nl30qhn2vrbn3" + "commit": "62d2372ea55c0c5fb4e77076988472ebb5d85f24", + "sha256": "1sfrdap157zc7lk9vwsy91p813ip8dmazgfjwh7jwzyvcj7dsimc" }, "stable": { "version": [ @@ -77510,14 +79268,14 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20200411, - 531 + 20200807, + 1101 ], "deps": [ "php-mode" ], - "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", - "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" + "commit": "e675cf0881408e10b76f2e70c6158237cb94671e", + "sha256": "11qd0mpcvc56hghwv60a57d5pap19s7yvlvi6827wnrq35cyzh7f" }, "stable": { "version": [ @@ -77731,14 +79489,14 @@ "repo": "davep/pinboard.el", "unstable": { "version": [ - 20200402, - 919 + 20200630, + 1544 ], "deps": [ "cl-lib" ], - "commit": "7c57f20667ead2bb27ab1d0a03307c28ea728bd9", - "sha256": "0d9z1hr2082sbg4dlmarksh598xd92w7c09xmdjyn1yqm39gsljw" + "commit": "d426f9d2ebec5f907c8a89d6b38ccbcb13750d4f", + "sha256": "0jganb5ws2qlzyncyhaw1hldqbpxm44ddzzy17hmriy8n5701fyv" }, "stable": { "version": [ @@ -78053,11 +79811,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20200425, - 616 + 20200818, + 1742 ], - "commit": "bc22301198b3f581d89352510e847454fb1cb9ff", - "sha256": "11il65myybgfj30psicfgqpjwwpa6hwapf55d497x8kbixx2kpg1" + "commit": "887c01cb06420501c7780fb01a8a76bdb0864cca", + "sha256": "17v71sd1i7wyvjzz0nir7p28cskzgws4dcpm83ch1khhljh3r7kl" }, "stable": { "version": [ @@ -78076,14 +79834,14 @@ "repo": "abo-abo/plain-org-wiki", "unstable": { "version": [ - 20200507, - 2135 + 20200617, + 828 ], "deps": [ "ivy" ], - "commit": "99cd7f90e5c741cf3327f464852203baee7c488c", - "sha256": "1s4ida511fi6mbrckn9kvssr4vmiy4w5qkkby7s1jlqvlydnsa8m" + "commit": "5e32e7e6216e24d515624008fa0898077403aa7f", + "sha256": "0d3nhvkzzharjv54w3rinqcpwhqb61flgvvcngfdxkrgs1yazaqk" } }, { @@ -78291,11 +80049,11 @@ "repo": "akirak/emacs-playground", "unstable": { "version": [ - 20180624, - 326 + 20200812, + 1336 ], - "commit": "9212790026bea9ab5fb4ecf0da1163be8ab00776", - "sha256": "0g6d7z9sv7fdc918gay7rd71frzqn75mcwnljgmqksfh5890apa6" + "commit": "77d2faab0bc3f6e1f2c65c66644c52167304610d", + "sha256": "1xl6fp246wk764jkyr7km7lgqfdyvbjxr9ri20dzaadfvwqyfzg5" } }, { @@ -78478,6 +80236,21 @@ "sha256": "0nwrzf7lvimay83k1s4nxz86d1a82v55j23vp2915c307gkwrl8z" } }, + { + "ename": "pnpm-mode", + "commit": "c12d8b34a72c2ac8b29109492e203e45619116a6", + "sha256": "0vwsvadl6z31mzskjaykffv68vb8k4nffccdkb71vmrrbnpii6k5", + "fetcher": "github", + "repo": "rajasegar/pnpm-mode", + "unstable": { + "version": [ + 20200527, + 557 + ], + "commit": "391207e6505948b0d0cb57b802ee4885e3292c21", + "sha256": "0pgh9fnghj5f6vfkfb2l4jgf5j4lmidnfs949q0xik3b3hz4j4h3" + } + }, { "ename": "po-mode", "commit": "38e855cde9264bff67016d23e7e5e00f113c55bf", @@ -78486,11 +80259,19 @@ "repo": "emacsmirror/po-mode", "unstable": { "version": [ - 20190511, - 1542 + 20200610, + 1743 ], - "commit": "1916142f6a817c733d5ec37e3b4fbae3da67e499", - "sha256": "0nvpr5ry86by1dm7mp2w5p534qg4c9dpdich3x13gbbp9vazc7h6" + "commit": "3114e245c2ee6208e9b506f3e65e631e1b236019", + "sha256": "1f84fziibcc1bjhcmmzvbsvsw2lwabsb70vl4x2jpqsraygzhw0b" + }, + "stable": { + "version": [ + 0, + 21 + ], + "commit": "25eb1bdca30ed25d2e5d51b9feeb28a3faff51ec", + "sha256": "00ff5njs4aghkhipw5pmha4mj1a5s35g1cxihhbqpn9gr7kmbg02" } }, { @@ -78615,14 +80396,14 @@ "repo": "lujun9972/podcaster", "unstable": { "version": [ - 20161020, - 1535 + 20200607, + 1054 ], "deps": [ "cl-lib" ], - "commit": "9854517025deb5d556168a68955fb7b662239f5c", - "sha256": "06ag0idz7cf6i9kg7kqr03js9b6cw6my1jzd1x3wkgazx5slqk4q" + "commit": "7a21173da0c57e6aa41dbdc33383047386b35eb5", + "sha256": "1b2bhwipsyyydrqdxjsipzy170xdkfamd4mw5pwzjcgdjqz9wvxa" } }, { @@ -78675,11 +80456,11 @@ "repo": "kunalb/poet", "unstable": { "version": [ - 20191215, - 201 + 20200606, + 2343 ], - "commit": "ad998dce8a953eb6101e61bd6bb5ff871535d383", - "sha256": "030qm41sf4z29f0gghrk6a4lpf775lgg9vvlmcnl678vgy7p9fa5" + "commit": "16eb694f0755c04c4db98614d0eca1199fddad70", + "sha256": "0zm8jbviddyj7jnyssh77jx43jghbpjwr77n9s3cjp3bmadwkrv5" } }, { @@ -78690,15 +80471,15 @@ "repo": "galaunay/poetry.el", "unstable": { "version": [ - 20200326, - 1328 + 20200805, + 1259 ], "deps": [ "pyvenv", "transient" ], - "commit": "6dcc9d22cac6642a861770b5518398d8ee4fcc9a", - "sha256": "1za8s1k5ni11yqz64rz777lps400jnga151cca2f3l3xx2lcc2c7" + "commit": "22a76cdcba180b4689a6b45c97669e3c76cd36ed", + "sha256": "099sxca06zxfvlvmsgjicira4r4csqv2m4l0d7icji57qahbp5h2" }, "stable": { "version": [ @@ -78768,6 +80549,21 @@ "sha256": "016cjy5pnnqccjqb0njqc9jq6kf6p165nlki83b8c0sj75yxghav" } }, + { + "ename": "poke-line", + "commit": "e608228443b10d1cd883ed8044b624480647ed17", + "sha256": "1j94pzhp1wsaa4nipbfx3bdapvf38h6g352dxakw38jimqyp6cvw", + "fetcher": "github", + "repo": "RyanMillerC/poke-line", + "unstable": { + "version": [ + 20200818, + 1403 + ], + "commit": "fe876cd6e8fdf3a68037285eda4ac2eaf977eae4", + "sha256": "04dpfg22nqmqrw3rzpyh62kb17iqdadmimrnrvy9cnyd8mla0k5z" + } + }, { "ename": "pollen-mode", "commit": "97bda0616abe3bb632fc4231e5317d9472dfd14f", @@ -78957,14 +80753,14 @@ "repo": "polymode/poly-org", "unstable": { "version": [ - 20200316, - 1315 + 20200817, + 756 ], "deps": [ "polymode" ], - "commit": "8f4d11489532be98a291258ca27405aa528fc126", - "sha256": "1srnwcsn2bh8gqzxixkhffk7gbnk66kd4dgvxbnps5nxqc6v0qhc" + "commit": "0793ee5c3565718606c514c3f299c0aa5bb71272", + "sha256": "011nacpyxc969qyvbzwhz0hr3bcbkjiwlaqa27sb4hffnl4p1py9" }, "stable": { "version": [ @@ -79098,11 +80894,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20200411, - 915 + 20200606, + 1106 ], - "commit": "2a61fb6d3e805bc0e4ca7b6510510a955c6bfb6a", - "sha256": "0cphikjz9hwij1k41radyar6nh7md8v98qwn2j9lzcbyz69hrvaq" + "commit": "3284ff10017d280ba82f27dc20fe5223b0df709c", + "sha256": "0756c0fi5msqdsks95bcs0ghhk90b340y4zrkijhaz4b2cnm07h4" }, "stable": { "version": [ @@ -79122,22 +80918,20 @@ "repo": "TatriX/pomidor", "unstable": { "version": [ - 20200513, - 1054 + 20200722, + 1402 ], - "commit": "308a438550173685cb852a8aadef75c25701513e", - "sha256": "1w4sds6h6q80drqzkmiz51nvy942a88s99zfrvmyvfrvwv7wlqqb" + "commit": "60da23c97c30e08254a914dca411b2e3fd639c99", + "sha256": "19a5155gxz97yqhfxp48d6lnhh0qqai4pd5rg1xy79mq0hxy31p7" }, "stable": { "version": [ 0, - 3 + 6, + 1 ], - "deps": [ - "alert" - ], - "commit": "590e64d316d9210bd00cb4eb39d2f07ddc16809a", - "sha256": "0001k4p09il5f20s0jgyi96wzslfcgv3y35wfxj771gixlacnrhi" + "commit": "bf3ca99c24a84befe9ed76b9636ec9adb37ab844", + "sha256": "1qsgx1vh0xsk1wwpyx8lpnpa4879bzf0gil28v94sncbri2c6f7w" } }, { @@ -79208,26 +81002,40 @@ "repo": "ponylang/ponylang-mode", "unstable": { "version": [ - 20200510, - 200 + 20200724, + 137 ], "deps": [ - "dash" + "company-ctags", + "dash", + "fill-column-indicator", + "hl-todo", + "hydra", + "rainbow-delimiters", + "yafolding", + "yasnippet" ], - "commit": "d72e2a53b4b542ad8adf1807d7b94a7788ab00cf", - "sha256": "1k13fpnd40lpg90vgck28cxfg6i2m5y2pagkw27zaqcd1h8n7d59" + "commit": "136cc4f7ab4f2ab549633392a72d55051c8b31ac", + "sha256": "0pjjccd145bla2gshs648kwhlw9r4n449g318nw81v2nn10z6qwl" }, "stable": { "version": [ 0, - 0, - 12 + 5, + 3 ], "deps": [ - "dash" + "company-ctags", + "dash", + "fill-column-indicator", + "hl-todo", + "hydra", + "rainbow-delimiters", + "yafolding", + "yasnippet" ], - "commit": "d72e2a53b4b542ad8adf1807d7b94a7788ab00cf", - "sha256": "1k13fpnd40lpg90vgck28cxfg6i2m5y2pagkw27zaqcd1h8n7d59" + "commit": "0b876e6a2d602f94cc118e6b76f5f79d18244325", + "sha256": "00xn2mhnf5qvn4v6yncmfa9ijrb33zl49mlc7pqn8pzr8nhbxzvc" } }, { @@ -79285,26 +81093,26 @@ "repo": "auto-complete/popup-el", "unstable": { "version": [ - 20160709, - 1429 + 20200610, + 317 ], "deps": [ "cl-lib" ], - "commit": "4839797cd1db25be6f3f98bc8d401b6c2af01f9f", - "sha256": "1sxzv4zdmyra6b6nicnng0zpixlpxnczhq0qjyfzxvvhks7jyyf3" + "commit": "9d104d4bbbcb37bbc9d9ce762e74d41174683f86", + "sha256": "0qrsz4z9q2bfq9xv4n94mvyslm232v2ql9r1fjycx7rnmpqggiwl" }, "stable": { "version": [ 0, 5, - 3 + 8 ], "deps": [ "cl-lib" ], - "commit": "46632ab9652dacad56fd961cd6def25a015170ae", - "sha256": "1y538siabcf1n00wr4iz5gbxfndw661kx2mn9w1g4lg7yi4n0h0h" + "commit": "9d104d4bbbcb37bbc9d9ce762e74d41174683f86", + "sha256": "0qrsz4z9q2bfq9xv4n94mvyslm232v2ql9r1fjycx7rnmpqggiwl" } }, { @@ -79411,15 +81219,15 @@ "repo": "kostafey/popup-switcher", "unstable": { "version": [ - 20200201, - 1913 + 20200701, + 2034 ], "deps": [ "cl-lib", "popup" ], - "commit": "e275ec35de3b9cdedf0d6b2a4a78e91c605381be", - "sha256": "1zm6zk7c2i7gmn5am2d7090j1a71vbis8lbrzrbxdx53q6sklgi7" + "commit": "68bbe23f7ceaca889529be95762925ac29515545", + "sha256": "18nfrhmdjsgmrpr82qqmxj3rdv85ml2pkssrkrljzzgaxavx5ind" } }, { @@ -79531,20 +81339,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20200426, - 819 + 20200818, + 606 ], - "commit": "093b29a53cbeda6d637ccc9ef4dfc47123e79b9e", - "sha256": "0wca1w667h930dyi3hm1kqiqapggnwbgqjbxiwpgj7l773s7xdbw" + "commit": "7b92a54e588889a74d36d51167e067676db7be8a", + "sha256": "1638qw6m588a1dh8gfic1n2mzacm7rzs99ds8qwdfqs3ids857nj" }, "stable": { "version": [ 0, - 7, + 8, 0 ], - "commit": "83b4d39fdda34355c01aecc22677f7376ae0f013", - "sha256": "0cjrl4xgs70hbw1a1mqkdmpcmrxaakw8csrz365c31vj14nii0ax" + "commit": "7b92a54e588889a74d36d51167e067676db7be8a", + "sha256": "1638qw6m588a1dh8gfic1n2mzacm7rzs99ds8qwdfqs3ids857nj" } }, { @@ -79626,14 +81434,14 @@ "repo": "milkypostman/powerline", "unstable": { "version": [ - 20200105, - 2053 + 20200817, + 1321 ], "deps": [ "cl-lib" ], - "commit": "edbb464eef680efc9d408730288c716cd4cac404", - "sha256": "0j1bb9dyr76m68gn94qk6k6bxhdqbiq59fzi4mnx3ivnnkbfz6n7" + "commit": "e15e77ab2e589bd73f9e90498747d77d042789ea", + "sha256": "1sw9aicv9xbcg0fz6584hfycwibzxx2jxlav0kf83d3wg3lprgps" }, "stable": { "version": [ @@ -79697,16 +81505,16 @@ "repo": "SavchenkoValeriy/emacs-powerthesaurus", "unstable": { "version": [ - 20190721, - 805 + 20200720, + 1546 ], "deps": [ "jeison", "request", "s" ], - "commit": "81a262ec0c9294ad377bafc6cc4e6d91b461acb6", - "sha256": "0ffy2c56difdhgpwvvvgyvifldxlmijcs11hs6hx6gv3hndmym7i" + "commit": "93036d3b111925ebc34f747ff846cb0b8669b92e", + "sha256": "0l45n12b8jny7g4bfdn3sc7lp9kyxd7pyisr0r9svr9sls7cybv4" } }, { @@ -79749,14 +81557,14 @@ "repo": "conao3/ppp.el", "unstable": { "version": [ - 20200418, - 1551 + 20200812, + 844 ], "deps": [ "leaf" ], - "commit": "27683aa4a0df67b4539bcaa2e82d865023cf1fae", - "sha256": "0azqpmlz6r2amklzrgi0wgmy89fbkz0kkpikgf5gccfmks5pij6y" + "commit": "86dad69c3a7dae770f6b99285647dff2aad81930", + "sha256": "01c82h5j7yggsbhbrlbcwl562mpd79c0i878129r4ivvhka3nha3" }, "stable": { "version": [ @@ -79814,19 +81622,19 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20200412, - 1607 + 20200818, + 1400 ], - "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", - "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" + "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530", + "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p" }, "stable": { "version": [ - 4, - 1 + 5, + 0 ], - "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", - "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" + "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc", + "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix" } }, { @@ -79874,6 +81682,38 @@ "sha256": "10pvjdnb48fk663232qvh4gapk2yiz4iawpffzjrbs3amxh50bi7" } }, + { + "ename": "prettier", + "commit": "e9992d6d5ed3bd677976262d8a887e5c0a4f4914", + "sha256": "07zhjbb40jl6xkfdzavqg33z17z8s4nyrv3qjh8c0m3si8abh6zb", + "fetcher": "github", + "repo": "jscheid/prettier.el", + "unstable": { + "version": [ + 20200714, + 859 + ], + "deps": [ + "iter2", + "nvm" + ], + "commit": "000244b82ca9e2118376f6a44506bac8ab225677", + "sha256": "1mrxjvx16ixcyqvqvc8lmvh3jdkcriq9djhiak0pg8y6nbrj4dqa" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "iter2", + "nvm" + ], + "commit": "d5ccedc7a8ed84aff292bce688c73648dc8f567f", + "sha256": "1rk2hwpxvnc1hadvdg86jnzz4nh5kmkwp18iwvsbkgmx47cnyni3" + } + }, { "ename": "prettier-js", "commit": "968ac7bb98b385f8542dc150486982c0ded73187", @@ -80263,20 +82103,20 @@ "repo": "jcs-elpa/project-abbrev", "unstable": { "version": [ - 20190517, - 521 + 20200724, + 901 ], - "commit": "22830177a0cea19acf29fb9910b784ea5f66f551", - "sha256": "05ks95j6706rabfh1487nix2cjbxa6pjjr0xm01nhd3vcfr1m2b0" + "commit": "7b5749eae33eda576da3293dc386794c1248bb48", + "sha256": "0fvfp5hy93ggqspbnishzp0x0j1652ayismb8bpzkf6vra8vjrdw" }, "stable": { "version": [ 0, 0, - 2 + 4 ], - "commit": "fc4e9f774cae42a6fe135833774daaecf2b3dac0", - "sha256": "07056jd1z9i65db4pcshhdfrk5yb6xc28k3ihq7pixmya71l15pk" + "commit": "7b5749eae33eda576da3293dc386794c1248bb48", + "sha256": "0fvfp5hy93ggqspbnishzp0x0j1652ayismb8bpzkf6vra8vjrdw" } }, { @@ -80416,26 +82256,26 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20200507, - 650 + 20200819, + 531 ], "deps": [ "pkg-info" ], - "commit": "f650faecf699e4b4659374cf5a949f6927feff3e", - "sha256": "142is55cbyya511zp0yl5d1x6i8mvxqjn8zky4gxif15rmmqrk9n" + "commit": "46d2010c6a6cccfc4be72317f10ea99fd041ab54", + "sha256": "1xd4ag6sypqhfn85vnr8609cl9nip0l5j77226p6apv6yhdippqx" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ "pkg-info" ], - "commit": "34b2665023f9a29ebd2a415bfb8091db3c804d46", - "sha256": "16p79m8mkrlczx4b5v28nnlcd1ny49861lax28r7cb9ps9jhdz7d" + "commit": "dc0e7a5ba46f92bd224a5e89f0af2ace0ed05ade", + "sha256": "1kf34p2jwcjcqniia8bx3kn14ybwcq81x7gcm1vkd9cj7x0mx96n" } }, { @@ -80509,26 +82349,6 @@ "sha256": "01jsj0pv9qqbkdmbykvk4ic40hc1nhaiaqvx17hi7p89hq3nzffr" } }, - { - "ename": "projectile-hanami", - "commit": "9c0123322baee1e96afd055de3f44827574d2b5f", - "sha256": "0qi9i4wdggrmihf1j42fqrf38psmb33rlafg3y6da5r7lpn03j1a", - "fetcher": "github", - "repo": "avdgaag/projectile-hanami", - "unstable": { - "version": [ - 20160505, - 1311 - ], - "deps": [ - "inf-ruby", - "projectile", - "rake" - ], - "commit": "c4b8e7d4dfec789ef8493a7c5d4ce0cf7937e579", - "sha256": "1pqmyfz0vil30x739r18zpw9n76297ckisimq2g0xl1irhynsvbk" - } - }, { "ename": "projectile-rails", "commit": "b16532bb8d08f7385bca4b83ab4e030d7b453524", @@ -80788,11 +82608,11 @@ "repo": "chuntaro/emacs-promise", "unstable": { "version": [ - 20200429, - 440 + 20200727, + 900 ], - "commit": "ed9b073ee5b0975a35ee15bc12e25e02f796d787", - "sha256": "1mqqsnwkwfg2i6rhx747hcnk725siw6qsxh5yni3l1sfizbyvw03" + "commit": "d7b59805e7a8da1f5edea9313b6e2d0f1115fec0", + "sha256": "08f30fwwh86mnymbjxr9gswkgvsfdxa1mqajsmsbkk5nvmz1jx0n" }, "stable": { "version": [ @@ -80868,11 +82688,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20200506, - 1948 + 20200623, + 1748 ], - "commit": "ea62543527e6c0fcca8bbb70695e25c2f5d89614", - "sha256": "0jzyj3a3b9b26b2cksrcby39gj9jg77dzj3d4zzbwf33j1vkvfd2" + "commit": "03e427a8f19485e12b2f95387ed3e0bff7cc944c", + "sha256": "0ykxb4xdsxv2mja620kf61k2l18scs0jdsfsg1kzs2qf4ddjscyn" }, "stable": { "version": [ @@ -80972,20 +82792,22 @@ "repo": "google/protobuf", "unstable": { "version": [ - 20170526, - 1650 + 20200619, + 1742 ], - "commit": "63da77bc971e08c2241cc1d9e65ede4bf335c421", - "sha256": "0b0shac978n6djxid6z9h4mfb2ah4hc1vvb0rg8rf65gs4cxjzlz" + "commit": "214c77e1b76e63e512bd675d1c300c80438642b6", + "sha256": "1fxf5gydjcfc9gdwv6yfcwv85ww5glqbzlfv9hcnkddwlz6schxa" }, "stable": { "version": [ - 3, - 12, - 0 + 4, + 0, + 0, + -1, + 2 ], - "commit": "0dd036d675508a4ecf69e61626fd0c88235a661d", - "sha256": "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a" + "commit": "6c61c1e63b9be3c36db6bed19032dfc0d63aadda", + "sha256": "1910pnpy0mfzqga4mv52ybjfbxrbdflgb6nsh2vbpbpsv4jl58dq" } }, { @@ -81032,6 +82854,36 @@ "sha256": "1wmj3ahjj1g7sx36fda6fhicvmxkm8qm64zqdk3qqj808jik1pry" } }, + { + "ename": "psalm", + "commit": "148d9b28e683a6602bb18eecaaf3cbc8dede65b1", + "sha256": "0j54gj76xz7hkbbsb3dahxy1yf3y7kfg1ls060cskd6sdds412zq", + "fetcher": "github", + "repo": "emacs-php/psalm.el", + "unstable": { + "version": [ + 20200510, + 1157 + ], + "deps": [ + "php-mode" + ], + "commit": "b2a1e8a9524b0004e62996c70da5536f86e56182", + "sha256": "0r0qz5bdznzdj7zxq6a6fz7fwn2c978bq57yywj3fcy8f5vh8jcf" + }, + "stable": { + "version": [ + 0, + 6, + 0 + ], + "deps": [ + "php-mode" + ], + "commit": "aaa77b4ceb61d41a520baa0b84b9b236c99c4156", + "sha256": "1fnr8sbx74c4mdz91y6b4m0n6njjb0qa01r4i9975q197vwzni48" + } + }, { "ename": "psc-ide", "commit": "9eb5ff1de1d207317df052ecbd65dbe0f8766f5d", @@ -81040,8 +82892,8 @@ "repo": "purescript-emacs/psc-ide-emacs", "unstable": { "version": [ - 20200317, - 1013 + 20200702, + 1540 ], "deps": [ "company", @@ -81052,8 +82904,8 @@ "s", "seq" ], - "commit": "7fc2b841be25f5bc5e1eb7d0634436181c38b3fe", - "sha256": "0r0fymyai30jimm34z1cmav4wgij8ci6s1d9y7qigygfbbfrdsmj" + "commit": "663f4e2cf9cbafdd4b9a60c34346596e2a40c87c", + "sha256": "06zgi5inlg244qhabsp4a24kda83i6rdpxf78qb7ygpxwdj4hf44" } }, { @@ -81099,15 +82951,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20200509, - 803 + 20200714, + 555 ], "deps": [ "async", "cl-lib" ], - "commit": "ddeccf7808cf39fedc41cd33204b0ef5fe4253b5", - "sha256": "083srsvnv8ks52qsi6hv02v4j4xlm67bld9ynm8cl8fy500ghpzz" + "commit": "d2b8f8d8c6acd2f86f3a7774a7079f40b1b75f8e", + "sha256": "1pks2xvnampp74d1m7rrq6801bdhcmdsx9gbrcvr8ljxxlzbka1w" }, "stable": { "version": [ @@ -81187,8 +83039,8 @@ "repo": "fvdbeek/emacs-pubmed", "unstable": { "version": [ - 20200502, - 2153 + 20200618, + 2203 ], "deps": [ "deferred", @@ -81196,8 +83048,8 @@ "s", "unidecode" ], - "commit": "d781870e2f57e40110e07768289ab81d8554f122", - "sha256": "17d2v7q6sfafk8j1ish053xsmihi4f1hbk53fkkmhwan6sw9c4sc" + "commit": "88aeb71ed4354af0b58354636ee6a9485887213d", + "sha256": "154lkpipi5wgcwx4j9w6h3zysciw7hblf03an2irr9xgdhs7xs7q" }, "stable": { "version": [ @@ -81365,14 +83217,14 @@ "repo": "purescript-emacs/purescript-mode", "unstable": { "version": [ - 20190522, - 2230 + 20200708, + 827 ], "deps": [ "cl-lib" ], - "commit": "8db1d0243c03da31adac4d7c5287407a4df6aff2", - "sha256": "07z5m8h5a1dhqlzf8wqyxqw2mz3kxzjfpb0p7az3bhs3xsxq6q1q" + "commit": "154ad16b61fb9dec83a6c863ffaf92638278f00f", + "sha256": "14046nryg870s366j6hxqpwza0y057hxaiq3kwlnpf1avlzdwhib" } }, { @@ -81689,21 +83541,6 @@ "sha256": "1m0jb5pk1a1ww5jx2y5nz21by4dh7nlnhdn6bigz53ra449rrxii" } }, - { - "ename": "pydoc-info", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "0l80g0rzkk3a1wrw2riiywz9wdyxwr5i64jb2h5r8alp9qq1k7mf", - "fetcher": "bitbucket", - "repo": "jonwaltman/pydoc-info", - "unstable": { - "version": [ - 20110301, - 834 - ], - "commit": "151d877c8fb8e418a573b1e879b1263c18e22776", - "sha256": "1mzyr6yznkyv99x9q8zx2f270ngjh8s94zvnhcbhidi57inpd1nh" - } - }, { "ename": "pyenv-mode", "commit": "c756ccbae044bc23131060355532261aa9a12409", @@ -81712,14 +83549,14 @@ "repo": "pythonic-emacs/pyenv-mode", "unstable": { "version": [ - 20170801, - 2348 + 20200518, + 1521 ], "deps": [ "pythonic" ], - "commit": "aec6f2aa289f6aed974f053c081143758dd142fb", - "sha256": "1zmgm24d6s56jc4ix61058p1k0h95vdvdllr7fh1k3bq4mw22qn3" + "commit": "d191037fe62ed8d4fee5888845da3e2c386d8e89", + "sha256": "0dipwjdkx4887g61gn22wga4pvvkwv6rx7izq73l8b6x1mc17c0h" }, "stable": { "version": [ @@ -81754,21 +83591,6 @@ "sha256": "1gz7145jnjcky1751pqrlhh3pq02ybsmz49ngx4ip2589nry7iyv" } }, - { - "ename": "pyfmt", - "commit": "68d477025ae5af50bf8f7b37f2adfa9159502e13", - "sha256": "112kjsp763c2plhqlhydpngrabhc58ya7cszvi4119xqw2s699g6", - "fetcher": "github", - "repo": "aheaume/pyfmt.el", - "unstable": { - "version": [ - 20150521, - 2056 - ], - "commit": "cb92be2cf0804cc53142dc5edb36f8e0ef5cec32", - "sha256": "1rp8zchvclh29rl9a1i82pcqghnhpaqnppaydxc2qx23y9pdgz9i" - } - }, { "ename": "pygen", "commit": "e761724e52de6fa4d92950751953645dd439d340", @@ -81929,10 +83751,10 @@ }, { "ename": "pyimpsort", - "commit": "97eb7c0934298d393910419fd55d7d5f1b0cfc38", - "sha256": "0kdk3bmryfzvwf8vshfszbih8mwncf4xlb0n0n0yjn0p1n98q99k", + "commit": "b38908bc1b759b14173ffb49ddeb040a9892cc0d", + "sha256": "105i63d05hlpwb4n5mn71jjgnav95s8n6xy0gb2smq9ljvxbbgl0", "fetcher": "github", - "repo": "emacs-pe/pyimpsort.el", + "repo": "emacsorphanage/pyimpsort", "unstable": { "version": [ 20160130, @@ -81953,8 +83775,8 @@ 20200503, 1624 ], - "commit": "1fc490c0a1d0df5d4d6a64da0ccf2dd711b9bf67", - "sha256": "0fkcn6dk67ljx73ww1zxxkmqp551xsshhz40z2fh1dxw00b470ga" + "commit": "52fd8e17c6aedbc68f58f1169363d6cc216f405b", + "sha256": "0nvgv67gq80hriaasck4zrr3v7qqrw6apxhnyixyavabdvvrawqz" } }, { @@ -82049,20 +83871,20 @@ "repo": "poppyschmo/pytest-pdb-break", "unstable": { "version": [ - 20200426, - 2335 + 20200804, + 848 ], - "commit": "22e54796b0522f812423b2fb0ec842e2984ff0f7", - "sha256": "0gsnbpk14iw4mqxk7c0409dibsb6f3j936hd781ly956mvn0afil" + "commit": "05d227493b7b96f3556cba22f215cb85f9282020", + "sha256": "0dsvi5scrhk6mypz8wggvy9zlnkbm2fmb5a24jprqh3bihg077xl" }, "stable": { "version": [ 0, 0, - 9 + 10 ], - "commit": "3ff296d14e7350241b22fcbe09325a16bb834d16", - "sha256": "0pipbp6i0vq3maiwf8cj8g43zk8nq3dpgbgacdk9v2bhcgwl3im3" + "commit": "05d227493b7b96f3556cba22f215cb85f9282020", + "sha256": "0dsvi5scrhk6mypz8wggvy9zlnkbm2fmb5a24jprqh3bihg077xl" } }, { @@ -82195,11 +84017,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20200508, - 1756 + 20200608, + 737 ], - "commit": "a4ee6e9f60ff63f0706661e54308281ed7c900e3", - "sha256": "02gfr692xr3clrim5l6bqzn1kzcv232ylvd5k33421s21wb9vhzv" + "commit": "6658e5d768db0c0d8dbc6fdedff3a85b65327061", + "sha256": "1mf6bbx4brwzafxwrv37x14b286vlza9knswhcccvcb3aplvll6h" }, "stable": { "version": [ @@ -82219,34 +84041,34 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20180725, - 1146 + 20200812, + 737 ], "deps": [ "dash", "dash-functional", - "magit-popup", "projectile", - "s" + "s", + "transient" ], - "commit": "09ad688df207ee9b02c990d3897a9e2841931d97", - "sha256": "18v7kxdhrayxg2pgbysm0y47xpdvwa15fmazpkfg0q8dfp2j3022" + "commit": "fc056faf2757c42641ed94d36a090e56eb13572f", + "sha256": "00dwbh549ygnrp98s883v45f5pbb34f2j5qwvw92camhp6daw38y" }, "stable": { "version": [ - 0, 3, - 1 + 0, + 0 ], "deps": [ "dash", "dash-functional", - "magit-popup", "projectile", - "s" + "s", + "transient" ], - "commit": "6772ecfaa86f0f4a1a66bfd3a454c9b11956de70", - "sha256": "086jjygzdrcjfp7j70xs8jh8nq0xv496kza6iap7lyc3qf16b4kk" + "commit": "10ad9afc840ac2d9d5616abf4bd92ab8fee2ce48", + "sha256": "1lc5qlsznzw8hdcdwjwn8fcgfmqjvb1wplsr2gaxwvm8rbw22g1l" } }, { @@ -82319,15 +84141,15 @@ "repo": "pythonic-emacs/pythonic", "unstable": { "version": [ - 20200304, - 1901 + 20200806, + 434 ], "deps": [ "f", "s" ], - "commit": "f577f155fb0c6e57b3ff82447ac25dcb3ca0080f", - "sha256": "10faqkfbr7n1zlbrs9c9slm2f7wr2liav8r367s00bw3vb2vm8nb" + "commit": "51233ec7ec9fbafd13e2b0479c7b2ee0930ccca5", + "sha256": "1v4n6wx0qff2ndlxy11acm21jq5yflk28axs6jc6yh7mdj44js9x" }, "stable": { "version": [ @@ -82383,34 +84205,6 @@ "sha256": "0di229ma7jr9jcck36qjrzilkbp428kkx53qs6c9xw9jhv6yklbz" } }, - { - "ename": "qiita", - "commit": "d8065a58e297c50c031de97d2d80bce5857bd803", - "sha256": "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl", - "fetcher": "github", - "repo": "gongo/qiita-el", - "unstable": { - "version": [ - 20140118, - 844 - ], - "deps": [ - "helm", - "markdown-mode" - ], - "commit": "93c697b97d540fd1601a13a3d9889fb939b19878", - "sha256": "0ggivlaj29rbbhkjpf3bf7vr96xjzffas0sf5m54qh6nyz6nnha5" - }, - "stable": { - "version": [ - 0, - 0, - 1 - ], - "commit": "33b6d3450bb4b3d0186c2475f6c78269c71fd1ff", - "sha256": "110z27n3h7p2yalicfhnv832ikfcf7p0hrf5qkryz1sdmz79wb3f" - } - }, { "ename": "ql", "commit": "475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303", @@ -82483,10 +84277,10 @@ }, { "ename": "qtcreator-theme", - "commit": "bf0caf3c60f4b8c6ed1c126a5feb91c99eea1f60", - "sha256": "0ic7a9zas8ndrp15xbw4j2987ajfjjq003fcmqhibp0sc66rldfx", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "01w4qxh9d8mkw7k0pawy0hvcdvvrkkhcnszpy5hixi5j6h7l24m0", "fetcher": "github", - "repo": "lesleylai/emacs-qtcreator-theme", + "repo": "LesleyLai/emacs-qtcreator-theme", "unstable": { "version": [ 20200203, @@ -82542,11 +84336,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20200514, - 1242 + 20200617, + 2205 ], - "commit": "9ece62efa829c6b89ba61cb674f337764b266482", - "sha256": "1mvrpyiw53lrz6i7r7zlcfvksh8lsjb4vib6gnj5b849njzcjwhm" + "commit": "f1fc228f217be692eaae2d53f51966ce922d6a32", + "sha256": "03h30qcixq54q212381cf7mahi2k9q4590vm44pqy9widpigmxz7" } }, { @@ -82576,11 +84370,11 @@ "repo": "renard/quick-buffer-switch", "unstable": { "version": [ - 20151007, - 2208 + 20200727, + 720 ], - "commit": "d5fdd67b4c9f04b7a7122da2215e4ae076a03b1b", - "sha256": "0kh63nzdzwxksn2ar2i1ds7n96jga2dhhc9gg27p1g2ca66fs6h5" + "commit": "ceb5222599b861f9d1133b1509516fcf07a3cd67", + "sha256": "09dfw42d5834z8x1c1mri7g61r91i1crr3h6r118nmszhbx9b7iy" } }, { @@ -82655,20 +84449,20 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20200514, - 1506 + 20200603, + 1902 ], - "commit": "a8752887b81fc2f4f4e4bcd3d2cf8abafb85edbb", - "sha256": "0zjhpgg6zkqx8v0gv7h7z73i64ipzszm9cqs4wwaldlz228316ra" + "commit": "ce7383c53215077f7e1d258d389cf8731309fbe9", + "sha256": "0dscg35hrywn8qr02q46y0cdclyscz6qxa0dqphkx3bv9xvzmqjl" }, "stable": { "version": [ 2, - 2, - 8 + 3, + 0 ], - "commit": "70e93e06778f44113f405aedec6187b925311d57", - "sha256": "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw" + "commit": "072ec7be93f31e9dd265fb834cd709d0c0d4a8bb", + "sha256": "1zx8hpm5wa9ad675py8676071pip6831d4jy2dqyrlxpfvi6q47l" } }, { @@ -82817,15 +84611,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20200513, - 1519 + 20200810, + 1513 ], "deps": [ "faceup", "pos-tip" ], - "commit": "0f1efa4a3cdcd26de1d2b002868ffc851cff25ac", - "sha256": "1zhn50apdrysm9d6ynv92slah78i39cismj88ym4ahrllwr1jnj4" + "commit": "c55fd70c5e9a371f262486f7d5d8837481388b95", + "sha256": "13ngnm22h5rzmm9pvgbw9nidv8jkkcsckbypi2mn1k8j8wfjypx0" } }, { @@ -82930,6 +84724,24 @@ "sha256": "1zr2669savnmkc68hiqsq9wccm6bs1j6jbmlac1xqh6nq7xgq36g" } }, + { + "ename": "rainbow-fart", + "commit": "cdcc8091357c42f5edbc1a13886253130f104242", + "sha256": "0zi1r8bgzd3g1dvginlp5nywyjk3lh495j6j3girgjqhsblnhfrx", + "fetcher": "github", + "repo": "stardiviner/emacs-rainbow-fart", + "unstable": { + "version": [ + 20200718, + 437 + ], + "deps": [ + "flycheck" + ], + "commit": "16759a0aa1b39c43cdedcf6a6c9a5dc3c3895fd2", + "sha256": "14dh7bd40jc6vl6933575jivgmm3h6frphmwxspijb7c8pj1wfmv" + } + }, { "ename": "rainbow-identifiers", "commit": "975aadd9fe1faf9ad617ba6200ca77185b87e7c0", @@ -82996,14 +84808,26 @@ "repo": "Raku/raku-mode", "unstable": { "version": [ - 20200510, - 2005 + 20200524, + 1625 ], "deps": [ "pkg-info" ], - "commit": "43fd5628254754bee41575a55a7d1c7ad79837fa", - "sha256": "1c1l0c4pnza3bf0s1262z5r8xmbmhq3qdvgqq28k8raawdqszqfk" + "commit": "e0639c89a3a29e9196e298951da6c3a79fb944e8", + "sha256": "02zn1sm86srwdzdkhw53ll0h41a9hwh6c8lan72530zysjrm4x1i" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "pkg-info" + ], + "commit": "e0639c89a3a29e9196e298951da6c3a79fb944e8", + "sha256": "02zn1sm86srwdzdkhw53ll0h41a9hwh6c8lan72530zysjrm4x1i" } }, { @@ -83065,11 +84889,11 @@ "repo": "ralesi/ranger.el", "unstable": { "version": [ - 20200218, - 203 + 20200607, + 2002 ], - "commit": "ae9b3816a6da927cca5beb62c45400103797a2da", - "sha256": "07fiyw0gw51dxc7r92pj75lbxppg0gixjv9317qx9c3v1lcxaqiv" + "commit": "d7c18370981c9e585bc0fb78f7e55033457ca643", + "sha256": "0xfg38ginrd0sdn194gpapi67q6i81csddgsf0rqmwihazpgs060" }, "stable": { "version": [ @@ -83190,20 +85014,20 @@ "repo": "thiagoa/rbtagger", "unstable": { "version": [ - 20191115, - 1858 + 20200714, + 1658 ], - "commit": "18ef567e65d1437e9a9e03d4f30a02d60e926d85", - "sha256": "0kr10j3f0dd7q102db4y16yj8yfv06wnqsgnx2l9jyc8qhkbxq6w" + "commit": "b3333b9dc9ffdaf5dfb2ea6ef2dd0f74e2f0f03f", + "sha256": "04zccf9bis259c13nzljfjajjgkrhhbb3b2v6q6q12c30ikj5b09" }, "stable": { "version": [ 0, - 2, - 0 + 3, + 2 ], - "commit": "e46137e36a3bdba8dd4d27017b194a8524c7375b", - "sha256": "154y2adh2pgn77ycidkd6ndjg9wjxsjmbkb8cppf9csq31vmc313" + "commit": "b3333b9dc9ffdaf5dfb2ea6ef2dd0f74e2f0f03f", + "sha256": "04zccf9bis259c13nzljfjajjgkrhhbb3b2v6q6q12c30ikj5b09" } }, { @@ -83446,8 +85270,8 @@ 20200505, 1537 ], - "commit": "8e51241e5ba7b07b91d8188c14cf193017640292", - "sha256": "0yn0ibbda8bjqjhiqhmbvv7p8c52n65mi95v91nkfcj60hwyglnq" + "commit": "481a2d1460ab5a9b6df3721dda76ad515923bfd1", + "sha256": "1f1sqbqc0ckp7850ahvy0syky7lplwhb05r3cw4fdmz2xbywwg52" }, "stable": { "version": [ @@ -83460,22 +85284,22 @@ }, { "ename": "realgud", - "commit": "7a21be3673962d5706f12efa5179a5426bdce82b", - "sha256": "14n6d3jfhpa29nf4ywdg3aw4i51lfkr99b4z8q4833pmpz1jbq2c", + "commit": "fd34d2accd92d1473b743e2eee1309d329209cd0", + "sha256": "063bqpq05l29cvapp4xnvgbdx6l4p0ax83hhz4dv4cqbh1mi68b0", "fetcher": "github", "repo": "realgud/realgud", "unstable": { "version": [ - 20200513, - 418 + 20200809, + 2221 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "1238d8e72945a84bb06cd39d7ded75f37105d4d2", - "sha256": "0gx5fivzksanyp9a0ijdzrcbgg8nw94mbilhdh1jkra5mw3ndr63" + "commit": "332d13673074bee252ae7819b0898ee7c7895d2e", + "sha256": "0cnnhxgyrjvr75pin7kis5qzd54hh0qscbnvvm8jflmljzca77lz" }, "stable": { "version": [ @@ -83520,15 +85344,15 @@ "repo": "realgud/realgud-ipdb", "unstable": { "version": [ - 20191115, + 20200722, 1116 ], "deps": [ "load-relative", "realgud" ], - "commit": "347090928d7866a9909208c5bbe2cb8fa7b55cd7", - "sha256": "1m7v8qsqm8b8liyfdfqpcsjnlcbs0lpl6m91ff3449a94l1g99k7" + "commit": "f18f907aa4ddd3e59dc19ca296d4ee2dc5e436b0", + "sha256": "196zy8xmqkm6nc7074gsy4ymm6h4ikbd01f41karys7dwib3gg5i" } }, { @@ -83539,15 +85363,15 @@ "repo": "realgud/realgud-jdb", "unstable": { "version": [ - 20191125, - 1700 + 20200722, + 1120 ], "deps": [ "load-relative", "realgud" ], - "commit": "99b7f08e0fcec9e33dde8dbbe60e42cfec08bc17", - "sha256": "16q9wxa518f3g54zk3imgj8ml06bn66d9jyyg2k86j94ny7q1azd" + "commit": "1c183b2f8aae0de60942ea01444b896bf182c66a", + "sha256": "1i80llf9bncd5hkrk0wj3xswd36q1rkv5gaqgfqq4r1f8dkrhrz1" } }, { @@ -83650,16 +85474,16 @@ "repo": "realgud/realgud-pry", "unstable": { "version": [ - 20190520, - 1139 + 20200620, + 1006 ], "deps": [ "cl-lib", "load-relative", "realgud" ], - "commit": "fe04c0e1e1ce33361d12ad6f9bcf493f3fe228e0", - "sha256": "14b3104wlaxwbg3p2pmnxlap5q4msbhswpiq5cx5q1wwhzkjfp2a" + "commit": "7b502b9e802b8594c90da329b9716bcfd2c981b1", + "sha256": "1rwqzpcdapfdlf6hvypi16w6z13r1fhv91arbr34jzfzbsnk7sb1" } }, { @@ -83690,15 +85514,15 @@ "repo": "realgud/realgud-trepan-ni", "unstable": { "version": [ - 20190912, - 1418 + 20200722, + 1118 ], "deps": [ "load-relative", "realgud" ], - "commit": "6e9cac5e8097018aadf41c88de541168036cc227", - "sha256": "0xc80mhqk26vm1sv8xz0zw0pmbznvdpb8gla5bh3rnxpadpannc3" + "commit": "6e38cf838c7b47b5f1353d00901b939ffa36d707", + "sha256": "0qwzvaarl2vr6ca0kd9k195f5nbnkdjsrwrkhxggjqsk7v1hq6x2" }, "stable": { "version": [ @@ -84167,11 +85991,11 @@ "repo": "purcell/reformatter.el", "unstable": { "version": [ - 20200426, - 818 + 20200814, + 435 ], - "commit": "dc6278a6b1e3565604346ac41a6ffc3cbab04031", - "sha256": "147qrqs3ndc4xfbb9wiymjsskccp54qpj8bn3i19n9zwm4kmgdzr" + "commit": "45c0add95025f53ca644a6c8b9afa05b2da3c474", + "sha256": "1dfn7c3gpavpiwd73v2pasd8wd8b62dczhg9iv1cgh8vaqlsf92x" }, "stable": { "version": [ @@ -84259,11 +86083,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20190905, - 730 + 20200815, + 1555 ], - "commit": "ee86d6a79342c6e4b3cfad5ec73cb0a40e18ae3d", - "sha256": "06y1hbqgdw2y0isn26wmwrqjxb1ypwrqhcjg4n69mdn74cwlk4jz" + "commit": "07e2201db7a88b246a63e868e711749e1465d3d6", + "sha256": "0y9746pqinp0nir2afm181drs2qa63jpb834s3s7pzd2mvjrw0rc" } }, { @@ -84312,11 +86136,11 @@ "url": "https://schlomp.space/tastytea/register-quicknav.git", "unstable": { "version": [ - 20200325, - 1612 + 20200524, + 2006 ], - "commit": "06afa1efc490a6cbc1d814fc6f1e7a80a601ecc7", - "sha256": "055bffsa81chjpv39p2fn10dwikpzb034k19k0mc1026d8a423kg" + "commit": "c15ea92b0946c28b3f14986d42b15b0b534aa6a2", + "sha256": "03xm5rxhafzngdqnpl884d0zy9qkpx57zbcnh0psalmvswd4d4fh" }, "stable": { "version": [ @@ -84342,8 +86166,8 @@ "deps": [ "reformatter" ], - "commit": "41c99057d0406c7fb3895a03da777af3961a648d", - "sha256": "1dw6f60ysyvxgm5gpir37ay8z9csykxj0r7v9h6z38cswicg27sj" + "commit": "439a4d5e130e67e9e8c34e813fa1dc6631e7a8d5", + "sha256": "0lzlhmz0c4jv65phksh6aya93rlh8rqcffbvz1llcyj8i2gr7hqj" } }, { @@ -84364,56 +86188,6 @@ "sha256": "0kn07wgnz5bkkq66qfq16rvw9l7zgh0hzrsa705j1zbd6vc3wygs" } }, - { - "ename": "relative-buffers", - "commit": "ab22cea99fbee937bbd6e8fbc8bd27967aeaa8a5", - "sha256": "131182yb0pr0d6jibqd8aag4w8hywdyi87ldp77b95gw4bqhr96i", - "fetcher": "github", - "repo": "proofit404/relative-buffers", - "unstable": { - "version": [ - 20191004, - 1205 - ], - "deps": [ - "cl-lib", - "dash", - "f", - "s" - ], - "commit": "6064cd0b3cbd42c4a46c70fc396f05be71f42bd6", - "sha256": "0wzxnbbzzjkzrnfdbdn7k172ad6mnhq5y3swcbilnk1w1a1lzyhn" - } - }, - { - "ename": "relax", - "commit": "67247451b39461db4a5fcff3827a09f53f9fc8ec", - "sha256": "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk", - "fetcher": "github", - "repo": "technomancy/relax.el", - "unstable": { - "version": [ - 20131029, - 2134 - ], - "deps": [ - "json" - ], - "commit": "6e33892623ab87833082262321dc8e1977209626", - "sha256": "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66" - }, - "stable": { - "version": [ - 0, - 2 - ], - "deps": [ - "json" - ], - "commit": "6e33892623ab87833082262321dc8e1977209626", - "sha256": "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66" - } - }, { "ename": "remark-mode", "commit": "083f2070eb27d66f09552bf42a346f41a9b9b4b5", @@ -84469,17 +86243,17 @@ }, { "ename": "renpy", - "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", - "sha256": "173391mcv56ljrkhl6hb9fhkl2vic9wj2xmd21hq88m3awpjmill", + "commit": "68635e3c52d12c234200680fd393a0b8748d2993", + "sha256": "18lnp1920c88j6fvjsrrymqh23amna9qyllh68mf7kssbsh5w2zq", "fetcher": "github", - "repo": "treymerkley/renpy-mode", + "repo": "Reagankm/renpy-mode", "unstable": { "version": [ - 20190419, - 1749 + 20200607, + 135 ], - "commit": "943e1af71d23128ff100d41d178ccffe28f97944", - "sha256": "1l2dglkbpb3d6c6cnifhngcjc4yy726mq6yic8x9409c6r0apn2n" + "commit": "f2f95a72a8c842f229f80999132e8ea8ee73f6fc", + "sha256": "1jka61j6zrc0yzjcplnyg1kp1d45ikwnkmayjg41v9w0pfrzzim3" } }, { @@ -84534,8 +86308,8 @@ "deps": [ "fullframe" ], - "commit": "a36caac7649fbffbe30f7b06541c9efd723563fc", - "sha256": "12h3xxja3isnhvrqx7m2g7a5d8h68cc85pbqyhiipfxyafyl1yxd" + "commit": "f066782c10226d31ea8c1cc386cfa7fa3a4e3aa7", + "sha256": "14kap395xd3d5n7ini5cyif2ygz0db8bv0py5ipwlac2zcwgmfwl" }, "stable": { "version": [ @@ -84704,11 +86478,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20200219, - 2257 + 20200517, + 1305 ], - "commit": "216d570a58d05ef1307edb63d2539bafa5f688c6", - "sha256": "11malas5n5g4yxydx8pz8aahr5rkjq256cg5avhd64fvfryz9wj2" + "commit": "d02d1347ffdf138cffd380cbeac62ac8732036ef", + "sha256": "1rkpakzish2d470ca15yq3k0m1j7a2lrkvvddcyvc2rx0sncsdjs" }, "stable": { "version": [ @@ -84735,8 +86509,8 @@ "deferred", "request" ], - "commit": "216d570a58d05ef1307edb63d2539bafa5f688c6", - "sha256": "11malas5n5g4yxydx8pz8aahr5rkjq256cg5avhd64fvfryz9wj2" + "commit": "d02d1347ffdf138cffd380cbeac62ac8732036ef", + "sha256": "1rkpakzish2d470ca15yq3k0m1j7a2lrkvvddcyvc2rx0sncsdjs" }, "stable": { "version": [ @@ -84867,8 +86641,8 @@ 20200502, 831 ], - "commit": "edea7b3e3d6110ebe44b9387acad1967e540d2ca", - "sha256": "1lajb0xil1jpy1hvvmmig1xgil45976yr7m3lrffavp34ma3kcbh" + "commit": "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3", + "sha256": "1a2c7xzy7rsan1zcdskia6m7n6j29xacfkqjlfdhzk6rr1bpzkwk" } }, { @@ -84886,8 +86660,8 @@ "helm", "restclient" ], - "commit": "edea7b3e3d6110ebe44b9387acad1967e540d2ca", - "sha256": "1lajb0xil1jpy1hvvmmig1xgil45976yr7m3lrffavp34ma3kcbh" + "commit": "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3", + "sha256": "1a2c7xzy7rsan1zcdskia6m7n6j29xacfkqjlfdhzk6rr1bpzkwk" } }, { @@ -84919,6 +86693,21 @@ "sha256": "1lan49723rpzg1q7w8x3iggazwl4zirq5l8nhpb8m5hmg21a4kih" } }, + { + "ename": "retrie", + "commit": "12ed1c6d8e2aa4f73b793f9e16e8e13985fae944", + "sha256": "1y0zknhc2wkq6kpmz2bylwqla1xd7n7l3650zj2bi8g84ly777af", + "fetcher": "github", + "repo": "Ailrun/emacs-retrie", + "unstable": { + "version": [ + 20200519, + 551 + ], + "commit": "976d6f01a3e214917f16b82e750d825cb9bfcc59", + "sha256": "08rwhkx2chphrfqd6l2bjr1w4rn394q8w5iy93cdprl5y56axvp6" + } + }, { "ename": "reveal-in-folder", "commit": "26682a1fb2d885168ca922521df7f3d8fbfe43a8", @@ -84927,26 +86716,28 @@ "repo": "jcs-elpa/reveal-in-folder", "unstable": { "version": [ - 20191209, - 514 + 20200618, + 1211 ], "deps": [ - "f" + "f", + "s" ], - "commit": "e3cc73688d8dc3b47ccb1db49519a83b275b1cde", - "sha256": "0xdpm7r83nd5j4ss530l3srz4qy2z0m7wp084i3v2sfqi3in5qgl" + "commit": "cc4f56c8870136aafcdc5afc010e9a73a9bfd707", + "sha256": "09byr8lh1agar1mmxs82sg8ica1p9wrjjahpx3k3adfmgq2glzcr" }, "stable": { "version": [ 0, 0, - 2 + 5 ], "deps": [ - "f" + "f", + "s" ], - "commit": "715e34b7c4a93840f6188386a13d15231907257b", - "sha256": "0d75hgaskhc6gwjdcc19nligb4xj2irg33cirrc0wp23k7il1m6f" + "commit": "cc4f56c8870136aafcdc5afc010e9a73a9bfd707", + "sha256": "09byr8lh1agar1mmxs82sg8ica1p9wrjjahpx3k3adfmgq2glzcr" } }, { @@ -84981,11 +86772,11 @@ "repo": "a13/reverse-im.el", "unstable": { "version": [ - 20200324, - 1113 + 20200520, + 853 ], - "commit": "c42a7a585c7b85bc402f63535ae6261f68c6aa57", - "sha256": "1lx23y4dzf5ln4ahf5dnnvx3blvjf3s65n3hgfv0qi5hgi8i8f59" + "commit": "90add9a1f8c4a3c78029d38087ff4d22fe5372d3", + "sha256": "05k2zp2hldzq5h6nl8gx79dd8lvfn507ad4x3naichdqgn2013nn" } }, { @@ -85019,11 +86810,11 @@ "repo": "kmuto/review-el", "unstable": { "version": [ - 20200131, - 122 + 20200710, + 155 ], - "commit": "09e2df58398b392f19642a12c8cb78eae726dbd2", - "sha256": "13cy7wy2jv1cjncfnayp28w1ka4s0jim2sarcw0dn2iiniqlkbwf" + "commit": "343e7155f8238a7a53ef1f753319b8e2f9e8e8b9", + "sha256": "13wgrj5qbg2pv6d9yxkbsrrllvd40m4p7911g23wcwnnx211p943" } }, { @@ -85049,26 +86840,26 @@ "repo": "galdor/rfc-mode", "unstable": { "version": [ - 20200215, - 1357 + 20200719, + 1241 ], "deps": [ "helm" ], - "commit": "88e6577a0e50f523f7da04de9f939b0bc168b514", - "sha256": "1k8330bgc9m7pnpvz3kjyjpjsmha43v4srnhns85xi0nv328g1iy" + "commit": "02546beecf4c495940885e7b7b911d84b12646ef", + "sha256": "1v52vbs2zbqv62wcgcrqgjcwcdq0w6hdb14nma4yhqldnqi57875" }, "stable": { "version": [ 1, - 2, + 3, 0 ], "deps": [ "helm" ], - "commit": "55d28321b480a095d29e5c6cd03c8dea9ad55553", - "sha256": "0f9h8vmfn8xi0c3qwigzbbvsck4wwxbflxl06m7ky2h5jnj6n0g3" + "commit": "02546beecf4c495940885e7b7b911d84b12646ef", + "sha256": "1v52vbs2zbqv62wcgcrqgjcwcdq0w6hdb14nma4yhqldnqi57875" } }, { @@ -85079,16 +86870,16 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20200516, - 1412 + 20200703, + 1250 ], "deps": [ "s", "transient", "wgrep" ], - "commit": "f5456e006f22b6bc947e799261b36d55b075c5a2", - "sha256": "120n4vkw3c1l130932pziz9ivw85wyh6b75836w82dhx9d41h4cr" + "commit": "853c1acaf999500d867180b9e71938366c8e1a7c", + "sha256": "0lp32mjmbzjbsvzia2zd29yv0i75mqvp1w7c0jcwvyyl6gqbg3k1" }, "stable": { "version": [ @@ -85238,8 +87029,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20200502, - 349 + 20200816, + 827 ], "deps": [ "cl-lib", @@ -85247,8 +87038,23 @@ "popup", "posframe" ], - "commit": "daf956df30d4007f70a4495560d656e517ab69a9", - "sha256": "0wr1ski9j7m7mwizdgxnnj61z1nqpyjp6gc7dniaac0m6svxf1rf" + "commit": "aab21695f1dee0db3ddf0f0c834b94aecec7057c", + "sha256": "0rzghfnrdyrqijw76f4vvsn3hsninwp3qyvr1p7r0ddz21xz04np" + }, + "stable": { + "version": [ + 1, + 0, + 3 + ], + "deps": [ + "cl-lib", + "dash", + "popup", + "posframe" + ], + "commit": "2a0b116d56bf54456eb5d6e8e80a7a6cf6944863", + "sha256": "08rzkiqwcl8j3i2yyibll5lcsj8720plzm9zfdgmxgkw7vhcyix5" } }, { @@ -85405,14 +87211,14 @@ "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "js2-mode" ], - "commit": "f7d31589acd8a2dfcf4ca8851d2384e4f90364d0", - "sha256": "057pgylflzd69ydqz41g8wisvixypdrfn8yv81mfixh3iyq740y8" + "commit": "0061587a06cdc2579a8d0e90863498d96bf982d8", + "sha256": "08b4hdgq4hc1yfd9pvyir2j3cqqdqa3j5svgaba97x5fzhsz7y8i" } }, { @@ -85438,26 +87244,26 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20190521, - 58 + 20200628, + 1225 ], "deps": [ "inf-ruby" ], - "commit": "68503b32bb3a005787ecb7a7fdeb3bb4a2317e2b", - "sha256": "1v4nbfr3rhdm1733gb88cv0f018iy53cw5hdcwpshrmjj36a2lpn" + "commit": "082da38797d247f9c64568ad712a345e041d5c84", + "sha256": "1xbj7wi389n6pxfvxrakvhylkdlqg8ll9ad2zmxggcchygwah6nl" }, "stable": { "version": [ 0, 8, - 2 + 3 ], "deps": [ "inf-ruby" ], - "commit": "1908afd42ce05fc8b8bbf3f38301680264b68d19", - "sha256": "0qw18wi54yg971n4wnjqkd8lqj5lbs9ra8bvmngif2bzhqlfdsbn" + "commit": "082da38797d247f9c64568ad712a345e041d5c84", + "sha256": "1xbj7wi389n6pxfvxrakvhylkdlqg8ll9ad2zmxggcchygwah6nl" } }, { @@ -85606,14 +87412,14 @@ "repo": "zk-phi/rpn-calc", "unstable": { "version": [ - 20181121, - 1154 + 20200816, + 545 ], "deps": [ "popup" ], - "commit": "27279f89c80eb3f28ff9f981eff06502056943e2", - "sha256": "0klzhscdvzwpcrfkq2v28in5fv01zqabgxdrziyhj666sly1scjq" + "commit": "1554be19acc2644898a2175fa277d1159327c8dc", + "sha256": "1b4v9x8f9ykz2dqiv7p7c2f6kbl374i2723idmnvm2c9bc0hbpyv" } }, { @@ -85647,15 +87453,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20200228, - 2348 + 20200615, + 1443 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "9a2a9d2935ae17b8570485bdea7c347533b464f6", - "sha256": "0plr71dbghzcnbrl9l4g52g59yvlcx1dh41fwcnp0b12x13vslay" + "commit": "f1029cad2a8d9fd096e9a0f1ae9e7d7e2c8bd1ec", + "sha256": "02818knhbnqqnfmlhzr2ak0i6cv6pmbxw2icns2lg8vfr430c286" }, "stable": { "version": [ @@ -85678,11 +87484,11 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20200507, - 1824 + 20200810, + 2326 ], - "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", - "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" + "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824", + "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b" }, "stable": { "version": [ @@ -85707,8 +87513,8 @@ "deps": [ "rtags" ], - "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710", - "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr" + "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824", + "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b" }, "stable": { "version": [ @@ -85802,26 +87608,26 @@ "repo": "jimeh/rubocopfmt.el", "unstable": { "version": [ - 20181009, - 1703 + 20200713, + 1144 ], "deps": [ "cl-lib" ], - "commit": "fc96145719a65b2551339d087ddd95b72e14646f", - "sha256": "12sfzvb5lf20d4kqa1fzhz8s48lgr8w0x7qimjcy5c75yjb123wl" + "commit": "b84810105940aa5e0bde20c9a89359c95c9b6917", + "sha256": "1w922wl7zab61v6z09rh3xpjnfi97c802ijvv4g92nqds6fhnym1" }, "stable": { "version": [ 0, - 3, + 5, 0 ], "deps": [ "cl-lib" ], - "commit": "43ffa9d9c3dcc0574038bebd049102642f50b290", - "sha256": "0vzpfd9xv80ph9xz8psczz46blhsdnac8zh5i944klkxgqdw7x1x" + "commit": "b84810105940aa5e0bde20c9a89359c95c9b6917", + "sha256": "1w922wl7zab61v6z09rh3xpjnfi97c802ijvv4g92nqds6fhnym1" } }, { @@ -85998,15 +87804,15 @@ "repo": "ruby-test-mode/ruby-test-mode", "unstable": { "version": [ - 20190412, - 909 + 20200521, + 907 ], "deps": [ "pcre2el", "ruby-mode" ], - "commit": "e805a81c3ea787f3c82dbb252c21d747be20bc7a", - "sha256": "07j74hgq3d4y6m992y98y9n87ivk8a2wb3zlahkj32slkcqfz3kd" + "commit": "5bb6b7b7ba0a4c91ba2e029853215e76e5df7772", + "sha256": "19sacch06cxj1803m8ac246cl9sp1wsxbp7zgrhmw1gdpsnpxac8" }, "stable": { "version": [ @@ -86164,11 +87970,11 @@ "repo": "vmalloc/rust-auto-use.el", "unstable": { "version": [ - 20181125, - 637 + 20200608, + 1359 ], - "commit": "d924505ecd954625dcb2d56dfba97111dc6a17fa", - "sha256": "1yw9l13dgkfsdv4kgpbvzx12g8bqycclgq2gk4b1r29mxy72wnpq" + "commit": "d5205f7b9b9eae0f7d0893f87d3391464719f9c0", + "sha256": "01jhb4bjb4dc4m4nw6n16dc4cc7x9z7j2vri0s1y16v1bm4cv26g" } }, { @@ -86179,20 +87985,20 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20200513, - 812 + 20200709, + 723 ], - "commit": "bfe40565753295a4cf8403f4124710acd2827d21", - "sha256": "1bx0hfilw48cz8n58lf427yg6sfi50wr91vcmj0w0m4s26zbdrr2" + "commit": "ca7d99c6fd90fc1e636aa9d4020a2f077786a0c3", + "sha256": "1m24g08q7w76aq0gnb2pdp0jbadi19fw4jmbgmx47180glz082qh" }, "stable": { "version": [ 0, - 4, + 5, 0 ], - "commit": "106aeab800fb3404baf231845d3e3549ec235afa", - "sha256": "0bcrklyicxh032rrp585rl5mxd26nb61dp6r5bl935rlcmxzsczh" + "commit": "00177f542976601d7f114fed82caaa3daad7b177", + "sha256": "1f3nnl0d7p9b5cv1bpm0hj898qmr2psxfvmqr61bh684z7fgc045" } }, { @@ -86226,8 +88032,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20200516, - 759 + 20200724, + 1517 ], "deps": [ "dash", @@ -86241,8 +88047,8 @@ "spinner", "xterm-color" ], - "commit": "52b632d161b64bdca3f35e35180af63b668ce9fb", - "sha256": "1pcqm8463hjlv70bn6cpl2sv3z2h992yvkzrcz0w2rpz6jgrcfg1" + "commit": "75b99201bb4e7a0bd990c006896ad7897f284ca2", + "sha256": "1ddma5fi2yaxg2c2hvigfz4hbp218l71ixcnnkzp8ilqr8m2jvjj" } }, { @@ -86256,8 +88062,8 @@ 20150402, 1442 ], - "commit": "134497bc460990c71ab8fa75431156e62c17da2d", - "sha256": "1z5psj8mfp0fw8fx6v1sibf8cxhz30yyiwjw17w80f9c24g0j4ii" + "commit": "081d5173158054c6d0780b9462c74c5697eac1fc", + "sha256": "1s950jmhrwjmzrr3qv3636sn2rhxfvaqlrl36h8700pq3791l1fs" }, "stable": { "version": [ @@ -86350,15 +88156,15 @@ "repo": "mattusifer/s3ed", "unstable": { "version": [ - 20180204, - 1349 + 20200720, + 1313 ], "deps": [ "dash", - "seq" + "s" ], - "commit": "13503cb057bed29cb00a14dffe4472b5cb7748ad", - "sha256": "1ak5nmay12s4ipmvm1a36kyny05xhzmj7wp6dry391db9n7g2wy0" + "commit": "3e3b962d3848e6cc8ce9dc491b2e29e915a5c351", + "sha256": "0v8c3zwnfy40clbq6lb03z33n5pj36sz5jpprmgppms3w2ba6fw8" } }, { @@ -86393,16 +88199,16 @@ "repo": "sagemath/sage-shell-mode", "unstable": { "version": [ - 20191103, - 1040 + 20200524, + 958 ], "deps": [ "cl-lib", "deferred", "let-alist" ], - "commit": "8ff9888fd84a96816512403a1b5ded93b4d4278b", - "sha256": "0rrp137r5cf049xqry3jz514pmdzfxkmri9z8kv08yk3w3c9sapj" + "commit": "855fb4ece47cea2c72295ce2158e0915829835b5", + "sha256": "12s289g5xc1b7szyp0zhxdxh6rzhlhkzwiwg14hf020c41mz27am" }, "stable": { "version": [ @@ -86598,6 +88404,24 @@ "sha256": "0h8bl28p5xrs9daapcjkslm066a4hqlb764i5nz1db0lwrvr0csm" } }, + { + "ename": "saveplace-pdf-view", + "commit": "94efcb8e99185753d73c7436c18a086c441c0d7f", + "sha256": "1z43sb8fyg8zhlcmpn2vbivjnzljka64q146v5v81k990pjvk3z1", + "fetcher": "github", + "repo": "nicolaisingh/saveplace-pdf-view", + "unstable": { + "version": [ + 20200719, + 113 + ], + "deps": [ + "pdf-tools" + ], + "commit": "bbbc466fff060b372a9d2b30e48ec6bbb7d03095", + "sha256": "13dxd06dicv50rl1kk6c5971iaj7x3imkqs5q2ndm0daqzrp0lva" + } + }, { "ename": "say-what-im-doing", "commit": "35763febad20f29320d459394f810668db6c3353", @@ -86635,8 +88459,8 @@ "deps": [ "cider" ], - "commit": "277404a6bb0a979e195df5886fc143bb1d1f1e8c", - "sha256": "0whsfl6z39zhjm6b3wcliwfs70xz3pg9b1r6s2bcwnp5ld1v65m9" + "commit": "cbc3546fb6b1374080f1646ac3a6532a5723b7eb", + "sha256": "06aysbwr4lr9cd8mbfdpkiz8458hwl5qg41nq1wnl5dx0gvw3fgn" }, "stable": { "version": [ @@ -86659,11 +88483,11 @@ "repo": "hvesalai/emacs-sbt-mode", "unstable": { "version": [ - 20200106, - 753 + 20200521, + 632 ], - "commit": "633a315ad453cd963588c9b8fba02d9cf75296b4", - "sha256": "0ha2lyw42ir16b2d09y27q0rsdx6azcfv258frp1ja63mx0jiqic" + "commit": "4358ed862a1b1ec18ac9699afb4862146669eb79", + "sha256": "1qm5ziilapfpafqch3pl5iijfj1kwccl2r7g4xl5a2pqnc480sjl" }, "stable": { "version": [ @@ -86683,11 +88507,11 @@ "repo": "openscad/openscad", "unstable": { "version": [ - 20190413, - 1246 + 20200628, + 2256 ], - "commit": "648206e2ea609e8f38599cd540368d54ff52ae8a", - "sha256": "0vsabvci7y5l1lbqmn0fw301wfnwbb7fw7vffm1gd0w7rjjhxw73" + "commit": "0c9a36b82c7129a0fdce20ce99e15ecdffd3b437", + "sha256": "0qsvi7d3bcsai99dvbdfm8n6qafvwj51r4g4ph5jch2f1yb8m995" } }, { @@ -86698,14 +88522,14 @@ "repo": "zk-phi/scad-preview", "unstable": { "version": [ - 20160206, - 1336 + 20200816, + 549 ], "deps": [ "scad-mode" ], - "commit": "fee011589671cc8f1296cb6aa81553e5bb699819", - "sha256": "13x00dls59zshz69260pnqmx6ydrjg8p2jdjn1rzgf5dsmwfy3sc" + "commit": "75fe00a9aaf875ac97930bdb334aef9e479e41d5", + "sha256": "0vdb9ib76fjdvm3f13v3kh7x04izq993crrzsqp0vs5nilbkrs8c" } }, { @@ -86716,20 +88540,20 @@ "repo": "hvesalai/emacs-scala-mode", "unstable": { "version": [ - 20190929, - 1522 + 20200524, + 1304 ], - "commit": "46bb948345f165ebffe6ff3116e36a3b8a3f219d", - "sha256": "1072lsin7dxadc0xyhy42wd0cw549axbbd4dy95wfmfcc1xbzjwv" + "commit": "1d08e885b1489313666c7f15a3962432a4f757ee", + "sha256": "06g6szxb9a4ih90mcryv9r1h6nqbpk3x4icd1i6nh2ky1sj6s37q" }, "stable": { "version": [ 1, - 0, + 1, 0 ], - "commit": "56cba2903cf6e12c715dbb5c99b34c97b2679379", - "sha256": "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg" + "commit": "46bb948345f165ebffe6ff3116e36a3b8a3f219d", + "sha256": "1072lsin7dxadc0xyhy42wd0cw549axbbd4dy95wfmfcc1xbzjwv" } }, { @@ -86813,11 +88637,11 @@ "repo": "emacs-pe/scihub.el", "unstable": { "version": [ - 20190801, + 20200604, 920 ], - "commit": "a32e8f47961d606c1315a972f2dab4d3a61945af", - "sha256": "06qcs7jq68ylmvw0kf1myhpgzci7i9qbb2h0hxh0g21mz8ssna3f" + "commit": "5a4666ca99de6a90108b4606b4c57270c03002ce", + "sha256": "1njvf7712ryfd83xk27b6d2nx653j57x3ckn7xba7an4i0g7gk4a" } }, { @@ -86881,14 +88705,14 @@ "repo": "technomancy/scpaste", "unstable": { "version": [ - 20200415, - 40 + 20200717, + 2007 ], "deps": [ "htmlize" ], - "commit": "ca95a8dd088e848bd1cab6be207c6a98343ee176", - "sha256": "01v199xkadcbdr627skhisixdqj0hbbyv912xgyypm1rxdjfhhx9" + "commit": "2aa1513fa0a402f03b993c0a6929daf39820b02b", + "sha256": "1cvkqb5v0v790nmhg4wi6kv6mbzfkfcgvn2xh9bmny37dcv0i2gk" }, "stable": { "version": [ @@ -86926,6 +88750,30 @@ "sha256": "0yiwq2gc4gdgfhaagpawhb7yrzc4fsnyb10w5d0q4whv64cj8555" } }, + { + "ename": "scratch-comment", + "commit": "9578c2878a7a5f89fd495531e03a8658696fc360", + "sha256": "06zn1czv7bw8akbgp61pxi1k4kd2r06d7nxvr14j3cpb3v7fs7kz", + "fetcher": "github", + "repo": "conao3/scratch-comment.el", + "unstable": { + "version": [ + 20200812, + 1025 + ], + "commit": "cf3e967b4def1308b6ef1cfeedd2cf15ee6e226c", + "sha256": "0wq1vf391h53ys3292ap7f4nvk4i7wz3cqfbb18bwzz7iga922qd" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "d62665ecbeb05d1f92761af185736609278ffba2", + "sha256": "1bnzijfp6jkhl59y18qxnj39f06jzs39xgvj5aj7vlab5zrassmg" + } + }, { "ename": "scratch-ext", "commit": "a142d336a57d075dfd5caf44fa1c1254b83ac728", @@ -86979,14 +88827,14 @@ "repo": "zk-phi/scratch-palette", "unstable": { "version": [ - 20150225, - 842 + 20200816, + 551 ], "deps": [ "popwin" ], - "commit": "f6803b448079f4a81cc699cec7442ef543cd5818", - "sha256": "00b4r8bqlxc29k18vig0164d5c9fp5bp5q26d28lwr4f0s4a71d2" + "commit": "c39cacb11992383887fa096ace85510baed94aef", + "sha256": "1va9c97cvdqf6404kixvgk0qwrlnc1lrz6khpkdp2w7w1brhf2f7" } }, { @@ -86997,14 +88845,14 @@ "repo": "zk-phi/scratch-pop", "unstable": { "version": [ - 20200504, - 2004 + 20200818, + 1820 ], "deps": [ "popwin" ], - "commit": "1a36cb5ab6668aa57b1b7192521a472feeec1ea2", - "sha256": "1hdbwzd52qhn2jc8ghkp0lwr2hzrs4zfnwj6vniffxd5xz3c21ck" + "commit": "b1bdd0f8a345737069194ab8727f164f5d8560b4", + "sha256": "03x0kb0cf4yzjxl9nqwl3sg9nl75l9n8k4ain0yw0h2vpi2g0wf3" } }, { @@ -87198,21 +89046,6 @@ "sha256": "0zs08vxmjb3y4dnfq6djnrhmkgyhhwd5zylrjisrd4y7f089fyh4" } }, - { - "ename": "seclusion-mode", - "commit": "b087d151b00f5251b15ebb071896995874afb274", - "sha256": "0ff10x6yr37vpp6ffbk1nb027lgmrydwjrb332fskwlf3xmy6v0m", - "fetcher": "github", - "repo": "dleslie/seclusion-mode", - "unstable": { - "version": [ - 20121118, - 2353 - ], - "commit": "9634e76c52bfb7200ff0f9f01404f743429e9ef0", - "sha256": "15cjhwjiwmrfzmr74hbw5s92si2qdb8i97nmkbsgkj3444rxg239" - } - }, { "ename": "secretaria", "commit": "3eeddbcf95315da40d021a6913ccf344849c4284", @@ -87365,11 +89198,11 @@ "repo": "Kungsgeten/selected.el", "unstable": { "version": [ - 20170222, - 834 + 20200528, + 606 ], - "commit": "03edaeac90bc6000d263f03be3d889b4685e1bf7", - "sha256": "1d72vw1dcxnyir7vymr3cfxal5dndm1pmm192aa9bcyrcg7aq39g" + "commit": "3043fd2609f7e71d809763ae6e8dd4b6c904e63d", + "sha256": "11cr55g7rrr4gqb9r2znmff0bp112l7a96d26mznfdprzj7pdzvd" } }, { @@ -87404,19 +89237,19 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20200514, - 1440 + 20200817, + 1459 ], - "commit": "392fb1ba8a594a291854c27d2b6824b04cd0c2e7", - "sha256": "1rr7w8jlxsfn2kpryb1ywn066qlc31px1dbwd42hafp6k5cl870n" + "commit": "5448e7cbaeb8d58c5dfd474cd0e03d6db60ac532", + "sha256": "09xfi0gfk9jmjmz941cfzwrv15jlzqxzwlq4m0qb29g1r4kv62ng" }, "stable": { "version": [ - 1, + 2, 0 ], - "commit": "5995a4ba07a7b1b5f661ff050d93ad702f9014a4", - "sha256": "105zl102dwbzvk50xh6b824nq6p24kxhky18ghdnk5yi5sv620lm" + "commit": "51b75f4b287b13beff86810eb3a060747ac191e9", + "sha256": "08wm4ybidn8g7sy5a009lnsm0f1p7a3jfzpzxnzylvnyrmyhi3y4" } }, { @@ -87427,27 +89260,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20200404, - 1550 + 20200716, + 1414 ], "deps": [ "prescient", "selectrum" ], - "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7", - "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv" + "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530", + "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p" }, "stable": { "version": [ - 4, - 1 + 5, + 0 ], "deps": [ "prescient", "selectrum" ], - "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", - "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" + "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc", + "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix" } }, { @@ -87492,14 +89325,14 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20200429, - 641 + 20200818, + 1252 ], "deps": [ "flim" ], - "commit": "57a948c5f07e57e78ab3c0e6fd76ffcd591bb4ac", - "sha256": "0y73l0zf2lg7kxz7kpbirpipzq007bdrgmlqfrv8najh4q03gf8g" + "commit": "10897f024fd9282c73385d24514cc4b57fe193db", + "sha256": "14d4j17l0ngg6fp00mf2zgyz6989cx9n5n3za7ifcfr8gjbbn7gp" } }, { @@ -87510,29 +89343,30 @@ "repo": "conao3/seml-mode.el", "unstable": { "version": [ - 20200419, - 1022 + 20200812, + 1027 ], "deps": [ "htmlize", "impatient-mode", "web-mode" ], - "commit": "4ca9d275948898602640a46573cb95d7eef913e5", - "sha256": "1wl5qsph19i0ll2ppn9va4563m4bfz1zpv99d7xd7w65x6cp29ci" + "commit": "7a9a8305f7b54ee59e4c29b33ef5fd4058ba4219", + "sha256": "0sm6kd0r7wjsvynfkhq33d6rz431j784jlbxjpag60g5avxha9s9" }, "stable": { "version": [ 1, - 5, + 6, 0 ], "deps": [ "htmlize", - "simple-httpd" + "simple-httpd", + "web-mode" ], - "commit": "f62f7a9f5e18ef8f370444a1fce710770227b0f5", - "sha256": "037p2kiwkkbk921ik15jalcci0p87q3my9mxzyh6i0mnc6qsh4zf" + "commit": "1f8bda7e5a4a36212f968b462cfc31ce53c6db85", + "sha256": "1hc0rwlgapbqf9965n3nsyvd4chdga5av7ya82wjzxn1mx4bhifa" } }, { @@ -87610,15 +89444,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20200407, - 728 + 20200702, + 634 ], "deps": [ "dash", "edit-indirect" ], - "commit": "e9a7b4402859d73f052330106d29ad14c3d9b6f3", - "sha256": "0d9w8n497j6q879rd9mqrmzvk3ssm95ayqbyfb5x0r3pnywdjp1b" + "commit": "fa752df206f8f6e64f27e2a6d998ddd58e3c444b", + "sha256": "1c0k5cg2si4i0hwdi7lbh058rq6vmry8ncddgq5dxbih14wpbys4" } }, { @@ -87893,11 +89727,11 @@ "repo": "sfztools/emacs-sfz-mode", "unstable": { "version": [ - 20200312, - 1153 + 20200716, + 1023 ], - "commit": "4d8ccde889b112896c7299cad9f1e9305bde8cb3", - "sha256": "1ccqb05xmnxpwxl9vdvkb3f8211kbj5rsb73xv1ghyx3i40qjmzm" + "commit": "aaf31d1b68817251affed7da719dfcb2acd4b51a", + "sha256": "1b9qi5vhqp2c2bmkyvmjj4nrb3n42g4w71p2phxssiwmyq80m28f" } }, { @@ -87908,26 +89742,26 @@ "url": "https://depp.brause.cc/shackle.git", "unstable": { "version": [ - 20200506, - 1231 + 20200529, + 1839 ], "deps": [ "cl-lib" ], - "commit": "4b81514191dd182a28a3e5b2fe3069264b6835fe", - "sha256": "0k3waffnd08x1vb7mj6ix21zcadn9ipx4fis26iy3dsj35cbd3fb" + "commit": "171c3f437d853f34782b201d86ef765665b755e2", + "sha256": "0s4br59zpd5qq7z9074ddq9lmwnddq2ixijwi666wp5gxw45fpgg" }, "stable": { "version": [ 1, 0, - 3 + 4 ], "deps": [ "cl-lib" ], - "commit": "242bacc940c18b6f9c156e1912155d45537fd827", - "sha256": "0qqx8py21jaq1bdafkfqx18ns4zn305qg84zbmy65spiqnfq8hwk" + "commit": "171c3f437d853f34782b201d86ef765665b755e2", + "sha256": "0s4br59zpd5qq7z9074ddq9lmwnddq2ixijwi666wp5gxw45fpgg" } }, { @@ -87971,8 +89805,8 @@ 20190903, 1907 ], - "commit": "f3cbe25c82f99367ac009d67a2400eb6d56547ff", - "sha256": "10y7qcb61f0x17fy5h2flhvyyql99cshqmfy1varn1mgg2h36mn9" + "commit": "5f24c90bb8e7333ee4315619672dc2ec69d198be", + "sha256": "0msrhh41nyvyy17skd5y5lzdz7a6lxnlqnflgz4xf2qpnc390kd6" } }, { @@ -88290,8 +90124,8 @@ "deps": [ "reformatter" ], - "commit": "342c55fab27f1e62472eebbb53cfc73b0d422a34", - "sha256": "0hmxa856hlai9ydarfsn5s9i8cnfrydgpa7mkh4a36klhdj21gfh" + "commit": "465dc1fcaeed778b504d3d349a30e611368dcc00", + "sha256": "1gzky5xs63y7xl7j2hs81aja8qq6c5l3vk07hh050flw4yfxyi23" }, "stable": { "version": [ @@ -88355,19 +90189,19 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20200406, - 2209 + 20200813, + 37 ], - "commit": "e522a44b151d69d4a176e8809225598ab540fc4d", - "sha256": "1alishzz4j1hbfyfi09rkhffx6gv16yxln7q8jx25shb9rssivyz" + "commit": "7dcbab77334c5adf8309c7a93512c9f95a2c64e4", + "sha256": "0in8ir99b33d83nfxsnpj2dgyv4f558yrid77bp7f9k0qpgpj4zk" } }, { "ename": "shm", - "commit": "68a2fddb7e000487f022b3827a7de9808ae73e2a", - "sha256": "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0z9qwwqf63wmizzby3yanqa31050f9jp6zrfhx7grf8a9aj89m89", "fetcher": "github", - "repo": "chrisdone/structured-haskell-mode", + "repo": "projectional-haskell/structured-haskell-mode", "unstable": { "version": [ 20180327, @@ -88431,20 +90265,20 @@ "repo": "jcs-elpa/show-eol", "unstable": { "version": [ - 20190924, - 621 + 20200723, + 706 ], - "commit": "bd0e47d7d61bf04a923a1d1689693a47af3a2b22", - "sha256": "0nq02qf7rxswxqcsl1lv7skd14ixmmyjkhk7wdbn5j3dhw192bh7" + "commit": "9fe95a4b1cda218082eb1d977190cc66c7a6b4ea", + "sha256": "1nzid34cwgyqih46glw3r5hkav1px5wf8w2skbac1f3vvjfm6qk7" }, "stable": { "version": [ 0, 0, - 3 + 4 ], - "commit": "097a2a79e5bd7c297bcdc231559813056cd584ac", - "sha256": "0yhwd20azk6ib992fy3vzb9knqji3g6hz3ahz89sz71sjjvy1rrm" + "commit": "9fe95a4b1cda218082eb1d977190cc66c7a6b4ea", + "sha256": "1nzid34cwgyqih46glw3r5hkav1px5wf8w2skbac1f3vvjfm6qk7" } }, { @@ -88502,14 +90336,14 @@ "repo": "xuchunyang/shr-tag-pre-highlight.el", "unstable": { "version": [ - 20171113, - 914 + 20200626, + 1047 ], "deps": [ "language-detection" ], - "commit": "6182f43a36b0f82ba6edcf6e423b5f69a46a814e", - "sha256": "0916bpzi6sw5gyn5xgi9czf35zrvl04w10wz6fvz0lc57giihil1" + "commit": "931c447bc0d6c134ddc9657c664eeee33afbc54d", + "sha256": "09gcprqhl1ds4k407rlsjqr9y56a9wvjkli70wrf2l7w3dcm4qq0" }, "stable": { "version": [ @@ -88530,14 +90364,14 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20200508, - 1711 + 20200816, + 1032 ], "deps": [ "org" ], - "commit": "a146e7d25713c33999deff24338670a5d1308c6a", - "sha256": "17pm5ljn004wdsl2hryjla5my8a63mx3bpapkqfyvrkwswwzs3fw" + "commit": "9470de04daf0d917d0501432cea78cd6f5cefec4", + "sha256": "00qi4dg0684all2aw9dljzd3hp01vk3hsfqpf2pvri8l31a9dls5" }, "stable": { "version": [ @@ -88687,8 +90521,8 @@ 20200410, 639 ], - "commit": "e5b4bae0a1a9bb8a762da40397a04efdd0b2b397", - "sha256": "0p9b621rgy34r1hl9xfzxh4xpx9gpsr3n330ypfxhlr0s5754j73" + "commit": "5308d6891276b0aa2b0fd865f6c6f8c1a80ecb54", + "sha256": "01sz7iqny2r1zfipkria6r5w48rlbrp3ranqqyywvsxhwwr3apmp" }, "stable": { "version": [ @@ -88738,20 +90572,20 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20200311, - 547 + 20200617, + 1445 ], - "commit": "f78d7ba1173cf6056a95935add30cd30b7a7d347", - "sha256": "0fv1l3vrm50qbxs0dc1qyy1m3i08w46lh3z6nz8p32va5yjwfjmj" + "commit": "27c964334b8e30fa88e4278ae58dc3d00df34f1f", + "sha256": "1xl2ykdscrwpxm02ypnf68mkxf9dkp64cj465b69s874x10bxfc3" }, "stable": { "version": [ 0, - 3, - 1 + 4, + 0 ], - "commit": "f78d7ba1173cf6056a95935add30cd30b7a7d347", - "sha256": "0fv1l3vrm50qbxs0dc1qyy1m3i08w46lh3z6nz8p32va5yjwfjmj" + "commit": "27c964334b8e30fa88e4278ae58dc3d00df34f1f", + "sha256": "1xl2ykdscrwpxm02ypnf68mkxf9dkp64cj465b69s874x10bxfc3" } }, { @@ -88942,14 +90776,14 @@ "repo": "jorenvo/simple-mpc", "unstable": { "version": [ - 20180716, - 129 + 20200523, + 1804 ], "deps": [ "s" ], - "commit": "bee8520e81292b4c7353e45b193f9a13b482f5b2", - "sha256": "1ja06pv007cmzjjgka95jlg31k7d29jrih1yxyblsxv85s9sg21q" + "commit": "ce731fa390b7e4edfc461a9cfb4443c1aab4b011", + "sha256": "14fb52r5fzdcqqbh5kkajaz43iqq8g64g0rsswwwv6g1j23y93k3" } }, { @@ -89103,6 +90937,24 @@ "sha256": "1p1771qm3jndnf4rdhb1bri5cjiksvxizagi7vfb7mjmsmx18w61" } }, + { + "ename": "sis", + "commit": "bea2374d589869dde682db96c35c530a051de3a9", + "sha256": "0zkfpmnnj30l36mcv90x90vs31x8q2rrs2ixy5w8lc96vn1dgavf", + "fetcher": "github", + "repo": "laishulu/emacs-smart-input-source", + "unstable": { + "version": [ + 20200816, + 1533 + ], + "deps": [ + "terminal-focus-reporting" + ], + "commit": "2568d04908af2d529f5ce0e71f0da541ff53e2a8", + "sha256": "0kmfhq6rypcc00ylmhf0m9nd51r6kzqfp6hcd22riynq51fb2cyh" + } + }, { "ename": "skeletor", "commit": "1e63aefc869900c2af6f958dc138f9c72c63e2b8", @@ -89272,8 +91124,8 @@ "repo": "yuya373/emacs-slack", "unstable": { "version": [ - 20200512, - 1702 + 20200725, + 1052 ], "deps": [ "alert", @@ -89283,8 +91135,8 @@ "request", "websocket" ], - "commit": "b30525d63bb46882240de6f86e951305bcc7af10", - "sha256": "1f35lr19g5ci1jba6b9hkl7vajg4iy1yw6wb8bhg8dyppdkwnmvy" + "commit": "7570e82604b59b65e9ef31c5325bef45769ae027", + "sha256": "1i7fb4icj9h4lkcsfqqqhsi59msmslckcgxaa5aag4v3cdy93prg" } }, { @@ -89345,27 +91197,27 @@ "repo": "slime/slime", "unstable": { "version": [ - 20200414, - 1444 + 20200810, + 224 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "221518f0d3d224403743e6690f6bb66c42d9dec9", - "sha256": "0wbxv461lq7760gsqjw5djhjkzmwxz563l97csn2637gb1wkn461" + "commit": "fb12bac676ab51b75be19197e21ab4674479d627", + "sha256": "1lqd6mk87kmmyb83qf4h0i5wpq3mnqwzl9gdcjildy7afsp3f1fk" }, "stable": { "version": [ 2, - 24 + 26 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "c1f15e2bd02fabe7bb468b05fe311cd9a932f14f", - "sha256": "0w7j835p9riyd6n4znj3x255lwsrmy0lj51hpc7bhk0vdz2cv2qm" + "commit": "fb12bac676ab51b75be19197e21ab4674479d627", + "sha256": "1lqd6mk87kmmyb83qf4h0i5wpq3mnqwzl9gdcjildy7afsp3f1fk" } }, { @@ -89440,14 +91292,14 @@ "repo": "augfab/slime-repl-ansi-color", "unstable": { "version": [ - 20190426, - 1414 + 20200712, + 1226 ], "deps": [ "slime" ], - "commit": "fdd0c7a75a217abca2ff16ab9281d55f392bd841", - "sha256": "0d3q9js5vybddniyirvvabljmxasgdqimjdpy7pn48hh4rd875di" + "commit": "e38c7958d9657e41c426b4e96938b3f604238795", + "sha256": "0rbg6ndi59ycw54s2c21a3c2cr0wlymrpp4qr33yxv1ik00n5n5p" } }, { @@ -89570,11 +91422,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20200314, - 55 + 20200816, + 928 ], - "commit": "1382bda945ecfb4b177c7d05a36da8fd41e0384c", - "sha256": "1hmdx3nakhpsmg6zr52090pimmy0kpjz2adyi0m1wzh9zdg5cx4x" + "commit": "155cb0655e037477b592f8bde9c80022427293e5", + "sha256": "0g0ncqb7x3g3gafxm5j0v893cvnskq4idb5442f0v8d3y9pr0lyi" }, "stable": { "version": [ @@ -89679,14 +91531,14 @@ "repo": "joaotavora/sly-quicklisp", "unstable": { "version": [ - 20191012, - 2124 + 20200707, + 1635 ], "deps": [ "sly" ], - "commit": "01ebe3976a244309f2e277c09206831135a0b66c", - "sha256": "1vfqmvayf35g6y3ljsm3rlzv5jm50qikhh4lv2zkkswj6gkkb1cv" + "commit": "4707b62803d7a29f172e9c5ff993b91187a9aaf3", + "sha256": "1i4fqgd42khl85d4fifgfz2z6njpb8bxdry4chmgl8wfhh0mydza" } }, { @@ -89746,11 +91598,11 @@ "repo": "zenitani/elisp", "unstable": { "version": [ - 20200508, - 249 + 20200727, + 1249 ], - "commit": "f808ac53870d32c57a3cd01dd2850ee62d3af98a", - "sha256": "0dy3idfbvlrrim3rkv7lrr12gg2s4wlml6wcwgv1mazq3kdvjvvl" + "commit": "1f14c86af7ca5813ddc0b6dfcf2edd4a81371644", + "sha256": "0z1mmbgsx2lxrlyg59kz39khbir5k3cwb83mpz49ixfmy54byx5n" } }, { @@ -89770,16 +91622,16 @@ }, { "ename": "smart-dash", - "commit": "98a2cf93cc41cb2bba14f91a83b6949267623198", - "sha256": "1n3lh0ximwrqawdg8q9ls6aabidrawqca5w67f8vsfmrvyfx48n4", - "fetcher": "bitbucket", + "commit": "59d3ab87741a9290fce17307256e085b91dd1d8a", + "sha256": "1rs5xxmn2qdpwla55rq4ar1kani2acil3sq47gx15y3v0rsrxxkx", + "fetcher": "github", "repo": "malsyned/smart-dash", "unstable": { "version": [ 20200104, 1620 ], - "commit": "cc540eea7452e15d4ef2b09d8809d88174f509c0", + "commit": "9db5c6bb4a51457281588523a2725939a31d3f26", "sha256": "10xp7nf42v9rz9as3gspjcm3rjy075xza3yqbcppdk1zm59xxljr" } }, @@ -89831,24 +91683,6 @@ "sha256": "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi" } }, - { - "ename": "smart-input-source", - "commit": "82ef5414e63fe94905f042534d8bde88fb5461c6", - "sha256": "1dx3cvbm9hrdfrj4ggf0hbmfag2hybdlrqgpzy48fc07dscv0acd", - "fetcher": "github", - "repo": "laishulu/emacs-smart-input-source", - "unstable": { - "version": [ - 20200428, - 1031 - ], - "deps": [ - "names" - ], - "commit": "6d6db53db20712570cb99cd6a03f2be0349d87b8", - "sha256": "1h8vcdzgbg80c51cl3x6ic2d8q2sjlk5dp9j4wvmzqg6qdf34a6b" - } - }, { "ename": "smart-jump", "commit": "52f29e14e61b28cd1637ca5d6bd878d91a71251f", @@ -90441,15 +92275,15 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20200417, - 2230 + 20200720, + 349 ], "deps": [ "cl-lib", "magit-popup" ], - "commit": "03562dcd82964d53eff7314b844c2897d1d9af55", - "sha256": "1cj8628l196da5j54wl8wq7znvha44z1f6w9qqg37yw0pjynbvxz" + "commit": "44b88fc2aff7c970c2699de2d8615d81092342f6", + "sha256": "0538bfjaj19s5fa94x3s0np4jj7cw2wc77yngxk809h8bb82s7ba" }, "stable": { "version": [ @@ -90689,14 +92523,14 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20200423, - 742 + 20200812, + 1552 ], "deps": [ "cl-lib" ], - "commit": "adc8c0c60d914f6395eba0bee78feedda128b30b", - "sha256": "0kj6lhx57gl3809q4bmgv7cac8wk61g1sdyr4c2a0y9jkzf21x67" + "commit": "cd63b675140232f399e7733d7ce95a0b931b1058", + "sha256": "0c7l1q7xyzvxqlk7vawfrx7gmzsmycjy2lib12wmgvfh83bgc3bh" }, "stable": { "version": [ @@ -90719,14 +92553,14 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20200411, - 1026 + 20200717, + 1054 ], "deps": [ "dash" ], - "commit": "c8f09494330900081ed5a4f020c972a37fd7b02e", - "sha256": "0z5srqz4g81bsyw74q04fwz30qvi4i08s7fszmwnwyr5xrf5dx42" + "commit": "63eb59a7ef32abc6780883e27df69a6e42a8a6e4", + "sha256": "1hqqmji6vh468w73xi3fvkyzznr27f83czz0pcxzb00q62cbdqf4" }, "stable": { "version": [ @@ -90757,8 +92591,8 @@ "flycheck", "solidity-mode" ], - "commit": "022b3159832384a7dcdc2168809e698600826047", - "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" + "commit": "d166a86b83907e0cfd64c191e9dfce4b44a9843e", + "sha256": "19hgvsrqch2vp49ag6m76bi5qxd20v95z0ib838rib9as15b17wq" }, "stable": { "version": [ @@ -90782,11 +92616,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20200418, - 921 + 20200529, + 1924 ], - "commit": "022b3159832384a7dcdc2168809e698600826047", - "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" + "commit": "d166a86b83907e0cfd64c191e9dfce4b44a9843e", + "sha256": "19hgvsrqch2vp49ag6m76bi5qxd20v95z0ib838rib9as15b17wq" }, "stable": { "version": [ @@ -90856,10 +92690,10 @@ }, { "ename": "sorcery-theme", - "commit": "cdb6f1cfbf3bbeb1eeb6440fb216e8e3b523bb0f", - "sha256": "1qsavwbqidva4m0mdw393qbwlibhkkywnxj9mshfmkwaq050ivb2", + "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", + "sha256": "18g4lkn98cjz5y4c2csziykq9ixafgixsxki04hfk9k1d9idixz3", "fetcher": "github", - "repo": "vxid/emacs-theme-sorcery", + "repo": "mtreca/emacs-theme-sorcery", "unstable": { "version": [ 20200413, @@ -90880,20 +92714,20 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20200505, - 851 + 20200803, + 1402 ], - "commit": "0f73c5a87b874e72ed286cf43e0b8dfec73769c3", - "sha256": "0pmsgvmf1ilv2jpay1mwb49rjc1y3h1hhc2kg3rzjpg10p3mak1n" + "commit": "d5274cc4a8e19ed0f1393a09192def951d025a11", + "sha256": "1zdcwccndgmn83xmlxqlx6azd03g7dxd2ldc3dj6yxbjasfx00x5" }, "stable": { "version": [ 0, 3, - 2 + 3 ], - "commit": "5edb9379cd21411fb182239ed9ac19be4a278f32", - "sha256": "103837zizm5iqv3sskxgkhjij2icjx9sjvjhq2l9zi66rlh9gca7" + "commit": "d5274cc4a8e19ed0f1393a09192def951d025a11", + "sha256": "1zdcwccndgmn83xmlxqlx6azd03g7dxd2ldc3dj6yxbjasfx00x5" } }, { @@ -90913,10 +92747,10 @@ }, { "ename": "sos", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "0d0n2h7lbif32qgz0z2c36536mrx36d22gq86xm7kmxday6iy19k", + "commit": "e8acf595ef51c928b4b41a9fea171fbfd40c080d", + "sha256": "1sny4wa2746fi9p18js0y9fm2f9ix7yblqyqa36ibkfj4b50hvxi", "fetcher": "github", - "repo": "rudolfolah/emacs-sos", + "repo": "emacsattic/sos", "unstable": { "version": [ 20200510, @@ -91288,11 +93122,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20200324, - 1107 + 20200808, + 1859 ], - "commit": "f79c40fb241e204539fde97200abae91e828e585", - "sha256": "1l2kkiyrskkpx8f901v0wrzaah1wjg15zdyv88spj3mh3hwd3b6n" + "commit": "462ef2ac16ab8c51de21d5f3d2b1b6122b314391", + "sha256": "1qhvf0xf58cm4x8wij1l6301q1y6jp8j7i61g8lizlb24f7fla9l" } }, { @@ -91420,11 +93254,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20200122, - 2036 + 20200706, + 1236 ], - "commit": "590278f2b37919d082f576e522cbb790167a7f8d", - "sha256": "0s2znn91jy342xrcsda6mbf78f19ixxf5lf401jls8l5gj9bnx7f" + "commit": "058f91b4d1b0350221218656202ea80cd6827d65", + "sha256": "0c9k68mnwm7hhd9mj6f3p8k83kmd67rgzcr27791mnjfkhipynvb" } }, { @@ -91497,11 +93331,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20200426, - 600 + 20200623, + 307 ], - "commit": "e62cfc4f08fc4743d6961fe3402adbf2260d7e70", - "sha256": "1w6jsn3p6956vk5pzwlbc211sswqai8ary8ad3fbhbjwxl5z3gsc" + "commit": "e94d01cdc822e02968971cde09276047a5d55772", + "sha256": "0fph3l2cpis9k09d6yhl8rv9yb727ayqq6qw6pbmxmn687xmxx9q" } }, { @@ -91669,14 +93503,14 @@ "repo": "remvee/spotify-el", "unstable": { "version": [ - 20181030, - 810 + 20200615, + 1418 ], "deps": [ "cl-lib" ], - "commit": "29577cf1188161f98b8358c149aaf47b2c137902", - "sha256": "0h6yhfvvyd9sd5d37d3ng3z56zfb546vl95qjq16kcvxq00hdn1v" + "commit": "7e28ef0b4519c6a46fce6a89c0ff1ed775eda71a", + "sha256": "0mi8g6ryjg7czrr6fchwq9459ijd5c9wsvj3s9j0l0w4jcyxrvrd" }, "stable": { "version": [ @@ -91930,8 +93764,8 @@ "deps": [ "reformatter" ], - "commit": "2f10382034cd5cd2356cc69b4a1e9116d77a0d86", - "sha256": "18z9hljifw63zy4jrsyg4x2lqzgx29sfibx3maj0dm90yzj6zmcg" + "commit": "9e6351dc97a6f58f221d6e1baa7bab292309c437", + "sha256": "1r49c8ick1vk7zl4h0472z0p6j3d5b839al3s687acgqdymb24kk" }, "stable": { "version": [ @@ -91957,6 +93791,21 @@ "sha256": "06ln4vijl8kii3nzc5cscgsadx1fqgxksflijd3ain83bn8g4wrd" } }, + { + "ename": "sqlite3", + "commit": "75bbc8a92954bd12b4c9d206a804c34c97b19e3d", + "sha256": "1c7j8hzz8xs1nrn931apyj7nhwr3dnfbsrimb6fpdfmms8095y7w", + "fetcher": "github", + "repo": "pekingduck/emacs-sqlite3-api", + "unstable": { + "version": [ + 20200710, + 1432 + ], + "commit": "e5b14b03183cde855059084eba425428ec4618c1", + "sha256": "1r7hs23xa2yhr0rbgdhxid8gg4fwhrk2wjrk1scrp37aj2szwpjm" + } + }, { "ename": "sqlup-mode", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", @@ -92012,11 +93861,11 @@ "repo": "srcery-colors/srcery-emacs", "unstable": { "version": [ - 20200422, - 1941 + 20200813, + 1430 ], - "commit": "9630e465cc5166f723b7c5378e326561cf2a1738", - "sha256": "0ppaicggrrd3wrbjddw75mnsfli9a8db6bg21m1k7bafjkgraxfn" + "commit": "a3a4df9875ea6ae21cfb483dfd7b5c92278fb1c3", + "sha256": "1lc8796r5vy4n9nz9q10qy4brzd7c7i7dsjmvci6c9f7blqnz1la" }, "stable": { "version": [ @@ -92059,25 +93908,22 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20200512, - 2217 + 20200817, + 549 ], - "deps": [ - "cl-lib" - ], - "commit": "fd64b75f1051c4fe59209412f00a28625371588c", - "sha256": "1rh3nhwh75b698aq45cwmflv97r0596fq36w1rj08syfhmy3aari" + "commit": "1588f720ecd7f69a7972d5c9e113975af045c813", + "sha256": "136zx2sr0n4lb396vpz5nq60zjc3cav4kpx8r5h3nzgnmamqz61b" }, "stable": { "version": [ 0, - 1 + 3 ], "deps": [ "cl-lib" ], - "commit": "c0a1ae75bfb3fdc81bb722dff5f5e2fae3f07024", - "sha256": "1zymgidk09yyjdd23cz7rx2hql8vpmpqn21i07hwcr7032v0kl7k" + "commit": "98b8b1f9edd4ce6a05eeef49bed0d1966bd7c528", + "sha256": "1il0z6lb2jz495gdp6g7wc0n9a4z8z8ndhrrl71rnws53fah0lm3" } }, { @@ -92258,8 +94104,8 @@ 20200221, 2025 ], - "commit": "599a0440086c660e6823622b35058f6d2d6d9637", - "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" + "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e", + "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0" }, "stable": { "version": [ @@ -92286,8 +94132,8 @@ "stan-mode", "yasnippet" ], - "commit": "599a0440086c660e6823622b35058f6d2d6d9637", - "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" + "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e", + "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0" }, "stable": { "version": [ @@ -92303,6 +94149,38 @@ "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y" } }, + { + "ename": "standard-dirs", + "commit": "3af817370f249a7e7a04b06ccc850b24c0f4b5bb", + "sha256": "0jcwav3dhvdxkxsc1nrwswrljam06llyspd9nk70pfpafis9smzl", + "fetcher": "github", + "repo": "lafrenierejm/standard-dirs.el", + "unstable": { + "version": [ + 20200621, + 1603 + ], + "deps": [ + "f", + "s" + ], + "commit": "e37b7e1c714c7798cd8e3a6569e4d71b96718a60", + "sha256": "0r814qcrhvx4qlx4sdzwdmrhiryslqclx0bnpp0qcrbx6g8qfl25" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "deps": [ + "f", + "s" + ], + "commit": "e37b7e1c714c7798cd8e3a6569e4d71b96718a60", + "sha256": "0r814qcrhvx4qlx4sdzwdmrhiryslqclx0bnpp0qcrbx6g8qfl25" + } + }, { "ename": "standoff-mode", "commit": "98858a45f72c28eec552b119a66479ea99b60f93", @@ -92369,11 +94247,11 @@ "repo": "thisirs/state", "unstable": { "version": [ - 20180627, - 1956 + 20200727, + 1227 ], - "commit": "258fe1cba00bdc2c600f866bb0406c719661d0a6", - "sha256": "1miwmb4012a4pjxc0qi0qrs0aw7yf8fhiy72ndf80sj050wmpaqn" + "commit": "8cd9210f17c1b134274a7352b996839aed9a7d8c", + "sha256": "04h8n2wy9qr4bskq9znhadcf02wk4ydhyaaq44yvh55hzmn6gm25" } }, { @@ -92449,25 +94327,25 @@ }, { "ename": "stgit", - "commit": "726da64b7baea1735a916b826bdfb8f575860e21", - "sha256": "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0iv2fiv8i2h4pqbsvy10avijvlk2waprmn0z4jq4hcyvarwzxvp1", "fetcher": "github", - "repo": "ctmarinas/stgit", + "repo": "stacked-git/stgit", "unstable": { "version": [ - 20171130, - 1559 + 20200606, + 1308 ], - "commit": "fb180610de78c68736c963236afb28ee3ac952b4", - "sha256": "106jjrbjdgxp1s41h9vn877rq7a3m1jj9brlgdz1mrjgay266gcc" + "commit": "333e9e434cec9aa2f887083cdf2cefcaa316f438", + "sha256": "1q058qav0al8mb6f3f3jc4mnzlvhlis9dllchw3flw3gx57qcrx5" }, "stable": { "version": [ 0, - 22 + 23 ], - "commit": "9acc95666619699d4cdf0526305155407081d8de", - "sha256": "0rhdgakd4vc0549m6zjwcmsnvh2i3mbv5laks25wnfmsxr8dwqns" + "commit": "e6dd7eff206a6515aefced2ad701beaf625d7b7d", + "sha256": "157vdhdjzxsf7077916ibn0jbsxw9d71m8mwm4kn0i0ip7sj9xdg" } }, { @@ -92608,20 +94486,20 @@ "repo": "akicho8/string-inflection", "unstable": { "version": [ - 20180827, - 1301 + 20200517, + 115 ], - "commit": "e9a50855a4c718592c28a5a892f164ecf46e39a8", - "sha256": "03kvp5xrv9p46m4w25jr5nvi801yafq5vxzif42y0dav7ifmmdfp" + "commit": "1937db7513db570606ea8798916180b7dd75d3b1", + "sha256": "06n968iqh6w8grmk8w67g6la9cxpp8ww5mi9s3zgdjhfcs5g8xdl" }, "stable": { "version": [ 1, 0, - 10 + 11 ], - "commit": "9b08372301e3c5f91cb278ee0e00a48845a42cb6", - "sha256": "0j3ms2cxbv24kr27r2jhzxpdih6w43gjdkm3sqd28c28ycab8d4b" + "commit": "1937db7513db570606ea8798916180b7dd75d3b1", + "sha256": "06n968iqh6w8grmk8w67g6la9cxpp8ww5mi9s3zgdjhfcs5g8xdl" } }, { @@ -92795,10 +94673,10 @@ }, { "ename": "subatomic-theme", - "commit": "de7f6009bab3e9a5b14b7b96ab16557e81e7f078", - "sha256": "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0qh311h8vc3c7f2dv6gqq3kw1pxv6a7h4xbyqlas5ybkk2vzq12r", "fetcher": "github", - "repo": "cryon/subatomic", + "repo": "cryon/subatomic-theme", "unstable": { "version": [ 20190607, @@ -92878,14 +94756,14 @@ "repo": "zk-phi/sublimity", "unstable": { "version": [ - 20181121, - 1311 + 20200816, + 854 ], "deps": [ "cl-lib" ], - "commit": "4c8d0280815978fc11e1c5f86266a11c717b0c89", - "sha256": "1618ba3m36crh2wmmisi3ls5ijdqrwr58yda810jik0b6fjzzacv" + "commit": "133ac118eaa51cce81978ed78abba6aa8d427577", + "sha256": "0sqjdrzsp7pf1wj14vcr322n8fydjzzii4msdvlhj0xr3xhl0469" }, "stable": { "version": [ @@ -92927,14 +94805,14 @@ "repo": "nflath/sudo-edit", "unstable": { "version": [ - 20180731, - 1908 + 20200625, + 142 ], "deps": [ "cl-lib" ], - "commit": "cc3d478937b1accd38742bfceba92af02ee9357d", - "sha256": "1qv58x5j5a3v1s2ylhck1ykbfclq0mbi0gsvaql3nyv8cxazqlwl" + "commit": "0e2c32b5e5242d30f8780cbe8e1b1649476cac4d", + "sha256": "1z26i4hzi2mksl4nr8szzlnrnyv96fg7jjddbm5dp5dlmh2pndk1" }, "stable": { "version": [ @@ -93183,11 +95061,11 @@ "repo": "leafOfTree/svelte-mode", "unstable": { "version": [ - 20200327, - 406 + 20200816, + 354 ], - "commit": "48a26af6a3395a8bf3f09747d0a205c6dbc79313", - "sha256": "12gg55jdb6b5jk0xizx2cqc795bgll2kap3jp08s1vr16zkdaryn" + "commit": "5db0451429d4bf68f5dd131837faa6eb601a631d", + "sha256": "1ffr9yzxr1z8xmvl0lf7nfp9gjp79zps556d3kni45dbnkdi0z1h" } }, { @@ -93300,6 +95178,21 @@ "sha256": "1d45yanqk4w0idqwkrwig1dl22wr820k11r3gynv7an643k4wngp" } }, + { + "ename": "sweet-theme", + "commit": "a149448c38504bdf6f782a10cb1440da9102990f", + "sha256": "1ca56disxyr30anvpqahh33s062y35w003yxi1rhdrknka2cnl5q", + "fetcher": "github", + "repo": "2bruh4me/sweet-theme", + "unstable": { + "version": [ + 20200708, + 1202 + ], + "commit": "78f741806ecebe01224bf54d09ad80e306652508", + "sha256": "1yqz15l6xa1vkll4gaa3jpr30vq3yjgbgadjilsmz5p8mblawhyx" + } + }, { "ename": "sweetgreen", "commit": "63812707948e6dcc00e00ebc3c423469593e80fd", @@ -93343,16 +95236,16 @@ "repo": "danielmartin/swift-helpful", "unstable": { "version": [ - 20200516, - 1836 + 20200701, + 2005 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "e990ea6f5ea932763d002c3794dd9589add1532d", - "sha256": "1a4yrj3yjqgd5jssxd38dvx06cigsszrvs6hv7slfl60p729i0lw" + "commit": "2c8c9cda5ed9d9e96bb3a39c6d0905a15dd9e2e6", + "sha256": "1kq4jxhig6bg4cifggy06a6ydksg68nr2gbnxn589znacxbs0iy9" }, "stable": { "version": [ @@ -93376,14 +95269,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20200418, - 617 + 20200606, + 730 ], "deps": [ "seq" ], - "commit": "2ab9ea1784a12a482ed9e3fb284b7a7658f40fff", - "sha256": "0wml7f8k3gqlxm0yg744271mqh087prlsfmbiv7fvkrcs55q0592" + "commit": "d266fbd300a1bf1592e1462ead4be093b8b68f98", + "sha256": "0l3i74acv1msmbfkn99mz9g73kd7j1a7j0b082vcxw6kr69476yc" }, "stable": { "version": [ @@ -93466,8 +95359,8 @@ "deps": [ "ivy" ], - "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", - "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" + "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44", + "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l" }, "stable": { "version": [ @@ -93514,6 +95407,21 @@ "sha256": "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2" } }, + { + "ename": "swiss-holidays", + "commit": "2260acd32c74352c5b1c5622c527676a81223640", + "sha256": "1d91fnvm2sikfmy0s1gffzgn19088ggkkf992zbms7gy7njbgysf", + "fetcher": "github", + "repo": "egli/swiss-holidays", + "unstable": { + "version": [ + 20200526, + 822 + ], + "commit": "0995c9685033a09466f5b2dceb7316362bde997a", + "sha256": "098s55jsmr6na5qf8s5a3iws6zb47rbq7mk4garbxar9vyfi3bw7" + } + }, { "ename": "switch-buffer-functions", "commit": "d37ebd28f4a2f770958bd9a2669cce86cc76cbe7", @@ -93570,16 +95478,16 @@ "repo": "emacsorphanage/swoop", "unstable": { "version": [ - 20200321, - 319 + 20200618, + 905 ], "deps": [ "async", "ht", "pcre2el" ], - "commit": "7f6f20d0f32b76b7ce5b1459afa44c1ab700f8bb", - "sha256": "1d134f3dyh8sa8q8dgmla01wiky61y4jmhqb5whqpb7c2p53niyc" + "commit": "0c737a961970a2e61735545320367bafaa8dfc49", + "sha256": "1kjzc7543b7l0rcq9iiwf8sq39akzw5spsv51yl4wmwgnmyj2n1c" }, "stable": { "version": [ @@ -93662,26 +95570,46 @@ "repo": "contrapunctus/sxiv.el", "unstable": { "version": [ - 20200508, - 1620 + 20200803, + 1431 ], "deps": [ "dash" ], - "commit": "f1a030c538af6d47d32eef04ab6536eeef948268", - "sha256": "0qnd89zphpa9cl7xw6lchsi0yw2a48v8xbgddgbsisff183bzcfz" + "commit": "9eb6a121bfdf64433cd8ac7985d2c82b590b5abb", + "sha256": "0fjzzynlmqxxrr4520rh7ds0gip6l8cbmrgp7ghrgm07830arpcj" }, "stable": { "version": [ 0, 3, - 2 + 3 ], "deps": [ "dash" ], - "commit": "f1a030c538af6d47d32eef04ab6536eeef948268", - "sha256": "0qnd89zphpa9cl7xw6lchsi0yw2a48v8xbgddgbsisff183bzcfz" + "commit": "9eb6a121bfdf64433cd8ac7985d2c82b590b5abb", + "sha256": "0fjzzynlmqxxrr4520rh7ds0gip6l8cbmrgp7ghrgm07830arpcj" + } + }, + { + "ename": "symbol-navigation-hydra", + "commit": "ed20cf413c32e924506a4c4aa7129d1185b63d46", + "sha256": "1aw8ssjqsqnihri3qp8c3q6dv52mc3rnq2mgyncrbghq1yajh8ml", + "fetcher": "github", + "repo": "bgwines/symbol-navigation-hydra", + "unstable": { + "version": [ + 20200811, + 655 + ], + "deps": [ + "auto-highlight-symbol", + "hydra", + "multiple-cursors" + ], + "commit": "20a63121695452e39f1a3c9bfea1e313359c5f1e", + "sha256": "08fs5wr9p2rbwlydx2xmwqmvzr6q05fg4dji6wdf40dn3pb5w78g" } }, { @@ -93692,14 +95620,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20191224, - 250 + 20200809, + 2023 ], "deps": [ "seq" ], - "commit": "8096a684c29bae20e1f5a1c7adbe7881680a5c10", - "sha256": "1x7ghzxn5634amvj6r786j8nm25b780pz8h57z7qk40x0s6qk5a7" + "commit": "f2734ce633c2b498d3ea70042a3ae9f93f9f046a", + "sha256": "1n1a2jldshfyyyxc3msr16fzczjlpglzdy7ab4qpyyz6ghklaqys" }, "stable": { "version": [ @@ -93744,8 +95672,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20200425, - 1911 + 20200526, + 211 ], "deps": [ "cider", @@ -93762,13 +95690,13 @@ "slime", "smartparens" ], - "commit": "3dba2ae3f65bd1c40e3756e05a57ced039a15a7f", - "sha256": "1j2ycsi2ipbyaknscy0vgr1ybyvzl7j1q0gvazkl5rpihshz2shl" + "commit": "b35e3622601ca5b27bb8e1b7ab301cc6dd674a62", + "sha256": "118s8xxas5nmj181p7mf9lsal7jl0pkph3gs1gyr0x6c5y93b1ci" }, "stable": { "version": [ 0, - 6, + 7, 0 ], "deps": [ @@ -93786,8 +95714,8 @@ "slime", "smartparens" ], - "commit": "62bd31d8647b88ec179fb8ff89f583b55a0421cc", - "sha256": "1c2y65hcd0nydhkh7a903flq061x8hld272n00xn4dd0b8kvjp29" + "commit": "8209d63d88b596e5e4ed66c56085c978f33acda5", + "sha256": "0l0pb9d5q84wv4jiappm3wi800dslv9ciq9rla0mrv4xb2lhf3pp" } }, { @@ -93986,11 +95914,11 @@ "repo": "dantecatalfamo/sysctl.el", "unstable": { "version": [ - 20190720, - 2028 + 20200615, + 1824 ], - "commit": "0fc50305a96de059ad1ff4e6081c9b4089f5247f", - "sha256": "0v2andw08qawgbdzn0vplxd3drs41gqf2qbidhakmsssdd4nqiib" + "commit": "d8c2e18de1d7a3b2999a4d5054c0bbf30cb10fed", + "sha256": "0jvw5r4z9lq36yv58slpc8fw9ljzrppdsg9j7cs34m0wnhyid4a4" } }, { @@ -94251,10 +96179,10 @@ }, { "ename": "tabula-rasa", - "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", - "sha256": "14j92inssmm61bn475gyn0dn0rv8kvfnqyl1zq3xliy7a0jn58zz", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "041yl5727ba0b2ircmfmm693gg7vimrijd80k8w8j13xcrq5i1i3", "fetcher": "github", - "repo": "idomagal/Tabula-Rasa", + "repo": "IdoMagal/Tabula-Rasa", "unstable": { "version": [ 20141216, @@ -94391,11 +96319,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20200513, - 1728 + 20200701, + 1436 ], - "commit": "45625bd90cf5dbdcaed02b57baaa995e240ceb4c", - "sha256": "1s2xxscj675ps93hqczw1xcs3jsixblfzjcfpz74vbz9zkmq1ygm" + "commit": "5ded73ae13d58ab0bbd52ac7556ff29e114a96d6", + "sha256": "00bvjrbcqalwlw1lc883p8l7szb9qniqp120pwd6hgyvgpr7h3s1" }, "stable": { "version": [ @@ -94529,30 +96457,6 @@ "sha256": "0lh04mpa1yb3mwasvnnbdzffcig7ndlk13d96a0lavqn49a10fa3" } }, - { - "ename": "tdd-status-mode-line", - "commit": "25b445a1dea5e8f1042bed6b5372471c25129fd8", - "sha256": "1i0s7f4y4v8681mymcmjlcbq0jfghgmdzrs167c453mb5ssz8yxg", - "fetcher": "github", - "repo": "algernon/tdd-status-mode-line", - "unstable": { - "version": [ - 20131123, - 1716 - ], - "commit": "4c082e62f4915b573338a97efcc6854d132323dc", - "sha256": "1jyz6z5bk1gvmknphcnvjvbl329zm8m40yl0a1hfaj8fvhwyzdw5" - }, - "stable": { - "version": [ - 0, - 1, - 2 - ], - "commit": "9b3c35b0a972772640e9fee653eab6a76e06416a", - "sha256": "0bvxc926kaxvqnppaw4y6gp814qc0krvidn5qg761z4qwz023rax" - } - }, { "ename": "tea-time", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", @@ -94583,6 +96487,21 @@ "sha256": "0l3mhn8m96d9mxs9kkp6clj5qzns5dw9w628kf9ibwbbc5fq01aa" } }, + { + "ename": "teco", + "commit": "f8c7a2d741bd0061f5edc30fd000a82cdd3b66e4", + "sha256": "0ahixvxvjbm7xngsqfjdb6lfg43bki9vays2yw2psmyw7c34zp3s", + "fetcher": "github", + "repo": "mtk/teco", + "unstable": { + "version": [ + 20200707, + 2309 + ], + "commit": "61caf8f419659a0567a269f290c90427a215d77b", + "sha256": "0jfrlpmcr8msj39fhm0sc11sxw46w0dk24zidsdp12lwgcnli44m" + } + }, { "ename": "telega", "commit": "e067f03ebe9dd8c90ceaa5a7983483087c74107f", @@ -94591,27 +96510,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20200516, - 1007 + 20200814, + 1652 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "e2fd3b1b34ae659d306749ab3129ed498b3a2720", - "sha256": "0h851m3p9cqblr5wpl769g8dl5vxjgx62c6grkdk2g0ip2cm4vcf" + "commit": "9594ebcb0f605e5b01bc4ec6d1bd1b6470002bc0", + "sha256": "0hm6yvr4ygkcycw850sd4lcwmrr49s88nhan08hal0xylzazlq24" }, "stable": { "version": [ 0, 6, - 0 + 28 ], "deps": [ + "rainbow-identifiers", "visual-fill-column" ], - "commit": "ae09592498ce380e57fbb76725fd4c89ae248864", - "sha256": "0mv6i80958d9crzspzik5xh5g8326115bvg2frgv0dp9p6rm86m3" + "commit": "e53996777570a5bed84d21f6c8defd4f51c8e255", + "sha256": "058x6svgy33lyqjqq0l3byv8bysqig9jmh3kx8shaqr0ypfrjhi3" } }, { @@ -94645,16 +96565,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20200412, - 1614 + 20200516, + 2102 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "65198f72f3b1ae618507aa28094f05d6de4846a9", - "sha256": "177v612ii8nj9nsmfxlf17gr3wair4whzggi3pshch7ghbxdqv5q" + "commit": "110c578ccf6c0421cfd9eec7aa3e960b6fd49fb4", + "sha256": "157df4h9hr5mmwp0q5w0rdv7ndrjk3014r5xwwblszvx33s70gbk" }, "stable": { "version": [ @@ -94688,6 +96608,30 @@ "sha256": "1hfm0miqzym4fbj33hzh5iszp0i51imr1z54396vd81zjch9sxss" } }, + { + "ename": "templatel", + "commit": "0e43ad23f7b58ddb82bc08066d8b48e04708b5ba", + "sha256": "10sx3kd22z4qa1g60c3fzxpc55xlddmb4iqqdbiqkn6bqzdzrslq", + "fetcher": "github", + "repo": "clarete/templatel", + "unstable": { + "version": [ + 20200818, + 241 + ], + "commit": "796021c2964a5bfbba7abf7f339f970bbedc3aab", + "sha256": "1yv85ik2slaibnajsfns1icliw0qyqw871jxdklav918lic9fia0" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "6785b487aaa6bbab3cffcf74e9f596c0058c1b18", + "sha256": "1qdjbbr6mq2ib8aan5hb47vdj2s50yxfidmjyfyyms28qpi3524g" + } + }, { "ename": "temporary-persistent", "commit": "e608f40d00a3b2a80a6997da00e7d04f76d8ef0d", @@ -94990,14 +96934,14 @@ "repo": "davidshepherd7/terminal-here", "unstable": { "version": [ - 20180513, - 833 + 20200617, + 714 ], "deps": [ "cl-lib" ], - "commit": "bc7f3477133df0142d3e49e6eb8eaf4468b57865", - "sha256": "1i0pz5lfhgqzcqwi9wkiq8skj3hf00xn9vya890g1i9ix3bclq35" + "commit": "d8b95302abe6e4a8a91a4526441a1c5d51b886a6", + "sha256": "0b05arm8b95dkzj6m2kx7wb37z00y0bdsj3z34sjny75srph3c0c" }, "stable": { "version": [ @@ -95044,8 +96988,8 @@ "cl-lib", "json" ], - "commit": "a295a80a502771cc07dc061961e0eb85343c2925", - "sha256": "02szncbbvb52kv9mn2clqhzg49knpny1bxsa7wd5l0gwbsqly3dw" + "commit": "ef50c6f0269a6fd9ce742d0a87647d60a0ef850f", + "sha256": "1c3zamvcambi9l91vilc0sbyzn21jj89n9j02simza4ffyn9xix9" }, "stable": { "version": [ @@ -95077,8 +97021,8 @@ "cl-lib", "tern" ], - "commit": "a295a80a502771cc07dc061961e0eb85343c2925", - "sha256": "02szncbbvb52kv9mn2clqhzg49knpny1bxsa7wd5l0gwbsqly3dw" + "commit": "ef50c6f0269a6fd9ce742d0a87647d60a0ef850f", + "sha256": "1c3zamvcambi9l91vilc0sbyzn21jj89n9j02simza4ffyn9xix9" }, "stable": { "version": [ @@ -95135,11 +97079,20 @@ "repo": "TxGVNN/terraform-doc", "unstable": { "version": [ - 20190813, - 1254 + 20200803, + 1545 ], - "commit": "2ec10ea7bef5a75edfffeb515dd268e19c1f8c9c", - "sha256": "0r70fc7vv2rjnwnsg7myc1c15f3ql6hp6zrf5msmf8r2iz32jnpp" + "commit": "d609290021ea7f2d10caadffc9131663838f8ad4", + "sha256": "1gvydmi37d7jxibn7nfg1rhb6phfn3kgrlmq250g7321g15j1q3v" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "commit": "d609290021ea7f2d10caadffc9131663838f8ad4", + "sha256": "1gvydmi37d7jxibn7nfg1rhb6phfn3kgrlmq250g7321g15j1q3v" } }, { @@ -95247,14 +97200,14 @@ "repo": "rocky/emacs-test-simple", "unstable": { "version": [ - 20170527, - 1532 + 20200722, + 1121 ], "deps": [ "cl-lib" ], - "commit": "cfd383d36dc6853917acb753fdfa0eebf33856f3", - "sha256": "0rn3x0v92v3a2g58armazhg97bl72d90j5gwf1zdak75hzimmah2" + "commit": "ce6de04636e8d19ec84a475c03c0142b20a63de0", + "sha256": "1knpzibhwm8f604fklq35d2w5rlx26fq3fzzybdm2xb65mifqnar" }, "stable": { "version": [ @@ -95288,14 +97241,14 @@ "repo": "TobiasZawada/texfrag", "unstable": { "version": [ - 20200424, - 205 + 20200716, + 1331 ], "deps": [ "auctex" ], - "commit": "48118c4e38836117efb4eede927ab85d9a0d2013", - "sha256": "1dpvf9limh9b0sg0x41gyw9w5nf5nvkd7zzlyysswhinm6jba4iz" + "commit": "a5f59e0c5f43578f139a2943bd08e5b3140f4c2b", + "sha256": "11xissn0xpfx2xxcm5qj2smkxa5frcswvhpfv6m34j12z0nww7pw" }, "stable": { "version": [ @@ -95372,10 +97325,10 @@ }, { "ename": "textx-mode", - "commit": "dada0378af342e0798c418032a8dcc7dfd80d600", - "sha256": "10y95m6fskvdb2gh078ifa70nc48shkvw0223iyqbyjys35h53bn", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0004z2ym3rmbqr42ysziqja7y5fl2fnmhbsqclk0mvr247gmb4vf", "fetcher": "github", - "repo": "novakboskov/textx-mode", + "repo": "textX/textx-mode", "unstable": { "version": [ 20170516, @@ -95602,18 +97555,18 @@ 20200212, 1903 ], - "commit": "81d2abd9097fc3497f77d830ebf8d8386beb7127", - "sha256": "0k9yr3dx12cl07dlz0zmaaf4zfr4zh54w5ix74b0kj1ny299f9q6" + "commit": "32b109977cbde37bf719c2955ff7dd1e657a6c70", + "sha256": "0ww3k4yd5bk40r3v1a96mgzhaayqgb0v2kjvxzn10wcybqxf1zqb" }, "stable": { "version": [ 2020, - 5, - 11, + 8, + 17, 0 ], - "commit": "99612a3f69c0aecf6c2c4535a610e888aa923820", - "sha256": "17p6ip2na9629pdbrllrhrpnhlb9ngjdcs7g9ha3yhvk0sbgz4wf" + "commit": "b733bf19c3c68c0aa6d5e0bb7db4321fe13b47a2", + "sha256": "11kpja52drs4xsja6gyg37rq1681pfgv71cc3lksh2dn6jrn8nbq" } }, { @@ -95663,26 +97616,26 @@ "repo": "tidalcycles/Tidal", "unstable": { "version": [ - 20191210, - 1647 + 20200523, + 833 ], "deps": [ "haskell-mode" ], - "commit": "f68e58cd7f8c483307573a96307f1f872a1921a0", - "sha256": "1rwc1vk0gl1sjnvzvwz4x25m6c61r8ghf6wrjclgifrm8zf1na5d" + "commit": "137192a2ef6c4f457ddba38a0397570266333854", + "sha256": "1wwmgzlqih3j8slggmi79xiy811qzlrwjqpd7y37lj508w96qppi" }, "stable": { "version": [ 1, - 4, - 9 + 6, + 1 ], "deps": [ "haskell-mode" ], - "commit": "252e3be53eb1bf6bfcd1b3c52af982506c84a89e", - "sha256": "19chvk24csg5w38q6yh1wky4nk4z8361p1q5q118427njqkl5ql3" + "commit": "7377b6c8ddc23d197018af203456063864df1457", + "sha256": "0vj55135h0mw093b9rlnq8hka9sj4kmhnv8xj46z2kcqj0qcq7q8" } }, { @@ -95693,8 +97646,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20200504, - 832 + 20200811, + 2114 ], "deps": [ "cl-lib", @@ -95703,8 +97656,8 @@ "s", "typescript-mode" ], - "commit": "8a7c1fc5dcc9b3321c10c71f21d1436b0a62ac07", - "sha256": "14i618dbhi66z19szyjznfnb56k9w64m00732g20r8izbhjsg4nm" + "commit": "f0b6dac4829c3daecf02bf445a5b41b4c68f2911", + "sha256": "0533kxxl68vsx99b5nwdhy885nl2ad8wc6my38kardmklshjpvj1" }, "stable": { "version": [ @@ -95723,6 +97676,21 @@ "sha256": "0ipri5jxx73vrra6dikbv0y2ws96wfi7bjh2v6pshiw3b1x2isav" } }, + { + "ename": "tikz", + "commit": "fe4080be1b98c4016360113741a9bb6b3764e872", + "sha256": "07wbl8aih7p9gzjnljymryrrakq9ffwzd2l73h08hjvrr8ff92m9", + "fetcher": "github", + "repo": "emiliotorres/tikz", + "unstable": { + "version": [ + 20200728, + 913 + ], + "commit": "f1495516657da6dc2296ffb6c38a3bb4acf118ad", + "sha256": "0w9xff7y6zhb28b1cfbbam9gy7dp11i96yb4rn4lj8h2yry89293" + } + }, { "ename": "tile", "commit": "424cfd28378ef328721bb0dc3651808e64c01306", @@ -96032,15 +98000,15 @@ "repo": "laishulu/emacs-tmux-pane", "unstable": { "version": [ - 20200419, - 1331 + 20200730, + 520 ], "deps": [ "names", "s" ], - "commit": "6e8d0584b0bbd412c5d29c87add7364299b3d2a0", - "sha256": "054qncg530paiv1vs27hs94m2y2fzvr4iind1rr16m8v8qf7zia6" + "commit": "923524efe8e6e5e0d269de6bb253b45e02d9a663", + "sha256": "0bhck6vrb48zxfh5id637mq57k7jv4f2ax0lrhyvr0nw8m0ndqmx" } }, { @@ -96075,16 +98043,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20200227, - 1510 + 20200517, + 1825 ], "deps": [ "dash", "org", "transient" ], - "commit": "b1fba9f3600e6cfe129efae304b96a7f6dc66e1a", - "sha256": "0391m19ws4ajqfbbwd1q1z8p1l6ai94xzf2rqg5zdvlnmc06kl76" + "commit": "b3f003603111b7e31b94c354cf4c83c8208c01c3", + "sha256": "0srk3chc45fl6zjwymzqwmxm22w9pcjxg7968c7fkvbqr21wk6p7" } }, { @@ -96095,11 +98063,11 @@ "repo": "rpdillon/todotxt.el", "unstable": { "version": [ - 20180626, - 2230 + 20200530, + 2337 ], - "commit": "f13e404304c9d26c105de872f96b4601441b3875", - "sha256": "1yvy2pl2ncgkz1xz598qjvp2v3g66m57wz7nra2vira7m4kq4671" + "commit": "b51f7fa1357d2cbc1b72b10d15f8c6f009ce5a46", + "sha256": "1asf33na834mc4ppvfyjxa70v4r80dnq641si5kd86gjfzjjjfmi" } }, { @@ -96149,8 +98117,8 @@ "deps": [ "cl-lib" ], - "commit": "bcd3d76a47b4f0e7c382fb680b14f40208dae568", - "sha256": "0sgzjddd34icbbm4pc7v1662k6288pkr70ki4p2j3q4mh9qqc8q7" + "commit": "fc9ec563430e3beaefc00b26da179f4b4ca9855b", + "sha256": "1m4v56yy73gvycsvpc36h7yh6yhn3fgp90rk5m248hz89gjf9kxv" } }, { @@ -96479,8 +98447,8 @@ 20171210, 2102 ], - "commit": "e5bf5f89741a9c43aa406491e94dd8d58c302fb4", - "sha256": "104l0b9n9ia7zrha20yaxp6c09wg1h5l5a8b988k6mhyj9a1w1aw" + "commit": "89aac22259e5d09ae1183e0df163338fe491e9e7", + "sha256": "16hfahyhl1vv3r0amyvc514sw6x9x56b319lkp7bwcy8mxicc3cy" }, "stable": { "version": [ @@ -96559,20 +98527,20 @@ }, { "ename": "transfer-sh", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "0xc6dkmayk935grmy8883l4cyv4zrq3fb77fj16knfj4yw8w6c9j", - "fetcher": "github", - "repo": "SRoskamp/transfer-sh.el", + "commit": "55dc23a82be3e85b46cfdee18697b1b096573924", + "sha256": "1pzsjibqbzkvfb4c5i271yb5jjadsclb383jfhi6jikpnm3vkf5g", + "fetcher": "gitlab", + "repo": "tuedachu/transfer-sh.el", "unstable": { "version": [ - 20180603, - 1431 + 20200601, + 1708 ], "deps": [ "async" ], - "commit": "55da85f963d347255a2b46568954923679331798", - "sha256": "0yv4i4ps379kz1q9qmjh4q3pk5ik77xw86faxmwpjx4yzp1wsz9v" + "commit": "0621a66d00ec91a209a542c10b158095088bd44d", + "sha256": "1dnh8ws788if32wqnhzqjm38zjhpm9l3sq74245djnn1mx5bm56m" } }, { @@ -96583,11 +98551,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20200508, - 1911 + 20200819, + 1133 ], - "commit": "d49f85a8c1172b9f21d2fd4a54d1f802b53948fc", - "sha256": "01rnd67mc9avm4d39vqr074shfmqjsilynivb3s32dqyk13fsz8r" + "commit": "f5d81ef0ed24be935f3c0192b746a1738d903d37", + "sha256": "0kyrf0nh9l9x1jwfca1921qc0w2ii1xp4ya4mv2jmanm3apbihb9" }, "stable": { "version": [ @@ -96607,14 +98575,14 @@ "repo": "conao3/transient-dwim.el", "unstable": { "version": [ - 20200508, - 617 + 20200812, + 1033 ], "deps": [ "transient" ], - "commit": "e075bda369bbd0df2ac5e5d5626664f4a0062676", - "sha256": "052pj4b4jgr9vk0nrap57kpy0fsplssc7b9w7lkdmpxrbdld7n6h" + "commit": "de03d875dd89b1d838be67b0c44d9786adf96717", + "sha256": "0gb4k3758bv25vdw30rq0vbs94vdyss0xsiyaxnmvpfnj0v9k2cq" } }, { @@ -96625,14 +98593,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20200506, - 2144 + 20200620, + 402 ], "deps": [ "let-alist" ], - "commit": "b2c35b6f4c503976581573a4512c50e8081f9038", - "sha256": "1b0d2xq22121f64hls28gb44m284g1b6xiw3mi7x6g1fil8b3wb2" + "commit": "7ed254437c1f95ce7f59e87e90d6ec5e4d91c01d", + "sha256": "15qim9dfir08hkqf0ynwf1953cq60726rkjyc32l8hkpjlgw23ar" }, "stable": { "version": [ @@ -96686,6 +98654,30 @@ "sha256": "03wc50vn1kmrgnzzhs06pwpap2p2rx84wwzxw0hawsg1f1l35m2x" } }, + { + "ename": "transwin", + "commit": "4b6dc821c99edd8ee6faa5289b0ecbdbb28f5f08", + "sha256": "0vrzf3xhwincsl4gg0fghczvwzicci0gjsvpfpjzcqz3m7ab6frb", + "fetcher": "github", + "repo": "jcs-elpa/transwin", + "unstable": { + "version": [ + 20200704, + 356 + ], + "commit": "df814cb578b0a4c01ed68f1da262df17d2a0a694", + "sha256": "0kfq7br70cn9jpjnc7lxgimqcw9cpp4yf95dkjalbk5l8w8gzlm2" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "commit": "df814cb578b0a4c01ed68f1da262df17d2a0a694", + "sha256": "0kfq7br70cn9jpjnc7lxgimqcw9cpp4yf95dkjalbk5l8w8gzlm2" + } + }, { "ename": "trashed", "commit": "0a0609353c8ef01ca5da44b6239e1d4756da3a92", @@ -96694,20 +98686,20 @@ "repo": "shingo256/trashed", "unstable": { "version": [ - 20200508, - 734 + 20200523, + 231 ], - "commit": "075749debcaf867bf151d83a59d7845dea71a4b9", - "sha256": "1r22x2m4mdkdick40myayzmhxby2v515bm5a8pxxcppnvd8259ci" + "commit": "23e782f78d9adf6b5479a01bfac90b2cfbf729fe", + "sha256": "0lfza55nbb62nmr27cwpcz2ad1vm95piq4nfd8zvkwqbn6klwmm6" }, "stable": { "version": [ 2, 1, - 1 + 2 ], - "commit": "075749debcaf867bf151d83a59d7845dea71a4b9", - "sha256": "1r22x2m4mdkdick40myayzmhxby2v515bm5a8pxxcppnvd8259ci" + "commit": "23e782f78d9adf6b5479a01bfac90b2cfbf729fe", + "sha256": "0lfza55nbb62nmr27cwpcz2ad1vm95piq4nfd8zvkwqbn6klwmm6" } }, { @@ -96805,8 +98797,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200516, - 1204 + 20200816, + 939 ], "deps": [ "ace-window", @@ -96818,8 +98810,8 @@ "pfuture", "s" ], - "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", - "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" + "commit": "400b3916b61e61a299916f053cc52b48638479b7", + "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8" }, "stable": { "version": [ @@ -96840,6 +98832,25 @@ "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, + { + "ename": "treemacs-all-the-icons", + "commit": "7e6c70295787573cbe4dcf761cc8147eee1b9e04", + "sha256": "0zkvpkfjs4lf2a6g5qlg0pr9alqmr8rvy02qh8pgqgismaz8c5s1", + "fetcher": "github", + "repo": "Alexander-Miller/treemacs", + "unstable": { + "version": [ + 20200801, + 920 + ], + "deps": [ + "all-the-icons", + "treemacs" + ], + "commit": "400b3916b61e61a299916f053cc52b48638479b7", + "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8" + } + }, { "ename": "treemacs-evil", "commit": "37cca017cf529a0553ba73bcb824a945ec8b1137", @@ -96848,15 +98859,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200302, - 558 + 20200716, + 2041 ], "deps": [ "evil", "treemacs" ], - "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", - "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" + "commit": "400b3916b61e61a299916f053cc52b48638479b7", + "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8" }, "stable": { "version": [ @@ -96879,15 +98890,14 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200510, - 2001 + 20200530, + 2129 ], "deps": [ - "cl-lib", "treemacs" ], - "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", - "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" + "commit": "400b3916b61e61a299916f053cc52b48638479b7", + "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8" }, "stable": { "version": [ @@ -96918,8 +98928,8 @@ "pfuture", "treemacs" ], - "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", - "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" + "commit": "400b3916b61e61a299916f053cc52b48638479b7", + "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8" }, "stable": { "version": [ @@ -96943,16 +98953,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200421, - 1426 + 20200530, + 2129 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", - "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" + "commit": "400b3916b61e61a299916f053cc52b48638479b7", + "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8" }, "stable": { "version": [ @@ -96976,15 +98986,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200114, - 1715 + 20200530, + 2129 ], "deps": [ "projectile", "treemacs" ], - "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", - "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" + "commit": "400b3916b61e61a299916f053cc52b48638479b7", + "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8" }, "stable": { "version": [ @@ -97010,17 +99020,17 @@ 20191108, 2217 ], - "commit": "306f7031d26e4ebfc9ff36614acdc6993f3e23c3", - "sha256": "09k95b846mzak62acyzrmqvc7kwkni14w8d74079kr7lnar9g6zq" + "commit": "3ac940e97f3d03e48ca9d7fcd74916a9b01c72f3", + "sha256": "0pmrpij80m5kgcr8bw36r8wllgppasw08vn3ghwvis9srpaq75cn" }, "stable": { "version": [ 0, 1, - 1 + 2 ], - "commit": "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d", - "sha256": "04zwm6gx9pxfvgfkizx6pvb1ql8pqxjyzqp8flz0432x0gq5nlxk" + "commit": "3ac940e97f3d03e48ca9d7fcd74916a9b01c72f3", + "sha256": "0pmrpij80m5kgcr8bw36r8wllgppasw08vn3ghwvis9srpaq75cn" } }, { @@ -97067,6 +99077,30 @@ "sha256": "0a1437hkcx2ba3jvvrn7f0x0gca36wagnhbq4ll2mlkmvdkac6is" } }, + { + "ename": "tron-legacy-theme", + "commit": "975e93e060f50a1fd00a6ba1566a9386271bdfd6", + "sha256": "08cfhnkb62121h6dksw9c0d38vxm38dfbfww7c8kj491is0w63f4", + "fetcher": "github", + "repo": "ianpan870102/tron-legacy-emacs-theme", + "unstable": { + "version": [ + 20200601, + 533 + ], + "commit": "af17842821400a6fd466bb2769d13606e98550c0", + "sha256": "19pabaiza0lrvqa8yi0p83rffm9g44n6789m395iayfcxq49lylq" + }, + "stable": { + "version": [ + 2, + 5, + 0 + ], + "commit": "cdc052b044448654109bfb7d9b3d8bbfcf49042d", + "sha256": "0q1i2q6pkld8rz938yj9g68a55041d9vnps05nn4v1l8rx1x8jif" + } + }, { "ename": "trr", "commit": "56fa3c0b65e4e300f01804df7779ba6f1cb18cec", @@ -97258,14 +99292,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20191220, - 2314 + 20200518, + 1820 ], "deps": [ "caml" ], - "commit": "c12061eb80c1487a1963af7cdae268d709a70ca9", - "sha256": "0x85yy20caqb24n7qx3h8nw259p6593y5dx43jl5iapy2n9za1gy" + "commit": "ccde45bbc292123ec20617f1af7f7e19f7481545", + "sha256": "1yxv4bnqarilnpg5j7wywall8170hwvm0q4xx06yqjgcn8pq1lac" }, "stable": { "version": [ @@ -97327,30 +99361,6 @@ "sha256": "1gns60yj1ylm87456gzwr0gy0kivp5bd290rg6d8xbc86jdcls19" } }, - { - "ename": "tup-mode", - "commit": "bda3260dad1c766c5b6ae9124f966bf441e24f2f", - "sha256": "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l", - "fetcher": "github", - "repo": "ejmr/tup-mode", - "unstable": { - "version": [ - 20140410, - 1614 - ], - "commit": "bcc100c6485f1c81fdcd1215dfc6c41a81c215c8", - "sha256": "0y1b9zvwbw3vp41siyzj04bis939fgz3j27hc5ljjzy92kd39nzm" - }, - "stable": { - "version": [ - 1, - 3, - 1 - ], - "commit": "945af9c8e6c402e10cd3bf8e28a9591174023d6d", - "sha256": "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y" - } - }, { "ename": "turing-machine", "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", @@ -97510,11 +99520,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20200430, - 1232 + 20200817, + 817 ], - "commit": "0fc729787007b5111f3584034af0f3ef2389098f", - "sha256": "0h4k5gxjx55bg7dx8ixl87qdbxrmdzym6bvg2apasjs3kz9ggan5" + "commit": "42a60e5c881082db2ec2c541a5c154308c4863e6", + "sha256": "14hn0v5gcbzj6y2xs30qyh8wba4l073x5281xd7xs05f9yv7dv5j" }, "stable": { "version": [ @@ -97570,8 +99580,8 @@ "f", "mmt" ], - "commit": "231cb7df43253b84323520b8ed70f128d37003af", - "sha256": "1savrxs7xl92ifyxpxkkzv2didr7lb405h0dwz1bs1wldr5fb53f" + "commit": "f567867a0a519e17ad3552837b48d3d45fb73aa5", + "sha256": "0a5xds0mhfnq6kyc13s385vf4x4cqqpk2jiw1in7qg382fl8w2p0" }, "stable": { "version": [ @@ -97595,11 +99605,11 @@ "repo": "jorgenschaefer/typoel", "unstable": { "version": [ - 20200212, - 919 + 20200706, + 1714 ], - "commit": "505b4b1ead337b773863ea54066f867d07735f9e", - "sha256": "0n8xh6bp757fjqa68slphw04kb4g0489g66r6f4n4v8bpbbi3bbl" + "commit": "173ebe4fc7ac38f344b16e6eaf41f79e38f20d57", + "sha256": "09835zlfzxby5lpz9njl705nqc2n2h2f7a4vpcyx89f5rb9qhy68" }, "stable": { "version": [ @@ -97610,6 +99620,38 @@ "sha256": "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2" } }, + { + "ename": "typo-suggest", + "commit": "d2dc0688a0e8371b5d74e16b6e73bc91d6a835ea", + "sha256": "0hp55apmm5z0zjz81ll746m9733rp7z0ylrl49a1vxzfpwx2fw47", + "fetcher": "github", + "repo": "kadircancetin/typo-suggest", + "unstable": { + "version": [ + 20200801, + 1000 + ], + "deps": [ + "company", + "helm" + ], + "commit": "ac48f2e59daee15983a5fd13009f751e0d928ab1", + "sha256": "0kjyjav2bwrr2kwvdm3dx7mi966ji49n9hcw9dxx458bl72giwqf" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], + "deps": [ + "company", + "helm" + ], + "commit": "ac48f2e59daee15983a5fd13009f751e0d928ab1", + "sha256": "0kjyjav2bwrr2kwvdm3dx7mi966ji49n9hcw9dxx458bl72giwqf" + } + }, { "ename": "typoscript-mode", "commit": "701de09cb97cbfa49a3a81aaeb9577817566efa2", @@ -97685,6 +99727,21 @@ "sha256": "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m" } }, + { + "ename": "udev-mode", + "commit": "38ea66665abd85da45aa005ba0fc03891fbbee63", + "sha256": "1gwp1hays9afl09vqv5zyq9s8k5w28jwc7aya0j7h6fbw3hrxnfn", + "fetcher": "github", + "repo": "benley/emacs-udev-mode", + "unstable": { + "version": [ + 20200702, + 1536 + ], + "commit": "5ca236980662141518603672ebdbdf863756da5a", + "sha256": "15nspdkjwbvxbqxlhmpsbhdf1zij9zd2z2xxhkmvdyjy89w0hyzp" + } + }, { "ename": "uimage", "commit": "346cb25abdfdd539d121a9f34bce75b2fc5a16be", @@ -97765,10 +99822,10 @@ }, { "ename": "undercover", - "commit": "d58ad9eb863494f609114e3c6af8c14c891b83a5", - "sha256": "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "09wfgskilv001mlvkiyw6yichkxd1wpz4j70r5mlzqgv7xfy7p1l", "fetcher": "github", - "repo": "sviridov/undercover.el", + "repo": "undercover-el/undercover.el", "unstable": { "version": [ 20191122, @@ -97819,6 +99876,29 @@ "sha256": "0i6jfr4l7mr8gpavmfblr5d41ck8aqzaf4iv1qk5fyzsb6yi0nla" } }, + { + "ename": "undersea-theme", + "commit": "0ee426fc0dcf1d8a4519ea9f953a8e20f1505f05", + "sha256": "1f2lkm4nv0sah2674wkfd50qx3mjg57618kcjvwam1q6qz2k1q41", + "fetcher": "github", + "repo": "jcs-elpa/undersea-theme", + "unstable": { + "version": [ + 20200719, + 618 + ], + "commit": "d4edb2cc110f1679ebc82cb52a4242cbc74636db", + "sha256": "0agn2j0qd516kxqx1bh6ajpandi8vz7zas966nw88yhv8m8hlzb2" + }, + "stable": { + "version": [ + 0, + 3 + ], + "commit": "952d0c14258b0fd2d2e4642c6576708dac35c2f8", + "sha256": "005m1qzhqg25ymmh17mmp3g8ism5k8mz430ri689g26zzw4m76mh" + } + }, { "ename": "underwater-theme", "commit": "e7dccc77d082181629b8f0c45404ac5d8bd97590", @@ -97851,11 +99931,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20200512, - 19 + 20200701, + 1435 ], - "commit": "2b1e53285a55ce50ca6fd60b050f2171e235d8f9", - "sha256": "0x7i7aj9fh8j0944xbym3hijr33mc0kfadl7v657k0d8nx00x3zh" + "commit": "c0806c1903c5a0e4c69b6615cdc3366470a9b8ca", + "sha256": "1n594aakmcgyl7qbda86v4wsx8clm62ypiv3h559xz3x72h7mr3j" } }, { @@ -97866,11 +99946,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20200510, - 434 + 20200517, + 949 ], - "commit": "0400f15f2a0cfcedb69c06c3ff62f3f8814b62fb", - "sha256": "0f3f4svgsl5338bbglxscvk6mrscjbpcxqc2f84w2np7iyap4ls9" + "commit": "e2043f8350970e1a9ef06a94956a733826cdf32b", + "sha256": "14qlrdal1z64cqqssa34cw1yzsppslgwwy23060sxgjz2vvwwwfb" } }, { @@ -97929,8 +100009,8 @@ 20200304, 2218 ], - "commit": "02c36a04364bcb586477ab79d2b5e0d4e6ae6d47", - "sha256": "0pp9ywxkvvfay2pblbqcknf2c3q5izig552r5zksmxbac1rlsvcm" + "commit": "6a3f9e929489ebac5aa26862363410144d84409e", + "sha256": "0jdk2r6jlynswjz047zz2v3dyfq94inf1zbsriq1b8fmia018gah" }, "stable": { "version": [ @@ -98032,8 +100112,8 @@ "repo": "rolandwalker/unicode-fonts", "unstable": { "version": [ - 20181001, - 1509 + 20200803, + 1335 ], "deps": [ "font-utils", @@ -98042,8 +100122,8 @@ "persistent-soft", "ucs-utils" ], - "commit": "7b88ae84e589f6c8b9386b2fb5a02ff4ccb91169", - "sha256": "07wzcfj92jiadgd6nj5rmxky2aiaxs89j7zywp877xdp4vv0v512" + "commit": "e3942fe40b418bfb2dc4e73633e09195437fef01", + "sha256": "1vyldpmbi92yqzj0v7wbxma86f3cla0jhxbmq8jzl94pqy6q98jc" }, "stable": { "version": [ @@ -98062,21 +100142,6 @@ "sha256": "07wzcfj92jiadgd6nj5rmxky2aiaxs89j7zywp877xdp4vv0v512" } }, - { - "ename": "unicode-input", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "17sf3xnl8yyx4ln4mrjlrvfinb8dvabh81l3qyr9pkn5skpgqgj8", - "fetcher": "bitbucket", - "repo": "m00nlight/unicode-input", - "unstable": { - "version": [ - 20141219, - 720 - ], - "commit": "e76ccb549e6a2a66c373da927eb65d69353e07db", - "sha256": "0kzcg1wxi1z424jdn7pibk9zyfyi85kligav08sl1c2hdldzya4l" - } - }, { "ename": "unicode-math-input", "commit": "e0d39bc129500e55b99c11b3d27e042619777414", @@ -98192,6 +100257,21 @@ "sha256": "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn" } }, + { + "ename": "unifdef", + "commit": "805d7ed87c68f45aa878a19816c21c1122501c01", + "sha256": "0d0k7h7bsgfmbnx697jc87mdhjqiw8wg6r8k4ay8cxfp2bxqnwkg", + "fetcher": "github", + "repo": "Lindydancer/unifdef", + "unstable": { + "version": [ + 20200517, + 514 + ], + "commit": "7a4b76f664c4375e3d98e8af0a29270752c13701", + "sha256": "0xx954cyvzndj7fy6k203nlnhaxi6d0pn3xrvy287dh9ydklng0m" + } + }, { "ename": "unify-opening", "commit": "0a2faab13744262ef4d12750f70b300b3afd2835", @@ -98261,6 +100341,30 @@ "sha256": "1snbvhvx2csw1f314dbdwny8yvfq834plpkzx0vl4k3wddmr3a66" } }, + { + "ename": "unisonlang-mode", + "commit": "5811216040e25a78c8eef9f9d90176173229eb4e", + "sha256": "0pckg82iawswaljp6yk9vd6piwjsfky3zzdf3gyj1b2phhr9zz3x", + "fetcher": "github", + "repo": "dariooddenino/unison-mode-emacs", + "unstable": { + "version": [ + 20200803, + 808 + ], + "commit": "2b794adbe0b2a4edd40f350173a32b80bd2c5896", + "sha256": "0zy3la6n51kgybjxibcsj13m6381p6klsq98h1sym8mxm2k2s78y" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "f793430068ade1b0a2d744aaa45f569c9dec9085", + "sha256": "129xk966kkhwn0ym80739r23kwds09qjiavd01ddnb3pfhbjfbrk" + } + }, { "ename": "universal-emotions-emoticons", "commit": "57f913112c98db2248cf69e44deb69fd09cee042", @@ -98325,10 +100429,10 @@ }, { "ename": "untitled-new-buffer", - "commit": "de62e48115e1e5f9506e6d47a3b23c0420c1205b", - "sha256": "1hpv7k7jhpif9csdrd2gpz71s3fp4svsvrd1nh8hbx7avjl66pjf", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0fqnwas6917338a896yi6y1fnp2yhpmkpk001wrw7fmybfqzw05y", "fetcher": "github", - "repo": "zonuexe/untitled-new-buffer.el", + "repo": "emacs-jp/untitled-new-buffer.el", "unstable": { "version": [ 20161212, @@ -98465,14 +100569,14 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20200322, - 2110 + 20200721, + 2156 ], "deps": [ "bind-key" ], - "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", - "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" + "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1", + "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip" }, "stable": { "version": [ @@ -98503,8 +100607,8 @@ "key-chord", "use-package" ], - "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", - "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" + "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1", + "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip" }, "stable": { "version": [ @@ -98565,8 +100669,8 @@ "system-packages", "use-package" ], - "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", - "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" + "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1", + "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip" }, "stable": { "version": [ @@ -98618,26 +100722,26 @@ "repo": "jcs-elpa/use-ttf", "unstable": { "version": [ - 20190823, - 939 + 20200720, + 957 ], "deps": [ "s" ], - "commit": "edfc3f4b50aec2234792c0cc894774e4916ce26a", - "sha256": "0xy522czbxva2dpfbfjqf0xm6wi7cc98pz6ha7glgylsmcvhlvar" + "commit": "e09f7d08b462984da6bf53b523b4fcd6826a6a5d", + "sha256": "1vli40rz0c27y3sl7b3rzmssgzrmawg0hdd5fvf8x8mjl9d61sia" }, "stable": { "version": [ 0, 0, - 5 + 6 ], "deps": [ "s" ], - "commit": "8c7f50a2b6f5bd55cdd92e351371386ff4b6edce", - "sha256": "0xg98ngrdlfjcb902qaljwhh9jszkafc2vm1x8627lnw1k7i6b3q" + "commit": "e09f7d08b462984da6bf53b523b4fcd6826a6a5d", + "sha256": "1vli40rz0c27y3sl7b3rzmssgzrmawg0hdd5fvf8x8mjl9d61sia" } }, { @@ -98651,17 +100755,17 @@ 20190715, 1836 ], - "commit": "952f97a46062bb3315d3ae20ecbfd58747019c25", - "sha256": "0bfi325y5yzjbwnmdww0l5bpf4h9ynwz4mwg60k8q3p3f82pkrrm" + "commit": "7bc5117d3449fc19f5c706a6decfdb2a30984507", + "sha256": "0fg1amarrwyfq76mv0w5z78qxs1x9vsvmzf7qzvnwh92n7lv6snb" }, "stable": { "version": [ 2, - 5, + 6, 0 ], - "commit": "471cb311159773bbb280d0f1a4b47c54456c67a9", - "sha256": "09hxi1v5wvb952rwfmj48n6ndxkqn8ciaqj1cd9xgkw62h54agq9" + "commit": "df2447a63de2fea0f56d8c63d35b0bf39e11c0f2", + "sha256": "1g0s46p8c5kbv1kxvvj838g8hghqbkykv94q6zwy0d7q8ai1kqrq" } }, { @@ -98687,11 +100791,11 @@ "repo": "kanru/uuidgen-el", "unstable": { "version": [ - 20200223, - 509 + 20200816, + 1308 ], - "commit": "f096f35a6e1f27d2bc9e9093cd61dd97bc33f502", - "sha256": "1nzf7cllyvx7kwdzpf0nl3g5a8mn6qgifa60aw68h0sx9a80xp01" + "commit": "b50e6fef2de4199a8f207b46588c2cb3890ddd85", + "sha256": "08m74kj7h70kna3pifk3sgsy7mck11p32vi48h9wzqnafyq3n55d" }, "stable": { "version": [ @@ -98702,6 +100806,25 @@ "sha256": "1nzf7cllyvx7kwdzpf0nl3g5a8mn6qgifa60aw68h0sx9a80xp01" } }, + { + "ename": "v-mode", + "commit": "247cab604cf0ef6078f5b0f5887526bcbbcefb70", + "sha256": "0jky9y06fqj06m4mg95h8k3h5fihf9j9qj4w3n836qg5lnb4ywga", + "fetcher": "github", + "repo": "damon-kwok/v-mode", + "unstable": { + "version": [ + 20200812, + 956 + ], + "deps": [ + "dash", + "hydra" + ], + "commit": "15a73b304e624d9b07fd8f23670569678d6cd9c3", + "sha256": "1arbd9wwaqlhc1hl4hgpfjn4ncyrirjmpq8sgnhffgw7vkzl99pv" + } + }, { "ename": "v2ex-mode", "commit": "b27b7d777415aa350c8c30822e239b9a4c02e77d", @@ -98927,19 +101050,19 @@ "repo": "muffinmad/emacs-vc-hgcmd", "unstable": { "version": [ - 20200507, - 2139 + 20200615, + 1823 ], - "commit": "7433c6cc557440893d54be05fbf6500ff0e863d7", - "sha256": "0wgr2g814a461nknqchwbrgfgax5hb5f9fp6ibz6616q56hrcbds" + "commit": "5c735b3e3897b7ba52b5ac4e6a2f43ca283fd52d", + "sha256": "050xk0rs7k79ymchqdkdmgpg3s22wpbdnzl3pz2wsghihkskz6q1" }, "stable": { "version": [ 1, - 11 + 12 ], - "commit": "7433c6cc557440893d54be05fbf6500ff0e863d7", - "sha256": "0wgr2g814a461nknqchwbrgfgax5hb5f9fp6ibz6616q56hrcbds" + "commit": "5c735b3e3897b7ba52b5ac4e6a2f43ca283fd52d", + "sha256": "050xk0rs7k79ymchqdkdmgpg3s22wpbdnzl3pz2wsghihkskz6q1" } }, { @@ -99043,11 +101166,11 @@ "repo": "plapadoo/vdf-mode", "unstable": { "version": [ - 20191122, - 823 + 20200713, + 1838 ], - "commit": "35f5c3531b256b6578b9878ac2ce1ed79b3c8511", - "sha256": "16650xwq85rp98z4nljd5s7f14fg4rr90nr7ipfshj1i6zvbk229" + "commit": "8fbf6157440345879a0543bcab233e790a7b60ee", + "sha256": "1m237py9jcxkm6z3wgsxzhikc3lidd28gfflcmr0wm588sdx48sl" }, "stable": { "version": [ @@ -99271,15 +101394,15 @@ "repo": "applied-science/emacs-vega-view", "unstable": { "version": [ - 20200510, - 726 + 20200520, + 1202 ], "deps": [ "cider", "parseedn" ], - "commit": "c869defa3c0d9931e8eb4050dbaedb781160410b", - "sha256": "1l57w79ljihhfs4n60ak3hc3hdzv24wxkxafv51llb4zv2b85b5k" + "commit": "b0160c883f53ce069c0b4498880474c158ac7245", + "sha256": "1msc6s90a048lk4i8gqkhgnm1k52k40m62q9n1s0dwgmq1yj3zyl" } }, { @@ -99290,20 +101413,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20200515, - 1734 + 20200801, + 2217 ], - "commit": "af1f250fd34d53ecdf31be1756c8693b4182d452", - "sha256": "0zk52ddlf11rwsd1f70i6jjc9z81jddqapfr2dv1d4ghn6j382x5" + "commit": "f8755213c8fadea92b7a2313fb38c0ee37b8a2cc", + "sha256": "0f59rw78hfc7hkgd9ja2hzyb6gaf400aa6375zcl3zxh2ljnvbvb" }, "stable": { "version": [ 2, - 10, + 12, 0 ], - "commit": "ee83e62490bec3b6d99281748a2e894c2bdc9e24", - "sha256": "1zd7vkd3i3x5cr04sp3jpfd79cp0p30615c9605z1rq01jjxgm3m" + "commit": "08ddce1306ad1b8707300fee33848b7a48897fd3", + "sha256": "1azwmqhlasir5fhy2r3yd861xvk6lxrzq60svvyjss3kdlqp1irj" } }, { @@ -99343,6 +101466,25 @@ "sha256": "1y6vjw5qzaxr37spg5d4nxffmhiipzsrd7mvh8bs3jcfrsg3080n" } }, + { + "ename": "verona-mode", + "commit": "342867cf256c6e6c242387b6d8c439a7a90f17dc", + "sha256": "1w94hs8mkd6qfklgm7hxb8j7ykvif25czpha0yq7ghbfc0vb3595", + "fetcher": "github", + "repo": "damon-kwok/verona-mode", + "unstable": { + "version": [ + 20200812, + 807 + ], + "deps": [ + "dash", + "hydra" + ], + "commit": "3519f83e68af163a6b01753ad7bb4cecf26c24b2", + "sha256": "1ck3x1w0nyn31s3fdks6wms5ic5n56jcxg49r56j3dwnifpk87mm" + } + }, { "ename": "versuri", "commit": "056daa8d5563dd6ffb9c93630f9b357f73c1e58a", @@ -99596,21 +101738,21 @@ }, { "ename": "vimish-fold", - "commit": "b4862b0a3d43f073e645803cbbf11d973a4b51d5", - "sha256": "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "1ld9sab9r82wr74rscxcmsmd07jgkmkysbcn5aswzyrf1gn62gr9", "fetcher": "github", - "repo": "mrkkrp/vimish-fold", + "repo": "seregaxvm/vimish-fold", "unstable": { "version": [ - 20200329, - 1242 + 20200524, + 1729 ], "deps": [ "cl-lib", "f" ], - "commit": "63685239655a151181b9152e45478dad587f86f2", - "sha256": "1l6zca08diq3ppmg1pllihbfj0pcaqvbnisryr92mvbblhk44wxs" + "commit": "9d12e39f01da517565666e09a2e32e01aed24a90", + "sha256": "0xdk95hiamnim0bn1w5g0lccb9wc0sxbczrb95q3ndaw3cxxjaa2" }, "stable": { "version": [ @@ -99756,8 +101898,8 @@ 20200428, 816 ], - "commit": "982606896e018c951917b73d2af6334df554cf9d", - "sha256": "19ks9wjfjyfk4s53wvhdqjnjc6847v43nh3ir0yvr66mflqxgg54" + "commit": "64d38bc1c00953be05c193c01332a633be67aac2", + "sha256": "1gkl2bg0ax16d3b17n7s3j5ng261jxfl6q3bi5bff03jph900x1p" }, "stable": { "version": [ @@ -99875,11 +102017,11 @@ "repo": "blak3mill3r/vmd-mode", "unstable": { "version": [ - 20190929, - 735 + 20200727, + 701 ], - "commit": "aa9b753601ee1ed31b4f717629179ce7a2cacba5", - "sha256": "0gc1c5q1krqlbaq0lb7p29biwpl32lgv4c6527c322a21in6a5pb" + "commit": "31655a41caf006c3dd64d6e57f6c4488098f8bce", + "sha256": "1pnx977pm305kr0zakwy1wkdfpk09rilwx8rmai4459lyz0sa8j9" } }, { @@ -99940,11 +102082,11 @@ "repo": "dbrock/volume.el", "unstable": { "version": [ - 20150718, - 2009 + 20200523, + 1246 ], - "commit": "ecc1550b3c8b501d37e0f0116b54b535d15f90f6", - "sha256": "0ymibjq6iwab5ia1fglhz4gm5cnbi792018fmrabcqkisj2zsjb7" + "commit": "bd0ca8430098164740f111ac2bd2582d7f628b79", + "sha256": "0v8x9d0qq8gjlf6ydri580wix6hisf6x9pywg5px6cqj53r8g6rc" } }, { @@ -99958,8 +102100,8 @@ 20191209, 1600 ], - "commit": "d1f954a3879ec3f93c8dea9177772bf4d5bd0ecb", - "sha256": "13kfwp129wrlbbpvl9n4h7ybnycph68x214dx5v6v7ap6gnv0lr6" + "commit": "aea1ca9932df2c19a19e47f7971b7bc6b821181f", + "sha256": "0nk0vsxww46rrm1ijfpq58bn3zai7qmj2iqg1k8g14w7fc2si8mi" }, "stable": { "version": [ @@ -99981,8 +102123,8 @@ 20191209, 1600 ], - "commit": "764f478f5866140b121b1e43857487b7a66afa72", - "sha256": "0s8fh7n8qhsfdk8l7r81ifscaazgmpls4n3pginaqb5cszdy4063" + "commit": "5c11a73bfc5f3873490ed0ba88eed44e4707e455", + "sha256": "1ifwm4dwmv4f97p1byv3l5k26gyb97zp60wjhrzrdj2g49fg716g" }, "stable": { "version": [ @@ -100008,6 +102150,30 @@ "sha256": "01p5ys23m4zk5hniri55bcn8j7v6pd6ryi41qx20w29mramwzxl9" } }, + { + "ename": "vscode-dark-plus-theme", + "commit": "0e7e489ea5cee3b1d2b6b5295cf95f3e1d9d6c60", + "sha256": "001xhi87dsh75sd0vg26v4w78rf1p8bhj1zhn3w7j255817xvcgd", + "fetcher": "github", + "repo": "ianpan870102/vscode-dark-plus-emacs-theme", + "unstable": { + "version": [ + 20200818, + 341 + ], + "commit": "a33ef7fd5d9249bbb59fcb822c032e28bb3bf792", + "sha256": "0wm54jy09hsg3vbw4qc5k4nzznsn3mqcn0al8mwh2522q6kb6l8j" + }, + "stable": { + "version": [ + 1, + 5, + 0 + ], + "commit": "c64d5f7088f1295df0bd8f1dc87a532e00647fbe", + "sha256": "09a6plb2dqayj4m456ldh43a654jbkg8zjiky7bkj5m0kpdc5426" + } + }, { "ename": "vscode-icon", "commit": "90a07c96a9223a9ad477cbea895ba522523c5be4", @@ -100031,11 +102197,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20200515, - 1412 + 20200813, + 1748 ], - "commit": "8337e77520bcdb136eebb74837dc71ac8ec67601", - "sha256": "1wf8w8w0690mkih7c9xkk11i9f7r47abvfpyw4y576ansxlr5g1f" + "commit": "797357bf65952337627f2d0c594c2fef600aafae", + "sha256": "0lqlx97kb1mpw17lmrx2xa407ixn3wl2cv9rdwrvlrlvg8kcpjmn" } }, { @@ -100046,14 +102212,15 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20200516, - 1117 + 20200614, + 1452 ], "deps": [ + "projectile", "vterm" ], - "commit": "fd55be72e8ad19e2284c8f73d5707c033dbde46d", - "sha256": "0q3459vpj5fp2i7nbk67mfd0nf78mpkgz771nhdj4a7xwghk6xgq" + "commit": "7f762d216fc7311bac4182f650e0207574c29357", + "sha256": "0nz3qcd2jmjfky0xn62fkhnxchf9nap3li5blis0jgi6igj47ykq" } }, { @@ -100122,8 +102289,8 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20200424, - 1400 + 20200616, + 1136 ], "deps": [ "bind-key", @@ -100132,8 +102299,8 @@ "s", "versuri" ], - "commit": "5da06a8acebcaf84a3581610ff24aae1b46f786b", - "sha256": "16yfnqpdzi3bih16d7dzbqmd30m7w8rkjylnsg9m951vc0lysk3p" + "commit": "3dab1ea2253d5bc2974a1a064d2b1af3bd6b24f6", + "sha256": "1q1rcnsda1392kqh944hdj30d79300ycl46ck1bzx4szx3m3p801" }, "stable": { "version": [ @@ -100196,11 +102363,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20200325, - 2226 + 20200818, + 141 ], - "commit": "e522a44b151d69d4a176e8809225598ab540fc4d", - "sha256": "1alishzz4j1hbfyfi09rkhffx6gv16yxln7q8jx25shb9rssivyz" + "commit": "7dcbab77334c5adf8309c7a93512c9f95a2c64e4", + "sha256": "0in8ir99b33d83nfxsnpj2dgyv4f558yrid77bp7f9k0qpgpj4zk" } }, { @@ -100273,11 +102440,11 @@ "repo": "wakatime/wakatime-mode", "unstable": { "version": [ - 20180920, - 702 + 20200730, + 240 ], - "commit": "2531cb58287770883ba534d20b3288955c4d6ef3", - "sha256": "12wa845lwvwg38801mk880izfhjs50ssy5alj1743c2bz7ig5grk" + "commit": "7626678315918bdbb81ede68149f20a7d97a928f", + "sha256": "0dlhj32mkylji1d55pc593d3gn8babcs6s4c0c5sfm6jfz14m9j0" } }, { @@ -100674,11 +102841,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20200501, - 1939 + 20200612, + 1038 ], - "commit": "186a7c21049c50ecfd4109eb06c91196404f8bc5", - "sha256": "1si8i21ysqwnkq38wr0r4liz3j8v8sj66y46yl6bpw77116fngx9" + "commit": "60ffd878c4371644bd964f00fea38054645e3e47", + "sha256": "0la14k422jqcny1bxgvv8yidanl3pv5kkdfbiwq8skxsd6m2xfq5" }, "stable": { "version": [ @@ -100856,8 +103023,8 @@ "deps": [ "cl-lib" ], - "commit": "078f83902c0846c00ed8e3b6c5add7ff9b98d8f9", - "sha256": "11nacz0vvhaa8582r0ylx5w886y2qysbvrh9s064g979vjyfh9rg" + "commit": "5aaf9d12068f98fb4efa772a3e5f4bb350b79a99", + "sha256": "13qwvjid9d67kk4ggvc2hvm6j4wy1jassd02krp8as91h5hr0y36" }, "stable": { "version": [ @@ -100966,6 +103133,21 @@ "sha256": "14vmgfz45wmpjfhfx3pfjn3bak8qvj1zk1w4xc5w1cfl6vnij6hv" } }, + { + "ename": "weyland-yutani-theme", + "commit": "87fd30180367eaf64fe145d78e50febdfd79772b", + "sha256": "184vc3r34j2pv0a2a2bldbzpvv8d39c20znv6l9fmnqmr48fzvnq", + "fetcher": "github", + "repo": "jstaursky/weyland-yutani-theme", + "unstable": { + "version": [ + 20200818, + 2225 + ], + "commit": "d17297aee3a15b326e813d6c12831b587f6267fd", + "sha256": "0brixf1j1hdmj0wvd3qzlmr844fvd61nxgc5adczpy0qivc1c1c9" + } + }, { "ename": "wgrep", "commit": "9648e3df896fcd97b3757a727108bc78261973cc", @@ -101133,11 +103315,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20200216, - 1350 + 20200817, + 2358 ], - "commit": "8b49ae978cceca65967f3544c236f32964ddbed0", - "sha256": "15ydzqv23m1w6g27il57fmzs6pjcasdb7drml3msjpq2l8kr4ard" + "commit": "e48e190a75a0c176e1deac218b891e77792d6921", + "sha256": "1wr5lqjc5si0s0rn266jxfwln93l7aw79885w66gbjcynfy8rji3" }, "stable": { "version": [ @@ -101251,8 +103433,8 @@ 20200304, 2227 ], - "commit": "5fac49636cd72a0043e2473c9a09a788cfd68d5f", - "sha256": "0myx8vayakmhb5hbrskk58rkb1f0jdw7kinvk8fvv73g050yk28d" + "commit": "c344cfd78df23980ee48fb85fbc16989b7d4cffe", + "sha256": "1jwz89j6v8mmdim8knnwjz2ip0cwn5lq6x8nz78xns1ba5fg293b" }, "stable": { "version": [ @@ -101295,19 +103477,19 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20200409, - 1538 + 20200715, + 1715 ], - "commit": "907abd9538c4a1e088853b816af883e5040fc430", - "sha256": "1qfkppciijyyg76idqqzjy351rki8y4pffwicprnrhv1qixfhdvv" + "commit": "11d01c483ab3ba78b6ea1e195bda65b5e35f2d4c", + "sha256": "14w1cchij7i8a9m9z71dsz76aphidmvp8lbai4gaxxi4qiyvkcn3" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "b4cdab4d25225c6e834727a7d85cdb0d493da152", - "sha256": "058wym1iwgz5n5yd508xdc05ncdyqbs53a5c9mq0s6gs06h5xfyw" + "commit": "7cc7e2734ec823bed6eb923387b3b33a1cde0c86", + "sha256": "0d8q8as85fjn2v65i25xv9bzg03mlk4jhxrbqrcg5ywjiv5i2ljg" } }, { @@ -101321,8 +103503,8 @@ 20200305, 221 ], - "commit": "71f84725e2643b2ee74f27c60c4fd8b79c9c3c97", - "sha256": "1rs446cwbp6i79wi7srzaxg9hdahagcjkjill34j70hdy1r4xjas" + "commit": "9791ae59f8bd8b9375d2dede92de8eba5f0d89fb", + "sha256": "0fk2nhcjkwrni8np8788z9aanrj1hxchg37a1j1z9ds42f0ghj6h" }, "stable": { "version": [ @@ -101389,8 +103571,8 @@ "makey", "s" ], - "commit": "1de068d49a6b5faf8754d217bdaa2cbfc903a9fc", - "sha256": "04gfhjpn4q8d4y6177gdffwjbqq627083pff2ckw79pbvlj9f2mm" + "commit": "a0d8456b9f71fcb40a28ec9235132df506aa6ecc", + "sha256": "1bndpdzscb917sp32khmifk7vdkj4psh7c8rf4j5s5zs7033qwka" } }, { @@ -101668,6 +103850,29 @@ "sha256": "1f4v0xd341qs4kfnjqhgf8j26valvg6pz4rwcz0zj0s23niy2yil" } }, + { + "ename": "windswap", + "commit": "442a7394fd31e641b778ef0b218a5ef158377db0", + "sha256": "0yxh8zlqg2gv08gfima2vgcqwadqkli1qz6q11xvy5a0d3n8drxr", + "fetcher": "github", + "repo": "purcell/windswap", + "unstable": { + "version": [ + 20200722, + 411 + ], + "commit": "1a334f6543e0a30c55ea1e6071e9732d948f9e4b", + "sha256": "0q36rqy1ss1hayf698zla2m6ff57gigkji5slaffjhnijhsj3c67" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "33d59d371843d5a72a4327e318382ff27ee15674", + "sha256": "13hbpi6rr7vgyy1cbxaz947ixbrbp8x2dy6dw2l02c5hl4p65miw" + } + }, { "ename": "windwow", "commit": "12aba18872021ce0affa96c46a17353c7d073ca2", @@ -101772,21 +103977,6 @@ "sha256": "0v1qmw3svydk7dlqbcymy1g1bygkfpb2h4b97zdp12xvd8mww9ny" } }, - { - "ename": "wisp-mode", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc", - "fetcher": "bitbucket", - "repo": "ArneBab/wisp", - "unstable": { - "version": [ - 20191114, - 2340 - ], - "commit": "91ec8dc32652811861116e6f750f0fb41b21b771", - "sha256": "0nc9c1agzhmlbh4ijjrsa9yx19hvxzk06gv6p4pgrlx1yg2khnli" - } - }, { "ename": "wispjs-mode", "commit": "a628330ee8deeab2bd5c2d4b61b33f119c4549d8", @@ -101825,26 +104015,26 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20200217, - 1015 + 20200720, + 2014 ], "deps": [ "async" ], - "commit": "f25a70777d9d9c90a52249791578bd72f1b7dfd7", - "sha256": "1vb6dw07vx3zqqb1h457f9957yja8wfqcjcfcf3m78dah3l2qmr1" + "commit": "efafd482c21b90decbb0b682ed3159c86014d4f3", + "sha256": "1z3214zjf3dassb31k14gq4nbr3q8g5x87ydfah28hm4j08v0wb3" }, "stable": { "version": [ 2, 9, - 1 + 4 ], "deps": [ "async" ], - "commit": "7e0bf753709f1775d2bbbb6edf4482fca7fd286a", - "sha256": "1y4zrgsfs0504ks30qb7hl32ygd3hb6yx5x8032b30j7rh5ks29d" + "commit": "efafd482c21b90decbb0b682ed3159c86014d4f3", + "sha256": "1z3214zjf3dassb31k14gq4nbr3q8g5x87ydfah28hm4j08v0wb3" } }, { @@ -101904,26 +104094,26 @@ "repo": "p3r7/with-shell-interpreter", "unstable": { "version": [ - 20200510, - 1621 + 20200527, + 828 ], "deps": [ "cl-lib" ], - "commit": "8d78bfeffa8a7bb4973395417d6fe21e4840ee16", - "sha256": "0ygbabavrhl9xmxmqaxrjkhyf7ar5lin5v1ay94hzr1v1lyiyc9h" + "commit": "f8a01beda6260bd2eff3f9fe154ddc16da7b6504", + "sha256": "1xwmg85211s6fvc9agb8ib06klbk6cn890gpjq33bns6ldjsq41s" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "5ff0c8bc0b99b28d6c696e56cd7f44c7aa9ccaf1", - "sha256": "00dc0b0kj8215z14brwmzryb73w1j82r136a03n3pnczfh2l9z4n" + "commit": "eb2b629c885ca002b7225e20d03231835910d6be", + "sha256": "0b6z516lwcl08gnhlw99z9sdw15qxk3kanicpp0l0hcbmzann46k" } }, { @@ -102205,32 +104395,26 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20200516, - 1451 + 20200729, + 852 ], "deps": [ - "anaphora", - "cl-lib", - "dash", - "f" + "dash" ], - "commit": "239a5a3ba3b210be5d8fe527546d09241bd3185c", - "sha256": "16lzv61scc1iq1vsbfvyzla91cnxh5a7s84wx3x3kq9jggzh6hbs" + "commit": "737306531f6834227eee2f63b197a23401003d23", + "sha256": "0f16a4zz5havxbadiv4h6msa30c1yfdkfk56gic5wapz4i26z3x7" }, "stable": { "version": [ 1, 2, - 0 + 1 ], "deps": [ - "anaphora", - "cl-lib", - "dash", - "f" + "dash" ], - "commit": "928d509157ec8a4a2e343b6115dff034c3243a7a", - "sha256": "0prj2b33h6rya7y9ff91r72bva1y6hg0sv9l11bn1gikmc6lc18n" + "commit": "737306531f6834227eee2f63b197a23401003d23", + "sha256": "0f16a4zz5havxbadiv4h6msa30c1yfdkfk56gic5wapz4i26z3x7" } }, { @@ -102348,14 +104532,14 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20200427, - 2319 + 20200519, + 37 ], "deps": [ "visual-fill-column" ], - "commit": "7f7acde5e8fc4ba74e511ca295e21f9ba7874730", - "sha256": "01rc7v2kg1h3cc06qa521mx9kvdxpw2b5hg12skh9gq1v5q1pbv9" + "commit": "8a226a31a12a9203067094774ba6fd6175793e70", + "sha256": "1wb8lkza1a6yfgpwqlc78iq7b5hamss9lak2alwmp9j9aiwys1n0" }, "stable": { "version": [ @@ -102454,20 +104638,20 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20200516, - 1526 + 20200710, + 932 ], - "commit": "49d2ae558068954eb8c4324b8ee7a6b2b0a00ef9", - "sha256": "1zr9fp4y9459y97zh4dj6109wwk6lj7sjfffwapyjmirnpfkxirk" + "commit": "54143769dbea06d34792687eadbc6c7a1cd89ea2", + "sha256": "1a6jy8vixc6ls6cjwxjy3ifmiw8xw3c0kfichgd1b6v20xqdvhh3" }, "stable": { "version": [ 0, - 1, - 2 + 2, + 6 ], - "commit": "49d2ae558068954eb8c4324b8ee7a6b2b0a00ef9", - "sha256": "1zr9fp4y9459y97zh4dj6109wwk6lj7sjfffwapyjmirnpfkxirk" + "commit": "54143769dbea06d34792687eadbc6c7a1cd89ea2", + "sha256": "1a6jy8vixc6ls6cjwxjy3ifmiw8xw3c0kfichgd1b6v20xqdvhh3" } }, { @@ -102578,11 +104762,11 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20200309, - 1750 + 20200627, + 1652 ], - "commit": "43dbab2b8c35bd6892fe80bf064b41bd731545ff", - "sha256": "0m6l2k22pfcp6s3dadm3w1mr7ar590xl64zjsr0dl9d8spc6gbz1" + "commit": "98e550db52865d6de141d5bbb85f8b4e68b56b39", + "sha256": "0km4b9praqpkv4n6sixmxjfvisp5640zyd1x85q43vkxrm39p7ah" } }, { @@ -102593,11 +104777,11 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20190125, - 646 + 20200719, + 1648 ], - "commit": "a09c51e450bf4b39bdc3f4063c2946baec7ae3b1", - "sha256": "0hpdm6qns2i5zpavqq6zd7dyl9lxsxyic52jzjfisqv3gjrz8zpp" + "commit": "a051862622c56b7cad2057a95d8201ab38b50752", + "sha256": "00kan9rb133mf11qq0grdkph6ghv0hgwvdx3b21890mad20zmk1w" } }, { @@ -102623,11 +104807,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20200427, - 1357 + 20200707, + 1310 ], - "commit": "17319a5e5514a61564c7314cb65b7d825ca0bb0f", - "sha256": "1y5g89kl1lbwzxmgah06z6iisj55l089q25n9dbxmwnklsxpbicw" + "commit": "8c9c4df25e1406b093a32c87da19803337e4e09c", + "sha256": "10d1xvyd2mbvhmlf1x5snqn4d22xg0p53nq601s8b4f1gws6zs59" } }, { @@ -102772,11 +104956,11 @@ "repo": "nhojb/xcode-project", "unstable": { "version": [ - 20181025, - 1244 + 20200810, + 2010 ], - "commit": "0bf9a4230fab7830350c750c39beda99ef74d72f", - "sha256": "0746f2niclmlx90skvdb1xdac0nqj8a9pd9ap8n89ckb5r6f9hbg" + "commit": "11743f0a2212c840a108e1b905b1f20afcff8156", + "sha256": "1vj1xshdsff5xrgmp6c46q2ipglq4wy25mq51rnhv57f0r1wq62n" }, "stable": { "version": [ @@ -102811,6 +104995,30 @@ "sha256": "0w2bxrnidladpzrd82z3w3gvjhajs71k5vjk2y03r09i9fwn2ykc" } }, + { + "ename": "xenops", + "commit": "605c8ca551d54c79246310bcee678cdd854548b0", + "sha256": "0l9pwjbdyfs2mkp2n9xg16pv02y063l92302fmi0h8rwra81xrvv", + "fetcher": "github", + "repo": "dandavison/xenops", + "unstable": { + "version": [ + 20200730, + 1646 + ], + "deps": [ + "aio", + "auctex", + "avy", + "dash", + "dash-functional", + "f", + "s" + ], + "commit": "78cbe16b74480ac6304865c9c3cfad36b5d49d1d", + "sha256": "1rpcckp60pw1blkxs7wlp60pvpr847b6g2rcd6p0hpf5sx9wirgv" + } + }, { "ename": "xkcd", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -102905,10 +105113,10 @@ }, { "ename": "xml-rpc", - "commit": "547d773e07d6229d2135d1b081b5401039ffad39", - "sha256": "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "08nx1a6v7b53zl1wgcypankdwqdgqcljwmzgrrd00ibi59nbfi4l", "fetcher": "github", - "repo": "hexmode/xml-rpc-el", + "repo": "xml-rpc-el/xml-rpc-el", "unstable": { "version": [ 20181002, @@ -102921,10 +105129,10 @@ "version": [ 1, 6, - 12 + 13 ], - "commit": "0ab093d60140d19e31d217c8abdc7dbdac944486", - "sha256": "0g52bmamcd54acyk6i47ar5jawad6ycvm9g656inb994wprnjin9" + "commit": "8f624f8b964e9145acb504e4457c9510e87dd93c", + "sha256": "0xa54z52rsfl3n0xgmbycj4zazp8ksgdwcq56swzs6wp72zlalmj" } }, { @@ -102958,19 +105166,19 @@ "repo": "ndw/xmlunicode", "unstable": { "version": [ - 20191124, - 2312 + 20200812, + 747 ], - "commit": "80f30becf860db4277e71e3445994fccaf35ba98", - "sha256": "0vs8l739104s3zqmqna4m0n0pkz4m04mivx6r9iqdjmg4khh6bfi" + "commit": "8ae84ded4341aaa303903b4da142ef3ea456391e", + "sha256": "0ki8i41jkkzk791dg5wvpl6nfa4py2bfcs6lf3wmw8y768vx6mbg" }, "stable": { "version": [ 1, - 21 + 22 ], - "commit": "80f30becf860db4277e71e3445994fccaf35ba98", - "sha256": "0vs8l739104s3zqmqna4m0n0pkz4m04mivx6r9iqdjmg4khh6bfi" + "commit": "852bcbd0bd014f62c41ac78648e4f6664209b40b", + "sha256": "03b18jhfpbhkaq5fj30k6drwpcpvrb6gf1l43ja1mnqyrilvni2x" } }, { @@ -103106,11 +105314,11 @@ "repo": "atomontage/xterm-color", "unstable": { "version": [ - 20200514, - 1932 + 20200605, + 2017 ], - "commit": "3d1a24ca84d26ad4507a79260107b010a1d6886b", - "sha256": "1qppbf4jidq6q8c7gby0syp4560xqc3kzgbdgdwl1jc5k08ln3cl" + "commit": "b9b1f84fb10fff5261702e38bf15b3ae75a4b6bb", + "sha256": "0mb5a1g7sby3v4gaqgg9w3lr5albd99mj3kd2bgga7h7kbcjfp5a" }, "stable": { "version": [ @@ -103185,6 +105393,29 @@ "sha256": "04j4xwcdxlnrwxs89605zmwxszbi2j0z67v80651pshgnhj5p19i" } }, + { + "ename": "xwidgets-reuse", + "commit": "dada661402d2f3c9c4bcea8c41ebd926f8b26748", + "sha256": "08v2377h2f8yjav7icv0372d1h1wbjqsqnb57x0rwbivxwlb0ijy", + "fetcher": "github", + "repo": "lordpretzel/xwidgets-reuse", + "unstable": { + "version": [ + 20200817, + 147 + ], + "commit": "5d56472dda53e43e0a11edcd373b44c0dbab47ce", + "sha256": "1b85x1yhgip4g3kv1sdwf3zmi91w6m5xbmm6zzl84w67wqfmnqlz" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "3f95d81bfce1b3c52f9dcf2890cd2559a5287a33", + "sha256": "1i6g4n2pnp3r0pyn4p6xryh0x44lyvazy8kc1bfrzwzf6py9wmq0" + } + }, { "ename": "xwwp", "commit": "83c34ae5023410cc31f93255275d6465b6152a10", @@ -103373,11 +105604,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20200512, - 2141 + 20200725, + 1836 ], - "commit": "0b33131664719c61f834e77ff3b91ded3de2cd3b", - "sha256": "0ig5hpk0wb46yz6gml6g7x9am0l3cay1bzxldms0g2qjh5swxrq4" + "commit": "68fecb5f0dec712a10c8655df6881392a4613617", + "sha256": "11lasdsray1cy01m4yiklin2apgfk2bac93m2ii88vjlv6b6vv04" }, "stable": { "version": [ @@ -103577,26 +105808,26 @@ "repo": "emacsorphanage/yascroll", "unstable": { "version": [ - 20200224, - 1117 + 20200701, + 336 ], "deps": [ "cl-lib" ], - "commit": "b298a34ae872a45c3e83d29d33888abde59c185b", - "sha256": "1pnynyy3scrd15q4ag769af5njrxx6rw48svbsfx3xrz1n0x9snz" + "commit": "9e828920d1931da66a473a66019922b9c3b729f5", + "sha256": "0cixj0swz322p7dghghbrasziygbzmn2ikcfiyrjar6bzh1mha9b" }, "stable": { "version": [ 0, 1, - 7 + 9 ], "deps": [ "cl-lib" ], - "commit": "784ebb0ee5496b5e7762bfd4c8101166542cb90d", - "sha256": "1k9y319ny01yqkg1xsh4rh2xs3dpx5jgvhs17p4c4dvqm0g53mkm" + "commit": "9e828920d1931da66a473a66019922b9c3b729f5", + "sha256": "0cixj0swz322p7dghghbrasziygbzmn2ikcfiyrjar6bzh1mha9b" } }, { @@ -103607,14 +105838,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20200413, - 2221 + 20200604, + 246 ], "deps": [ "cl-lib" ], - "commit": "5b1217ab085fab4abeb1118dccb260691b446703", - "sha256": "0486kd8brxwmbmw9bjf0p9i99dyl17hbc5aa03z7psqqlsw713mx" + "commit": "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6", + "sha256": "1cp1sgmfc8pgcy24l77aam833710mjp2y3m8l8c90677wxqr44vl" }, "stable": { "version": [ @@ -103637,14 +105868,14 @@ "repo": "leanprover-community/yasnippet-lean", "unstable": { "version": [ - 20190922, - 2037 + 20200526, + 326 ], "deps": [ "yasnippet" ], - "commit": "9119be08a32286d3e8559138e8ae003856ae1c0a", - "sha256": "1q06c574zn0ibbb3zbgi59zxj17i7kyjkcz45sj5h7hbn9l81594" + "commit": "e0933f55d59da5425d0604bdcdbbf3cb85967563", + "sha256": "0h64h47qdv3c20g9hlys2xb4w2jby7pdfhaza52y48wayz6vhpnx" } }, { @@ -103655,25 +105886,27 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20200508, - 936 + 20200802, + 1658 ], "deps": [ + "s", "yasnippet" ], - "commit": "ab3c20483a39742d7c612bc006d09aa8ffa3186d", - "sha256": "16gzc33qlmgbp9hq5c3bbv24b136ai23h3v0b2f9rr2xy9ln3ccz" + "commit": "b83c0f2f3bd068aa93c8f4c0c07f0b0a137d9cda", + "sha256": "0j1955y6gc3ddv783pd9kx834vvicpdsj49smkkpk4rj4s7pfxkz" }, "stable": { "version": [ 0, - 22 + 23 ], "deps": [ + "s", "yasnippet" ], - "commit": "e51a259527d685fe767b6ec951ad1940b1131a69", - "sha256": "1xcmx0frialb86z5adi07b6skqks326w3v1xn49c54gxim027i5d" + "commit": "e5ebfcdb38eb79a6d6705107d07f7bab2e2b5c38", + "sha256": "18pcnjnqvcky6i49p38vy3ms5xiisn27vy47pc3vsgr3r2n87mqb" } }, { @@ -103684,14 +105917,14 @@ "repo": "mineo/yatemplate", "unstable": { "version": [ - 20200108, - 2102 + 20200625, + 1336 ], "deps": [ "yasnippet" ], - "commit": "bfee45cfc179d6b7fbc3ff06c9f79b76dc7fbf58", - "sha256": "0h2fc9vjwb94n3nklq35s3dy9i4ihrqffp2556cmsaq7gzlipb81" + "commit": "23865adaee824db44acec8a4366ce2f29dd2e978", + "sha256": "0ri0kw70yy6mm17drpw5sifscaan3f32fj3xapa0hbz5jxrs9cr9" }, "stable": { "version": [ @@ -103904,12 +106137,31 @@ "sha256": "0cd77m4zyqs74iz56l4h0k7ccxnxhis0247j4f5mf94s51fn1x7p" } }, + { + "ename": "ynab", + "commit": "20a365e48ed200afadae01c096d1ea669e9c1938", + "sha256": "0in7blx21kv01vbwkrmvcl4n07vm4wmxkbv3l78s9xrri66i3nvf", + "fetcher": "github", + "repo": "janders223/ynab.el", + "unstable": { + "version": [ + 20200607, + 2008 + ], + "deps": [ + "cl-lib", + "ts" + ], + "commit": "2c6beb4d2c4996017f6b3c62c26db52a61e5c479", + "sha256": "07bb1hlya07p6s6ymjl3vfv99xln3vrp78h4sda5va52vj1935rs" + } + }, { "ename": "yoficator", - "commit": "5156f01564978718dd99ab3a54f19b6512de5c3c", - "sha256": "0b6lv6wk5ammhb9rws9kig02wkm84i5avm7a1vd4sb7wkgm9nj9r", + "commit": "a3422f4918992343fcace1a3024be59a5d2ed8e5", + "sha256": "0v8hv2bqa9bl6cmfz8l9v72a6z1c2b3i1hjgbj38w9hdjvb2qad6", "fetcher": "gitlab", - "repo": "link2xt/yoficator", + "repo": "alx.k/yoficator", "unstable": { "version": [ 20190509, @@ -103951,8 +106203,8 @@ "repo": "xuchunyang/youdao-dictionary.el", "unstable": { "version": [ - 20200429, - 259 + 20200722, + 1705 ], "deps": [ "chinese-word-at-point", @@ -103960,8 +106212,8 @@ "popup", "pos-tip" ], - "commit": "bd839711e3cf6d3eb9c308cea5694369a440899e", - "sha256": "12r6avj1mxjj46s2p6kwhixhkinkm9krd62sy9ji7v9np2gqf7ll" + "commit": "8a4815a43565b9bfd257246e4895b8bfafb9d573", + "sha256": "0h8hgq76ja3fjrn8vsndkzvns4ar13qsydcrqjsj77jqw9kx9a43" }, "stable": { "version": [ @@ -103978,18 +106230,52 @@ } }, { - "ename": "ytel", - "commit": "ec52f03658dca774daf7301e81edb20aedf03c10", - "sha256": "0adxiw83rah9hln3k8gm6s7ks3xpqfknypjb9j51lxcabc7c1677", - "fetcher": "github", - "repo": "grastello/ytel", + "ename": "ytdl", + "commit": "3531012169cb78d00cdf89fa54a7aff684200083", + "sha256": "0s2ngslz6l4mkib09inv5r4g122jsnyiyh9ijjb27y3pr48cj23d", + "fetcher": "gitlab", + "repo": "tuedachu/ytdl", "unstable": { "version": [ - 20200510, - 1405 + 20200727, + 1824 ], - "commit": "828323f9acb654d8f61ccbca510b471fb00879ee", - "sha256": "1zixqicpdywzdc2pkx9h08y3kphmn9zcx44bj2rqg3h8xsmjayk5" + "deps": [ + "async", + "dash", + "transient" + ], + "commit": "2d617ed1cc0be35158411f897e4156c20ff6565f", + "sha256": "1fhbg0l6xrayqssl1xqjdgymdggpsvig73pwl4k9pjifaria2fbm" + }, + "stable": { + "version": [ + 1, + 3, + 4 + ], + "deps": [ + "async", + "dash", + "transient" + ], + "commit": "2d617ed1cc0be35158411f897e4156c20ff6565f", + "sha256": "1fhbg0l6xrayqssl1xqjdgymdggpsvig73pwl4k9pjifaria2fbm" + } + }, + { + "ename": "ytel", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "0xafyxqps4dp44b4jmm69fa5d24df3fkyim7wa9ddgxkcqfl3mpx", + "fetcher": "github", + "repo": "gRastello/ytel", + "unstable": { + "version": [ + 20200725, + 1056 + ], + "commit": "d80c7964ec66589d5580fc13773e94f1834ab76f", + "sha256": "124pvj39lcv3dfz2m42qyydyab0xk6c5da54ffhrqbg8vri34w9w" } }, { @@ -104078,11 +106364,20 @@ "repo": "zenlang/zen-mode", "unstable": { "version": [ - 20191224, - 706 + 20200609, + 822 ], - "commit": "3d34bce20c1d7d35b99916672ea0dd67a96c7716", - "sha256": "1ykc58imkrhk4ib8mdgs7q7qrjbj84bm0rgfpgqk0dkfy16daj2q" + "commit": "c1b1806358f3cce6c04b30699987d82dc7d42559", + "sha256": "1ikny9lxvg8whcl2x0gmr31fdv93vwf53niqr11cx93bfsvs4a9z" + }, + "stable": { + "version": [ + 0, + 8, + 20200609 + ], + "commit": "c1b1806358f3cce6c04b30699987d82dc7d42559", + "sha256": "1ikny9lxvg8whcl2x0gmr31fdv93vwf53niqr11cx93bfsvs4a9z" } }, { @@ -104093,11 +106388,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20200305, - 737 + 20200701, + 1333 ], - "commit": "7dd796840376342426f60018a6cf209228452f3e", - "sha256": "0zzg95sifg6ybh3ava67z688fycklqragkr3baxlhl2jfnwsps2l" + "commit": "c09dbd9a36bbc0062b90be182f2b4cac64128cee", + "sha256": "0lr73kghsi1f5awhgsbvh4snkbdkkpjn5bwf6s6ypbybmjf6kjxd" }, "stable": { "version": [ @@ -104246,20 +106541,21 @@ }, { "ename": "zetteldeft", - "commit": "c643adaf73e8324092874887636cdf0365c481ee", - "sha256": "1vd70mrwn9cfalmiv97ja79hbdmyl5bm9cqsz5c276gk6v6pzvpc", + "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", + "sha256": "05l2ljip5n9pcpcc1qm4m6ii86xs3dk94an1cigiw5is4qi8rhpl", "fetcher": "github", - "repo": "efls/zetteldeft", + "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20200516, - 1108 + 20200812, + 2159 ], "deps": [ + "ace-window", "deft" ], - "commit": "f3503ec8fde88d733b7bbbd4431e85de396a3fe8", - "sha256": "0843k0i6szjvc7f51q0pm7vmxpfz68911d75m75rg54k1jbynazq" + "commit": "2c4ddbf3e30e2f3ae6e877e08fd824b325fa7a62", + "sha256": "029fh32d2vilxlqs5jl3wc907ykxdkv36jjfzappyghd1qkp0iyi" }, "stable": { "version": [ @@ -104273,6 +106569,38 @@ "sha256": "0y709x03har1sm30vbja3k3vw4p1nfck5zii7cigl4vg0scpcri6" } }, + { + "ename": "zetz-mode", + "commit": "ad2add185cf31a92ca1fcd3a9efcbcdb0aa9e583", + "sha256": "0k30c0f2h96vvb8yacpg710gi64swwslm1gljpzcwxni5kdpqkzm", + "fetcher": "github", + "repo": "damon-kwok/zetz-mode", + "unstable": { + "version": [ + 20200812, + 957 + ], + "deps": [ + "dash", + "hydra" + ], + "commit": "3bd2cdb4f6c6e8400d58fa1001d0513e39ce38bb", + "sha256": "0v1aa0hr607afxd03p44m1abx2c8a5k91i047q7nv8sv0cd65ack" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "dash", + "hydra" + ], + "commit": "03a566b213e52da540818559f1b7bbb8400abb88", + "sha256": "1lv1psprhn2fr5knnapa11dc8dz5zh699s8k3ldkgm6a6adkms7n" + } + }, { "ename": "zig-mode", "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", @@ -104281,11 +106609,11 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20200322, - 131 + 20200713, + 407 ], - "commit": "fc7fde327f45533bb73be643e7bda1eda10394b6", - "sha256": "1ld34xs25bysxw9ialrlm6pnp5qbzx94zbb3594ghc2ggz5ph5d5" + "commit": "d88580913586b8749ed0ac3ae228e825a68f9412", + "sha256": "0r3cn6yxs013080il91x9b6fyx84bx3vzv7vkyr8npc2cz46klxs" } }, { @@ -104310,6 +106638,24 @@ "sha256": "14dmda7ahnflv0db9yzssz7bidz3zsdnxxwnby0y48vcjv94nnl5" } }, + { + "ename": "zimports", + "commit": "c19dd3c0cb18bb429a0aaf834555869b98fda349", + "sha256": "19rhl9v4k0nxy8lsc1imjar2ib0g6slma5crzxjbminjjqnp5c3s", + "fetcher": "github", + "repo": "schmir/zimports.el", + "unstable": { + "version": [ + 20200606, + 1700 + ], + "deps": [ + "projectile" + ], + "commit": "a96e9b993c9aaccf1fd07c8fddfc247c4e07618c", + "sha256": "1bzfdwyc4aybvnh20q7ypghpi3zrhhs0v8488lksjl26j23mhrwk" + } + }, { "ename": "zlc", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", @@ -104506,20 +106852,20 @@ "repo": "cyrus-and/zoom", "unstable": { "version": [ - 20200106, - 1204 + 20200708, + 1105 ], - "commit": "a54324344eca49cfb11626446e1ebe239cba6557", - "sha256": "01ycz8496ywb2d980hxpvlnzxw5012mrj8kh8d97vdclhdbkx0y1" + "commit": "a373e7eed59ad93315e5ae88c816ca70404d2d34", + "sha256": "0dmpin0rlwib659s3g7qp48qmma50amj7zdk281b4j0bl6p3zkyc" }, "stable": { "version": [ 0, 2, - 2 + 3 ], - "commit": "578295532fb1c4ad2a2e95894e65cce02f812b54", - "sha256": "1qcni15mps7w9waail21x0fy2rrd5y8cm4yzi8rs2ar4vqrjbyyp" + "commit": "85694c9baa99bcf247528a6743383a3a1e5323fe", + "sha256": "1xckqfkrx95b2bfdczz90y0b23bghlqkp2k5ml59ai2drb96l17h" } }, { @@ -104574,24 +106920,6 @@ "sha256": "14waf3g7b92k3qd5088w4pn0wcspxjfkbswlzf7nnkjliw1yh0kf" } }, - { - "ename": "zossima", - "commit": "b7566fe6fffc38981ea33582d783c58f3842fe28", - "sha256": "11kmnbqv4s8arindg7cxcdhbvfxsckks332wn7aiyb3bjhcgzwjb", - "fetcher": "github", - "repo": "technomancy/zossima", - "unstable": { - "version": [ - 20121124, - 35 - ], - "deps": [ - "inf-ruby" - ], - "commit": "991676635c374d2a12714dcf48c1ce2d6f97a375", - "sha256": "0fgwxw7r3zfv0b7xi8bx7kxff2r5hdw9gxf16kwq04fnh18nhi39" - } - }, { "ename": "zotelo", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", @@ -104717,11 +107045,11 @@ "repo": "pesterhazy/zprint-mode.el", "unstable": { "version": [ - 20191130, - 1829 + 20200731, + 1238 ], - "commit": "4d0dd23b40155618181d9d1e4c82849e0d73b659", - "sha256": "0im63h7ang7zypzbf45k5pxz11svyyk8pab9d4qg9jsb7bz9v7k0" + "commit": "b9b72b4918156f2f44aa544be9e19ea391937c2a", + "sha256": "1jvk8g8qc83y6pmklk403mikl6q3s6gls60fyw07p8f3kvhgfxzi" } }, { @@ -104796,8 +107124,8 @@ "avy", "cl-lib" ], - "commit": "09613d53e1e6e7c58102fb8812bbef2121d57026", - "sha256": "1rfi7gp5z2lm71qrf9akkn8iiiv297i1mqkvwyv7vlhx5vk21r4s" + "commit": "b0a50b8cb6925c3184405f81be9ef9be9da69f09", + "sha256": "003rg7x1vfv946j1m6yalzsgr88wvm3443pqf9yqwnzl2a3djq0g" }, "stable": { "version": [ From 6f8c4e8279f130a55d013b16076748b4d52f90c1 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 19 Aug 2020 20:14:31 +0200 Subject: [PATCH 284/520] nsis: 3.05 -> 3.06.1 --- pkgs/development/tools/nsis/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index bb29bcfdc0f..33be56c539d 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -1,18 +1,23 @@ -{ stdenv, fetchurl, fetchzip, sconsPackages, zlib }: +{ stdenv +, fetchurl +, fetchzip +, sconsPackages +, zlib +}: stdenv.mkDerivation rec { pname = "nsis"; - version = "3.05"; + version = "3.06.1"; src = fetchurl { url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}-src.tar.bz2"; - sha256 = "1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn"; + sha256 = "1w1z2m982l6j8lw8hy91c3979wbnqglcf4148f9v79vl32znhpcv"; }; srcWinDistributable = fetchzip { url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}.zip"; - sha256 = "0i3pzdilyy5g0r2c92pd2jl92ji9f75vv98mndzq8vw03a34yh3q"; + sha256 = "04qm9jqbcybpwcrjlksggffdyafzwxxcaz9xhjw8w5rb95x7lw5q"; }; postUnpack = '' From 0e0ad1a7a223ea9355e288f7d68f8370f13a4b50 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 10 Jul 2020 18:57:10 +0200 Subject: [PATCH 285/520] snap7: init at 1.4.2 --- pkgs/development/libraries/snap7/default.nix | 38 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/snap7/default.nix diff --git a/pkgs/development/libraries/snap7/default.nix b/pkgs/development/libraries/snap7/default.nix new file mode 100644 index 00000000000..3419c4c6c2a --- /dev/null +++ b/pkgs/development/libraries/snap7/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, fetchFromGitHub, fetchzip, p7zip }: + +stdenv.mkDerivation rec { + pname = "snap7"; + version = "1.4.2"; + + src = fetchzip { + url = "mirror://sourceforge/snap7/${version}/snap7-full-${version}.7z"; + sha256 = "1n5gs8bwb6g9vfllf3x12r5yzqzapmlq1bmc6hl854b8vkg30y8c"; + postFetch = '' + ${p7zip}/bin/7z x $downloadedFile + mkdir $out + cp -r snap7-full-${version}/* $out/ + ''; + }; + + outputs = [ "out" "dev" "doc" ]; + + makefile = "x86_64_linux.mk"; + makeFlags = [ "LibInstall=$(out)/lib" ]; + + preBuild = "cd build/unix"; + preInstall = '' + mkdir -p $out/lib + mkdir -p $dev/include + mkdir -p $doc/share + cp $src/examples/cpp/snap7.h $dev/include + cp -r $src/doc $doc/share/ + ''; + + meta = with lib; { + homepage = "http://snap7.sourceforge.net/"; + description = "Step7 Open Source Ethernet Communication Suite"; + license = licenses.lgpl3; + maintainers = with maintainers; [ freezeboy ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79a8951e8ab..27a947c21c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18817,6 +18817,8 @@ in sierra-gtk-theme = callPackage ../data/themes/sierra { }; + snap7 = callPackage ../development/libraries/snap7 {}; + snowblind = callPackage ../data/themes/snowblind { }; solarc-gtk-theme = callPackage ../data/themes/solarc { }; From c11f75bd73e8264bbca6f4bc969ccc39cd371196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stian=20L=C3=A5gstad?= Date: Wed, 19 Aug 2020 18:49:52 +0200 Subject: [PATCH 286/520] python: wtf-peewee: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/wtf-peewee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wtf-peewee/default.nix b/pkgs/development/python-modules/wtf-peewee/default.nix index dc0e47ff2dc..69db4e50f67 100644 --- a/pkgs/development/python-modules/wtf-peewee/default.nix +++ b/pkgs/development/python-modules/wtf-peewee/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "wtf-peewee"; - version = "3.0.1"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "4ac1b457f3255ee2d72915267884a16e5fb502e1e7bb793f2f1301c926e3599a"; + sha256 = "03qs6np5s9r0nmsryfzll29ajcqk27b18kcbgd9plf80ys3nb6kd"; }; propagatedBuildInputs = [ From 655ace454c5e84d9663260e98a8445bdb45f2307 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 18 Aug 2020 17:52:00 +0300 Subject: [PATCH 287/520] xpybutil: init at 0.0.6 --- .../python-modules/xpybutil/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/xpybutil/default.nix diff --git a/pkgs/development/python-modules/xpybutil/default.nix b/pkgs/development/python-modules/xpybutil/default.nix new file mode 100644 index 00000000000..60c96582ea6 --- /dev/null +++ b/pkgs/development/python-modules/xpybutil/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub, xcffib, pillow }: + +buildPythonPackage rec { + pname = "xpybutil"; + version = "0.0.6"; + + # Pypi only offers a wheel + src = fetchFromGitHub { + owner = "BurntSushi"; + repo = pname; + rev = version; + sha256 = "17gbqq955fcl29aayn8l0x14azc60cxgkvdxblz9q8x3l50w0xpg"; + }; + + # pillow is a dependency in image.py which is not listed in setup.py + propagatedBuildInputs = [ xcffib pillow ]; + + meta = with lib; { + homepage = "https://github.com/BurntSushi/xpybutil"; + description = "An incomplete xcb-util port plus some extras"; + license = licenses.wtfpl; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f0b06313e2..9387872456e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7163,6 +7163,8 @@ in { xcffib = callPackage ../development/python-modules/xcffib {}; + xpybutil = callPackage ../development/python-modules/xpybutil {}; + pafy = callPackage ../development/python-modules/pafy { }; suds = callPackage ../development/python-modules/suds { }; From f7651718b5966be91c4d9a6bbcbd468bd7d17bc8 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 18 Aug 2020 18:03:50 +0300 Subject: [PATCH 288/520] flashfocus: init at 2.2.2 --- pkgs/misc/flashfocus/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/misc/flashfocus/default.nix diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix new file mode 100644 index 00000000000..98f368132a9 --- /dev/null +++ b/pkgs/misc/flashfocus/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonApplication, fetchPypi, xcffib, pyyaml, click, i3ipc, marshmallow, cffi, xpybutil, pytestrunner }: + + +buildPythonApplication rec { + pname = "flashfocus"; + version = "2.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1z20d596rnc7cs0rrd221gjn14dmbr11djv94y9p4v7rr788sswv"; + }; + + nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ i3ipc xcffib click cffi xpybutil marshmallow pyyaml ]; + + # Tests require access to a X session + doCheck = false; + + pythonImportsCheck = [ "flashfocus" ]; + + meta = with lib; { + homepage = "https://github.com/fennerm/flashfocus"; + description = "Simple focus animations for tiling window managers"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3737cc3e636..9351dcd0606 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1924,6 +1924,8 @@ in fuzzel = callPackage ../applications/misc/fuzzel { }; + flashfocus = python3Packages.callPackage ../misc/flashfocus { }; + qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { }; fwup = callPackage ../tools/misc/fwup { }; From 020a2121277f775bfc14c60b2ea3ac98fa5bd6be Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Wed, 19 Aug 2020 22:12:32 +0200 Subject: [PATCH 289/520] utf8proc: switch to cmake --- pkgs/development/libraries/utf8proc/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 13a9855b62e..00c09179f1f 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "utf8proc"; @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq"; }; - makeFlags = [ "prefix=$(out)" ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; meta = with stdenv.lib; { description = "A clean C library for processing UTF-8 Unicode data"; From 9e0b75eaf746e998aae48f58650778b161a88a5d Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Wed, 19 Aug 2020 22:13:48 +0200 Subject: [PATCH 290/520] arrow-cpp: 0.17.1 -> 1.0.0 --- .../libraries/arrow-cpp/default.nix | 62 +++++++++++-------- .../arrow-cpp/jemalloc-disable-shared.patch | 11 ---- 2 files changed, 37 insertions(+), 36 deletions(-) delete mode 100644 pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index a989833249c..2c9bced4192 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,9 +1,16 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames, autoconf, boost -, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4, perl -, python3, rapidjson, snappy, thrift, which, zlib, zstd +{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames +, autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4 +, perl, python3, rapidjson, snappy, thrift, utf8proc, which, zlib, zstd , enableShared ? true }: let + arrow-testing = fetchFromGitHub { + owner = "apache"; + repo = "arrow-testing"; + rev = "f552c4dcd2ae3d14048abd20919748cce5276ade"; + sha256 = "1smaidk5k2q6xdav7qp74ak34vvwv5qyfqw0szi573awsrsrahr8"; + }; + parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; @@ -13,14 +20,13 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "0.17.1"; + version = "1.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "18lyvbibfdw3w77cy5whbq7c6mshn5fg2bhvgw7v226a7cs1rifb"; + sha256 = "0hzjrhr4brqpmy9f8fbj9p5a482ya8kjhkycz6maa0w2nkzbkpc6"; }; - sourceRoot = "apache-arrow-${version}/cpp"; ARROW_JEMALLOC_URL = fetchurl { @@ -32,26 +38,31 @@ in stdenv.mkDerivation rec { sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; }; + ARROW_MIMALLOC_URL = fetchurl { + # From + # ./cpp/cmake_modules/ThirdpartyToolchain.cmake + # ./cpp/thirdparty/versions.txt + url = + "https://github.com/microsoft/mimalloc/archive/v1.6.3.tar.gz"; + sha256 = "0pia8b4acv1w8qzcpc9i1a2fasnn3rmp996k0l87p2di0lbls0w5"; + }; + patches = [ # patch to fix python-test ./darwin.patch - - # fix musl build + # Properly exported static targets. Remove at the next version bump. (fetchpatch { - url = "https://github.com/apache/arrow/commit/de4168786dfd8ab932f48801e0a7a6b8a370c19d.diff"; - sha256 = "1nl4y1rwdl0gn67v7l05ibc4lwkn6x7fhwbmslmm08cqmwfjsx3y"; + url = "https://github.com/apache/arrow/commit/b040600b39a4f803b704934252665f9440dd1276.patch"; + sha256 = "1mvw29ybcsz77zprmsk41blxmrj8ywayg7ghf6xkkf98907ws8m8"; + includes = [ "*.cmake" ]; stripLen = 1; }) - - # fix build for "ZSTD_SOURCE=SYSTEM" (fetchpatch { - url = "https://github.com/apache/arrow/commit/13cb3dbded1928d2e96574895bebaf9098a4796d.diff"; - sha256 = "12z3ys47qp2x8f63lggiyj4xs2kmg804ri4xqysw5krbjz2hr6rb"; + url = "https://github.com/apache/arrow/commit/81d3f2657b17436d6d5a6af9aaf6f36c3f5e4ac9.patch"; + sha256 = "18fmzr5f79hvx2qpyfgvvl98p4zgzfxrmrd1d2basp0w0da1ciqs"; + includes = [ "*CMakeLists.txt" "*.cmake" "*.cmake.in" ]; stripLen = 1; }) - ] ++ lib.optionals (!enableShared) [ - # The shared jemalloc lib is unused and breaks in static mode due to missing -fpic. - ./jemalloc-disable-shared.patch ]; nativeBuildInputs = [ @@ -70,6 +81,7 @@ in stdenv.mkDerivation rec { rapidjson snappy thrift + utf8proc zlib zstd ] ++ lib.optionals enableShared [ @@ -78,15 +90,17 @@ in stdenv.mkDerivation rec { ]; preConfigure = '' - substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - patchShebangs build-support/ ''; cmakeFlags = [ "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON" + "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}" + "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}" "-DARROW_BUILD_TESTS=ON" + "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON" "-DARROW_DEPENDENCY_SOURCE=SYSTEM" + "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}" "-DARROW_PLASMA=ON" # Disable Python for static mode because openblas is currently broken there. "-DARROW_PYTHON=${if enableShared then "ON" else "OFF"}" @@ -94,25 +108,23 @@ in stdenv.mkDerivation rec { "-DARROW_WITH_BROTLI=ON" "-DARROW_WITH_LZ4=ON" "-DARROW_WITH_SNAPPY=ON" + "-DARROW_WITH_UTF8PROC=ON" "-DARROW_WITH_ZLIB=ON" "-DARROW_WITH_ZSTD=ON" - "-DARROW_ZSTD_USE_SHARED=${if enableShared then "ON" else "OFF"}" + "-DARROW_MIMALLOC=ON" # Parquet options: "-DARROW_PARQUET=ON" "-DPARQUET_BUILD_EXECUTABLES=ON" ] ++ lib.optionals (!enableShared) [ - "-DARROW_BUILD_SHARED=OFF" - "-DARROW_BOOST_USE_SHARED=OFF" - "-DARROW_GFLAGS_USE_SHARED=OFF" - "-DARROW_PROTOBUF_USE_SHARED=OFF" "-DARROW_TEST_LINKAGE=static" - "-DOPENSSL_USE_STATIC_LIBS=ON" ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; doInstallCheck = true; + ARROW_TEST_DATA = + if doInstallCheck then "${arrow-testing}/data" else null; PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; installCheckInputs = [ perl which ]; diff --git a/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch b/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch deleted file mode 100644 index 564f6727388..00000000000 --- a/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -1317,6 +1317,7 @@ if(ARROW_JEMALLOC) - "--with-jemalloc-prefix=je_arrow_" - "--with-private-namespace=je_arrow_private_" - "--without-export" -+ "--disable-shared" - # Don't override operator new() - "--disable-cxx" "--disable-libdl" - # See https://github.com/jemalloc/jemalloc/issues/1237 From 8c05e036ea485166c474f39d46e6f4441baeda0e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 16 Jul 2020 19:53:31 +0000 Subject: [PATCH 291/520] gitAndTools.git-remote-hg: use buildPythonApplication This is much cleaner than constructing PYTHONPATH using interpolated subshells. --- .../git-and-tools/git-remote-hg/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 58d9bf80fb3..dd4e6e011a6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchFromGitHub, mercurial, makeWrapper +{ stdenv, lib, fetchFromGitHub, python3Packages , asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2 }: -stdenv.mkDerivation rec { +python3Packages.buildPythonApplication rec { pname = "git-remote-hg"; version = "unstable-2020-06-12"; @@ -13,17 +13,13 @@ stdenv.mkDerivation rec { sha256 = "0dw48vbnk7pp0w6fzgl29mq8fyn52pacbya2w14z9c6jfvh5sha1"; }; - buildInputs = [ mercurial.python mercurial makeWrapper + nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt libxml2 ]; - - doCheck = false; - - installFlags = [ "HOME=\${out}" "install-doc" ]; + propagatedBuildInputs = with python3Packages; [ mercurial ]; postInstall = '' - wrapProgram $out/bin/git-remote-hg \ - --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages or []}" + make install-doc prefix=$out ''; meta = with lib; { From f05df9c4cd47eee288520c6ab64b9a5f2813bf7c Mon Sep 17 00:00:00 2001 From: Konstantinos Lambrou-Latreille Date: Mon, 17 Aug 2020 17:47:44 -0400 Subject: [PATCH 292/520] maintainers: add koslambrou --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2e30bab5679..7d6a902b5f3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4427,6 +4427,12 @@ githubId = 524268; name = "Koral"; }; + koslambrou = { + email = "koslambrou@gmail.com"; + github = "koslambrou"; + githubId = 2037002; + name = "Konstantinos"; + }; kovirobi = { email = "kovirobi@gmail.com"; github = "kovirobi"; From 512825466dcda461205fea364d001eb3b9b6ceb7 Mon Sep 17 00:00:00 2001 From: Konstantinos Lambrou-Latreille Date: Mon, 17 Aug 2020 17:50:57 -0400 Subject: [PATCH 293/520] added rdflib-jsonld python package --- .../python-modules/rdflib-jsonld/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/rdflib-jsonld/default.nix diff --git a/pkgs/development/python-modules/rdflib-jsonld/default.nix b/pkgs/development/python-modules/rdflib-jsonld/default.nix new file mode 100644 index 00000000000..6e038dd3343 --- /dev/null +++ b/pkgs/development/python-modules/rdflib-jsonld/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, fetchPypi, lib, rdflib, nose }: + +buildPythonPackage rec { + pname = "rdflib-jsonld"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "4f7d55326405071c7bce9acf5484643bcb984eadb84a6503053367da207105ed"; + }; + + nativeBuildInputs = [ nose ]; + propagatedBuildInputs = [ rdflib ]; + + meta = with lib; { + homepage = "https://github.com/RDFLib/rdflib-jsonld"; + license = licenses.bsdOriginal; + description = "rdflib extension adding JSON-LD parser and serializer"; + maintainers = [ maintainers.koslambrou ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9387872456e..a6d68a70d50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5952,6 +5952,8 @@ in { rdflib = callPackage ../development/python-modules/rdflib { }; + rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; + isodate = callPackage ../development/python-modules/isodate { }; owslib = callPackage ../development/python-modules/owslib { }; From 371913ed692c88bd7af7b065ff205361ffac5c51 Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Wed, 19 Aug 2020 22:49:58 +0200 Subject: [PATCH 294/520] metals: 0.9.2 -> 0.9.3 --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index e5046d1d1d9..caee8058f0f 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.2"; + version = "0.9.3"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1gnf2p578nk1ygx3cc4mb7fa690c51nbdwvc2qz2805m4xg3x7zv"; + outputHash = "0mr0pxicka4qd0cn002g5r80dyg59164czyb0r7012l0q1xighz2"; }; nativeBuildInputs = [ makeWrapper ]; From 9216b44df25e32f205b2a4f3c386eccaeee2ad65 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 19 Aug 2020 21:10:36 +0000 Subject: [PATCH 295/520] castnow: expose at top level This is an application, so should be at the top level and not exposed only via the language it's implemented in. --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9351dcd0606..b425e35731c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -896,6 +896,8 @@ in calls = callPackage ../applications/networking/calls { }; + inherit (nodePackages) castnow; + certigo = callPackage ../tools/admin/certigo { }; catcli = python3Packages.callPackage ../tools/filesystems/catcli { }; From 0f01fa0d41bf44d893fb8e9c055b6729837f3721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 18 Aug 2020 16:31:30 +0200 Subject: [PATCH 296/520] anydesk: 5.5.6 -> 6.0.0 --- pkgs/applications/networking/remote/anydesk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 3896e06838d..46221ac1478 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -5,8 +5,8 @@ let sha256 = { - x86_64-linux = "1vpfyffg1g7f1m4mxmqghswihml9rm1cipm7krmr5wvxdmcphxnk"; - i386-linux = "0vjxbg5hwkqkh600rr75xviwy848r1xw9mxwf6bb6l8b0isvlsgg"; + x86_64-linux = "19c6blkkqpyjf330v16mdmsh7q6x087p6gw5ag8r2mc6jwq5ixlx"; + i386-linux = "0dwc7v4p1dz51444zwn0kds23yi87r4h2d3isfj9xwkn90pxb7in"; }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); arch = { @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "5.5.6"; + version = "6.0.0"; src = fetchurl { urls = [ From 9e6606aaf306282463217d1dfde75f35ba857fbc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 19 Aug 2020 23:14:54 +0200 Subject: [PATCH 297/520] =?UTF-8?q?libxmlb:=200.1.15=20=E2=86=92=200.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/hughsie/libxmlb/compare/0.1.15...0.2.0 https://github.com/hughsie/libxmlb/commit/b4f60764ec3a03ae666d81d8b61bc8dbbccf2b85 --- pkgs/development/libraries/libxmlb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index f559a4e5050..0b0524e163c 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.1.15"; + version = "0.2.0"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "1mb73pnfwqc4mm0lm16yfn0lj495h8hcciprb2v6wgy3ifnnjxib"; + sha256 = "VBIQo+6WqJUbkBZnG6eihx3eJFFWF68A7RpZ7gPVbEI="; }; patches = [ From 81a37662320dc5e6d22b956ac97b012ba0302291 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 19 Aug 2020 23:19:24 +0200 Subject: [PATCH 298/520] =?UTF-8?q?pulseeffects:=204.7.3=20=E2=86=92=204.8?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/wwmm/pulseeffects/compare/v4.7.3...v4.8.0 --- pkgs/applications/audio/pulseeffects/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 12ab8ce2e06..a3ee0e23ec6 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -30,14 +30,12 @@ , zita-convolver , zam-plugins , rubberband -, mda_lv2 , lsp-plugins }: let lv2Plugins = [ calf # limiter, compressor exciter, bass enhancer and others - mda_lv2 # loudness lsp-plugins # delay ]; ladspaPlugins = [ @@ -46,13 +44,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.7.3"; + version = "4.8.0"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1xsw3v9vapd8q1dxacdgy2wk0xf3adqwbmcqiimdkd34llbdv88f"; + sha256 = "9dQNYWBx8iAifRTZr2FRlYv4keZt5Cfahwi/w01duFg="; }; nativeBuildInputs = [ From c54bdc69ee305d9a5917a31784620843ed71eef4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 19 Aug 2020 23:42:52 +0200 Subject: [PATCH 299/520] =?UTF-8?q?python3.pkgs.dogtail:=200.9.10=20?= =?UTF-8?q?=E2=86=92=200.9.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/dogtail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index 44142ca9441..4981440c7cc 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { pname = "dogtail"; - version = "0.9.10"; + version = "0.9.11"; # https://gitlab.com/dogtail/dogtail/issues/1 # src = fetchPypi { @@ -26,7 +26,7 @@ buildPythonPackage { # }; src = fetchurl { url = "https://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.10.tar.gz"; - sha256 = "14sycidl8ahj3fwlhpwlpnyd43c302yqr7nqg2hj39pyj7kgk15b"; + sha256 = "EGyxYopupfXPYtTL9mm9ujZorvh8AGaNXVKBPWsGy3c="; }; patches = [ @@ -54,7 +54,7 @@ buildPythonPackage { meta = { description = "GUI test tool and automation framework that uses Accessibility technologies to communicate with desktop applications"; homepage = "https://gitlab.com/dogtail/dogtail"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ jtojnar ]; }; } From 4dd782f5ddc03253713875944fe1f4be6a3329be Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 19 Aug 2020 23:43:13 +0200 Subject: [PATCH 300/520] gnome-photos: fix tests reference --- pkgs/applications/graphics/gnome-photos/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 8660f6f218e..337b8f4cba6 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { }; tests = { - installed-tests = nixosTests.gnome-photos; + installed-tests = nixosTests.installed-tests.gnome-photos; }; }; From 6ed22877c02c005ce5fb5619a0632e7551a9d8c9 Mon Sep 17 00:00:00 2001 From: elkowar <5300871+elkowar@users.noreply.github.com> Date: Tue, 18 Aug 2020 22:46:57 +0200 Subject: [PATCH 301/520] fet-sh: init at 1.5 --- pkgs/tools/misc/fet-sh/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/fet-sh/default.nix diff --git a/pkgs/tools/misc/fet-sh/default.nix b/pkgs/tools/misc/fet-sh/default.nix new file mode 100644 index 00000000000..3419a8d2850 --- /dev/null +++ b/pkgs/tools/misc/fet-sh/default.nix @@ -0,0 +1,28 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "fet-sh"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "6gk"; + repo = "fet.sh"; + rev = "v${version}"; + sha256 = "15336cayv3rb79y7f0v0qvn6nhr5aqr8479ayp0r0sihn5mkfg35"; + }; + + dontBuild = true; + + installPhase = '' + install -m755 -D ./fet.sh $out/bin/fet.sh + ''; + + meta = with lib; { + description = "A fetch written in posix shell without any external commands (linux only)"; + homepage = "https://github.com/6gk/fet.sh"; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ elkowar ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d8225fc242..c9dc9a0bd75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -269,6 +269,8 @@ in etBook = callPackage ../data/fonts/et-book { }; + fet-sh = callPackage ../tools/misc/fet-sh { }; + fetchbower = callPackage ../build-support/fetchbower { inherit (nodePackages) bower2nix; }; From 7dec299b89c159853aa88d2ad5572dd640db6798 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 15 Aug 2020 15:43:27 +1000 Subject: [PATCH 302/520] buildGoModule/vend: use upstream instead of fork --- .../networking/mailreaders/aerc/default.nix | 2 +- pkgs/development/tools/vend/default.nix | 32 ++++++++++++------- pkgs/servers/mautrix-whatsapp/default.nix | 2 +- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 8236525ef9c..9a607b54b9c 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { }; runVend = true; - vendorSha256 = "0avdvbhv1jlisiicpi5vshz28a2p2fgnlrag9zngzglcrbhdd1rn"; + vendorSha256 = "13zs5113ip85yl6sw9hzclxwlnrhy18d39vh9cwbq97dgnh9rz89"; doCheck = false; diff --git a/pkgs/development/tools/vend/default.nix b/pkgs/development/tools/vend/default.nix index 7a257110327..ef59ea8dd65 100644 --- a/pkgs/development/tools/vend/default.nix +++ b/pkgs/development/tools/vend/default.nix @@ -1,27 +1,37 @@ { stdenv, buildGoModule, fetchFromGitHub }: -buildGoModule { +buildGoModule rec { pname = "vend"; - version = "unstable-2020-06-04"; - patches = [./remove_tidy.patch]; + /* + This package is used to generate vendor folders for + packages that use the `runVend` option with `buildGoModule`. + + Do not update this package without checking that the vendorSha256 + hashes of packages using the `runVend` option are unchanged + or updating their vendorSha256 hashes if necessary. + */ + version = "1.0.2"; + # Disable the bot + # nixpkgs-update: no auto update + + # Disable `mod tidy`, patch was refused upstream + # https://github.com/nomad-software/vend/pull/9 + patches = [ ./remove_tidy.patch ]; - # A permanent fork from master is maintained to avoid non deterministic go tidy src = fetchFromGitHub { - owner = "c00w"; + owner = "nomad-software"; repo = "vend"; - rev = "24fdebfdb2c3cc0516321a9cf33a3fd81c209c04"; - sha256 = "112p9dz9by2h2m3jha2bv1bvzn2a86bpg1wphgmf9gksjpwy835l"; + rev = "v${version}"; + sha256 = "0h9rwwb56nzs46xsvl92af71i8b3wz3pf9ngi8v0i2bpk7p3p89d"; }; vendorSha256 = null; - doCheck = false; - meta = with stdenv.lib; { - homepage = "https://github.com/c00w/vend"; + homepage = "https://github.com/nomad-software/vend"; description = "A utility which vendors go code including c dependencies"; - maintainers = with maintainers; [ c00w ]; + maintainers = with maintainers; [ c00w mic92 zowoq ]; license = licenses.mit; }; } diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 782491a3023..813d1f18e8b 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { buildInputs = [ olm ]; - vendorSha256 = "05cqwprd1rcciw27wyz7lj1s3zmz2vq093vw1cx3kkjyf6lq8sk6"; + vendorSha256 = "1dmlqhhwmc0k9nbab5j8sl20b8d6b5yrmcdf7ibaiqh7i16zrp3s"; doCheck = false; From 92a2c31d79ebf154a6cc1e213b01a05f85576771 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 19 Jun 2020 18:04:42 +1000 Subject: [PATCH 303/520] buildGoModule: remove modSha256 --- .../go-modules/generic/default.nix | 5 - pkgs/development/go-modules/generic/old.nix | 229 ------------------ 2 files changed, 234 deletions(-) delete mode 100644 pkgs/development/go-modules/generic/old.nix diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index c1550238721..402c3e781ad 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -24,8 +24,6 @@ # This is useful if any dependency contain C files. , runVend ? false -, modSha256 ? null - # We want parallel builds by default , enableParallelBuilding ? true @@ -257,8 +255,5 @@ let }); in if disabled then throw "${package.name} not supported for go ${go.meta.branch}" -else if modSha256 != null then - lib.warn "modSha256 is deprecated and will be removed in the next release (20.09), use vendorSha256 instead" ( - import ./old.nix { inherit go cacert git lib removeReferencesTo stdenv; } args') else package diff --git a/pkgs/development/go-modules/generic/old.nix b/pkgs/development/go-modules/generic/old.nix deleted file mode 100644 index 42b446b9fa8..00000000000 --- a/pkgs/development/go-modules/generic/old.nix +++ /dev/null @@ -1,229 +0,0 @@ -{ go, cacert, git, lib, removeReferencesTo, stdenv }: - -{ name ? "${args'.pname}-${args'.version}" -, src -, buildInputs ? [] -, nativeBuildInputs ? [] -, passthru ? {} -, patches ? [] - -# A function to override the go-modules derivation -, overrideModAttrs ? (_oldAttrs : {}) - -# path to go.mod and go.sum directory -, modRoot ? "./" - -# modSha256 is the sha256 of the vendored dependencies -# -# CAUTION: if `null` is used as a value, the derivation won't be a -# fixed-output derivation but disable the build sandbox instead. Don't use -# this in nixpkgs as Hydra won't build those packages. -, modSha256 - -# We want parallel builds by default -, enableParallelBuilding ? true - -# Disabled flag -, disabled ? false - -# Do not enable this without good reason -# IE: programs coupled with the compiler -, allowGoReference ? false - -, meta ? {} - -, ... }@args': - -with builtins; - -let - args = removeAttrs args' [ "overrideModAttrs" "modSha256" "disabled" ]; - - removeReferences = [ ] ++ lib.optional (!allowGoReference) go; - - removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; - - go-modules = go.stdenv.mkDerivation (let modArgs = { - name = "${name}-go-modules"; - - nativeBuildInputs = [ go git cacert ]; - - inherit (args) src; - inherit (go) GOOS GOARCH; - - patches = args.patches or []; - - GO111MODULE = "on"; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ - "GIT_PROXY_COMMAND" "SOCKS_SERVER" - ]; - - configurePhase = args.modConfigurePhase or '' - runHook preConfigure - - export GOCACHE=$TMPDIR/go-cache - export GOPATH="$TMPDIR/go" - mkdir -p "''${GOPATH}/pkg/mod/cache/download" - cd "${modRoot}" - runHook postConfigure - ''; - - buildPhase = args.modBuildPhase or '' - runHook preBuild - - go mod download - - runHook postBuild - ''; - - installPhase = args.modInstallPhase or '' - runHook preInstall - - # remove cached lookup results and tiles - rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb" - cp -r "''${GOPATH}/pkg/mod/cache/download" $out - - runHook postInstall - ''; - - dontFixup = true; - }; in modArgs // ( - if modSha256 == null then - { __noChroot = true; } - else - { - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = modSha256; - } - ) // overrideModAttrs modArgs); - - package = go.stdenv.mkDerivation (args // { - nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs; - - inherit (go) GOOS GOARCH; - - GO111MODULE = "on"; - - configurePhase = args.configurePhase or '' - runHook preConfigure - - export GOCACHE=$TMPDIR/go-cache - export GOPATH="$TMPDIR/go" - export GOSUMDB=off - export GOPROXY=file://${go-modules} - - cd "$modRoot" - - runHook postConfigure - ''; - - buildPhase = args.buildPhase or '' - runHook preBuild - - buildGoDir() { - local d; local cmd; - cmd="$1" - d="$2" - . $TMPDIR/buildFlagsArray - echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0 - [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 - local OUT - if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v -p $NIX_BUILD_CORES $d 2>&1)"; then - if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then - echo "$OUT" >&2 - return 1 - fi - fi - if [ -n "$OUT" ]; then - echo "$OUT" >&2 - fi - return 0 - } - - getGoDirs() { - local type; - type="$1" - if [ -n "$subPackages" ]; then - echo "$subPackages" | sed "s,\(^\| \),\1./,g" - else - find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique - fi - } - - if (( "''${NIX_DEBUG:-0}" >= 1 )); then - buildFlagsArray+=(-x) - fi - - if [ ''${#buildFlagsArray[@]} -ne 0 ]; then - declare -p buildFlagsArray > $TMPDIR/buildFlagsArray - else - touch $TMPDIR/buildFlagsArray - fi - if [ -z "$enableParallelBuilding" ]; then - export NIX_BUILD_CORES=1 - fi - for pkg in $(getGoDirs ""); do - echo "Building subPackage $pkg" - buildGoDir install "$pkg" - done - '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - # normalize cross-compiled builds w.r.t. native builds - ( - dir=$GOPATH/bin/${go.GOOS}_${go.GOARCH} - if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then - mv $dir/* $dir/.. - fi - if [[ -d $dir ]]; then - rmdir $dir - fi - ) - '' + '' - runHook postBuild - ''; - - doCheck = args.doCheck or false; - checkPhase = args.checkPhase or '' - runHook preCheck - - for pkg in $(getGoDirs test); do - buildGoDir test "$pkg" - done - - runHook postCheck - ''; - - installPhase = args.installPhase or '' - runHook preInstall - - mkdir -p $out - dir="$GOPATH/bin" - [ -e "$dir" ] && cp -r $dir $out - - runHook postInstall - ''; - - preFixup = (args.preFixup or "") + '' - find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true - ''; - - strictDeps = true; - - disallowedReferences = lib.optional (!allowGoReference) go; - - passthru = passthru // { inherit go go-modules modSha256; }; - - meta = { - # Add default meta information - platforms = go.meta.platforms or lib.platforms.all; - } // meta // { - # add an extra maintainer to every package - maintainers = (meta.maintainers or []) ++ - [ lib.maintainers.kalbasit ]; - }; - }); -in if disabled then - throw "${package.name} not supported for go ${go.meta.branch}" -else - package From 259dcd17fff3186f0e3d579d51e07afe40f02ea6 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 19 Aug 2020 07:37:33 +1000 Subject: [PATCH 304/520] rl-2009: remove modSha256 warning note --- nixos/doc/manual/release-notes/rl-2009.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 7a06c06fed1..58f8e3cb8f2 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -202,9 +202,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; likekly to break with future versions of go. As a result buildGoModule switched from modSha256 to the vendorSha256 - attribute to pin fetched version data. buildGoModule - still accepts modSha256 with a warning, but support will - be removed in the next release. + attribute to pin fetched version data. From 4f7cc3bf2ae91f05f924b76281b0d3597edbcb4c Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 19 Aug 2020 13:50:21 +0200 Subject: [PATCH 305/520] nvidia_x11: 450.57 -> 450.66 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index deecc4c4a7b..df71a953fee 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "450.57"; - sha256_64bit = "04fp0p5f11hrgjzhvbvxpmvl08d3m16m4r5gn9d5qans9zy7f36m"; - settingsSha256 = "1clbj9a3kv3j8jg35c197gd7b3f9f9f4h9ll5hlax95hdg12lgan"; - persistencedSha256 = "17747z1fsbiznfsmahxmz8kmhwwcjanpfih60v5mwzk63gy4i3d5"; + version = "450.66"; + sha256_64bit = "1a6va0gvbzpkyza693v2ml1is4xbv8wxasqk0zd5y7rxin94c1ms"; + settingsSha256 = "0mkgs91gx7xb7f24xkq9fl7i8d4l7s0wr9a44b1gm1vkw82fm7lj"; + persistencedSha256 = "02id8cg8fba7c1j4m6vj4gp2mv39lz2k557kdjw8lszcpw6f1fhh"; } else legacy_390; From d3ae8e194e3f0ba454c3d027e9fbfa20a4d58d84 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 20 Aug 2020 10:05:23 +1000 Subject: [PATCH 306/520] elmPackages.elm-json: remove verifyCargoDeps --- pkgs/development/compilers/elm/packages/elm-json.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/elm/packages/elm-json.nix b/pkgs/development/compilers/elm/packages/elm-json.nix index 299e887ecff..44d300d254b 100644 --- a/pkgs/development/compilers/elm/packages/elm-json.nix +++ b/pkgs/development/compilers/elm/packages/elm-json.nix @@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; cargoSha256 = "0ylniriq073kpiykamkn9mxdaa6kyiza4pvf7gnfq2h1dvbqa6z7"; - verifyCargoDeps = true; # Tests perform networking and therefore can't work in sandbox doCheck = false; From 76db685f594b302187d98c9ab061f4226ece9594 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Wed, 19 Aug 2020 18:16:56 +0300 Subject: [PATCH 307/520] maintainers: add kalekseev --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7d6a902b5f3..0acf720c4eb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4190,6 +4190,12 @@ githubId = 87115; name = "Wael Nasreddine"; }; + kalekseev = { + email = "mail@kalekseev.com"; + github = "kalekseev"; + githubId = 367259; + name = "Konstantin Alekseev"; + }; kamadorueda = { name = "Kevin Amado"; email = "kamadorueda@gmail.com"; From 21ec91713d3efa5874a225ceafc8099d91eeeb28 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Wed, 19 Aug 2020 18:17:35 +0300 Subject: [PATCH 308/520] chamber: init at 2.8.2 --- pkgs/tools/admin/chamber/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/admin/chamber/default.nix diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix new file mode 100644 index 00000000000..fb21bda4150 --- /dev/null +++ b/pkgs/tools/admin/chamber/default.nix @@ -0,0 +1,28 @@ +{ buildGoModule, lib, fetchFromGitHub }: +buildGoModule rec { + pname = "chamber"; + version = "2.8.2"; + + src = fetchFromGitHub { + owner = "segmentio"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7L9RaE4LvHRR6MUimze5QpbnfasWJdY4arfS/Usy2q0="; + }; + + vendorSha256 = null; + + # set the version. see: chamber's Makefile + buildFlagsArray = '' + -ldflags= + -X main.Version=v${version} + ''; + + meta = with lib; { + description = + "Chamber is a tool for managing secrets by storing them in AWS SSM Parameter Store."; + homepage = "https://github.com/segmentio/chamber"; + license = licenses.mit; + maintainers = with maintainers; [ kalekseev ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e86137bfbc..03ea1769bfb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -826,6 +826,8 @@ in boxes = callPackage ../tools/text/boxes { }; + chamber = callPackage ../tools/admin/chamber { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; From 9b3ec74363ddf280f958c62d17c3a5813320b4b6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Aug 2020 02:30:25 +0200 Subject: [PATCH 309/520] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-13-g52041eb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/be35abc30633a4e3cbed7390cd0e19aa60b44eeb. --- .../haskell-modules/hackage-packages.nix | 209 +++++++++++++----- 1 file changed, 151 insertions(+), 58 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 494a8e27270..637f85e2127 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -29128,6 +29128,27 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "amqp-utils_0_4_4_1" = callPackage + ({ mkDerivation, amqp, base, bytestring, connection, containers + , data-default-class, directory, hinotify, magic, network, process + , text, time, tls, unix, utf8-string, x509-system + }: + mkDerivation { + pname = "amqp-utils"; + version = "0.4.4.1"; + sha256 = "1vs0p7pc6z9mfjd2vns66wnhl8v1n9rbgabyjw0v832m2pwizzmj"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + amqp base bytestring connection containers data-default-class + directory hinotify magic network process text time tls unix + utf8-string x509-system + ]; + description = "AMQP toolset for the command line"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "amqp-worker" = callPackage ({ mkDerivation, aeson, amqp, base, bytestring, data-default , exceptions, monad-control, monad-loops, mtl, resource-pool @@ -74592,8 +74613,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.7.0"; - sha256 = "1hb2qfljj0xq427657ml8qasg99fhwh0zfsrmryqpaq5ch8aqn20"; + version = "1.8.0"; + sha256 = "1zh4xf5a8ppfhcnkhai4mi0a7aj7m8qp8hcnyfi6s3nc86k7wj2w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83505,6 +83526,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "essence-of-live-coding-warp" = callPackage + ({ mkDerivation, base, essence-of-live-coding, http-client + , http-types, wai, warp + }: + mkDerivation { + pname = "essence-of-live-coding-warp"; + version = "0.2.1"; + sha256 = "12vcfif5iazdf13vgpnf5rlhni62iv9dmpnl25bb5l80lmjffwls"; + libraryHaskellDepends = [ + base essence-of-live-coding http-types wai warp + ]; + testHaskellDepends = [ base essence-of-live-coding http-client ]; + description = "General purpose live coding framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "estimator" = callPackage ({ mkDerivation, ad, base, distributive, lens, linear, reflection }: @@ -102173,8 +102210,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.3.4"; - sha256 = "04gzafg85fivaslsdi019f4blwrjpda01caly4dd8y7nmmc8xy0y"; + version = "1.3.5"; + sha256 = "0z2sb9avhkq2mgj0pwlji5c2sjxd71628q1i3nhlbajfyms1bsqz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120820,8 +120857,6 @@ self: { testHaskellDepends = [ base data-default HUnit ieee754 mtl ]; description = "Easily convert between latitude/longitude, UTM and OSGB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hcron" = callPackage @@ -123207,52 +123242,52 @@ self: { "hevm" = callPackage ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base - , base16-bytestring, base64-bytestring, binary, brick, bytestring - , cereal, containers, cryptonite, data-dword, deepseq, directory - , fgl, filepath, ghci-pretty, haskeline, here, HUnit, lens - , lens-aeson, megaparsec, memory, monad-par, mtl, multiset - , operational, optparse-generic, process, QuickCheck - , quickcheck-text, readline, regex-tdfa, restless-git, rosezipper - , s-cargot, scientific, secp256k1, tasty, tasty-hunit - , tasty-quickcheck, temporary, text, text-format, time - , transformers, tree-view, unordered-containers, vector, vty, wreq + , base16-bytestring, binary, brick, bytestring, cborg, cereal + , containers, cryptonite, data-dword, deepseq, directory, ff, fgl + , filepath, free, haskeline, here, HUnit, lens, lens-aeson + , megaparsec, memory, monad-par, mtl, multiset, operational + , optparse-generic, process, QuickCheck, quickcheck-text + , regex-tdfa, restless-git, rosezipper, s-cargot, sbv, scientific + , secp256k1, semver-range, tasty, tasty-hunit, tasty-quickcheck + , temporary, text, text-format, time, transformers, tree-view + , unordered-containers, vector, vty, witherable, wreq }: mkDerivation { pname = "hevm"; - version = "0.24"; - sha256 = "0bzhswisrmlw8ajl6mr13vr3a7l0vywl394aihrc0xs6vwgyflh0"; + version = "0.41.0"; + sha256 = "13qf0bh47dppqbxv1g07411c1lfmfxl0pm2s3xkwdf7kr219l0hw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - abstract-par aeson ansi-wl-pprint base base16-bytestring - base64-bytestring binary brick bytestring cereal containers - cryptonite data-dword deepseq directory fgl filepath ghci-pretty - haskeline lens lens-aeson megaparsec memory monad-par mtl multiset - operational optparse-generic process QuickCheck quickcheck-text - readline restless-git rosezipper s-cargot scientific temporary text - text-format time transformers tree-view unordered-containers vector - vty wreq + abstract-par aeson ansi-wl-pprint base base16-bytestring binary + brick bytestring cborg cereal containers cryptonite data-dword + deepseq directory fgl filepath free haskeline lens lens-aeson + megaparsec memory monad-par mtl multiset operational + optparse-generic process QuickCheck quickcheck-text regex-tdfa + restless-git rosezipper s-cargot sbv scientific semver-range + temporary text text-format time transformers tree-view + unordered-containers vector vty witherable wreq ]; - librarySystemDepends = [ secp256k1 ]; + librarySystemDepends = [ ff secp256k1 ]; executableHaskellDepends = [ - aeson ansi-wl-pprint async base base16-bytestring base64-bytestring - binary brick bytestring containers cryptonite data-dword deepseq - directory filepath ghci-pretty lens lens-aeson memory mtl - optparse-generic process QuickCheck quickcheck-text readline - regex-tdfa temporary text text-format unordered-containers vector - vty + aeson ansi-wl-pprint async base base16-bytestring binary brick + bytestring containers cryptonite data-dword deepseq directory + filepath free lens lens-aeson memory mtl operational + optparse-generic process QuickCheck quickcheck-text regex-tdfa sbv + temporary text text-format unordered-containers vector vty ]; testHaskellDepends = [ - base base16-bytestring binary bytestring ghci-pretty here HUnit - lens mtl QuickCheck tasty tasty-hunit tasty-quickcheck text vector + base base16-bytestring binary bytestring containers free here HUnit + lens mtl QuickCheck sbv tasty tasty-hunit tasty-quickcheck text + vector ]; testSystemDepends = [ secp256k1 ]; description = "Ethereum virtual machine evaluator"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) secp256k1;}; + }) {ff = null; inherit (pkgs) secp256k1;}; "hevolisa" = callPackage ({ mkDerivation, base, bytestring, cairo, filepath, haskell98 }: @@ -147110,15 +147145,15 @@ self: { }) {}; "ixset-typed-conversions" = callPackage - ({ mkDerivation, base, exceptions, hashable, ixset-typed + ({ mkDerivation, base, exceptions, free, hashable, ixset-typed , unordered-containers, zipper-extra }: mkDerivation { pname = "ixset-typed-conversions"; - version = "0.1.0.1"; - sha256 = "09fl92lkalbzq23742wjiw4568607cdbxy3a8qgkm2hn8r7djhwi"; + version = "0.1.1.0"; + sha256 = "13nwxwxgsw7kj9kig643c48fadm6y9fjr0rsaggplqy903l4w5ks"; libraryHaskellDepends = [ - base exceptions hashable ixset-typed unordered-containers + base exceptions free hashable ixset-typed unordered-containers zipper-extra ]; description = "Conversions from ixset-typed to other containers"; @@ -149747,8 +149782,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.9"; - sha256 = "02i1d3jfisxiyq63z9z7jlyscywbskmsxkx2xxv7v742xi4w5wrb"; + version = "0.1.0.10"; + sha256 = "17ps1kkbjvlvyjzbqagwikw960nn8q4dzjvng0waknr2gaa125bj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153987,8 +154022,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.1.0.3"; - sha256 = "1dfm89zrmq2ibyhjn4hbzq6yfm5acc63s47w7bp1asn6lxnd9dc0"; + version = "1.3.0.0"; + sha256 = "0pi983l9s182c4xcqj7xq3idv8wnshx7zva5a5wfhws403y5yy7v"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -166809,8 +166844,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.10.0"; - sha256 = "0wj1bsqmlzb7q92h3hj5gwgwknwqh5p487mgbcd82rgflp4sq5rx"; + version = "50200.10.1"; + sha256 = "0m4vqxxcqvbgm6flfwqy2w47ada3r29r34yw1gyv02na7gx3rqi1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -167197,17 +167232,17 @@ self: { }) {}; "mcmc" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , criterion, data-default, directory, double-conversion, hspec - , hspec-discover, log-domain, microlens, mwc-random, QuickCheck - , statistics, time, transformers, vector, zlib + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , data-default, directory, double-conversion, hspec, hspec-discover + , log-domain, microlens, mwc-random, QuickCheck, statistics, time + , transformers, vector, zlib }: mkDerivation { pname = "mcmc"; - version = "0.2.2"; - sha256 = "14gwarivvrkpf3rqlblas8fgxq5amz4vjqfw714qfml3gkljsr82"; + version = "0.2.3"; + sha256 = "14xf8l3ka7s34sa4rs4xsy7h5jxpl3fhsn959dvf17nsv252s6p8"; libraryHaskellDepends = [ - aeson async base bytestring containers data-default directory + aeson base bytestring containers data-default directory double-conversion log-domain microlens mwc-random statistics time transformers vector zlib ]; @@ -169806,6 +169841,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mime-mail-ses_0_4_2" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , byteable, bytestring, case-insensitive, conduit, cryptohash + , http-client, http-client-tls, http-conduit, http-types, mime-mail + , optparse-applicative, tasty, tasty-hunit, text, time, xml-conduit + , xml-types + }: + mkDerivation { + pname = "mime-mail-ses"; + version = "0.4.2"; + sha256 = "1jiv1h9b8396nf8iqf9x11idfcrppank3gqcn6l5877893fzd9hk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring byteable bytestring + case-insensitive conduit cryptohash http-client http-client-tls + http-conduit http-types mime-mail text time xml-conduit xml-types + ]; + executableHaskellDepends = [ + base http-client http-client-tls mime-mail optparse-applicative + text + ]; + testHaskellDepends = [ + base bytestring case-insensitive tasty tasty-hunit time + ]; + description = "Send mime-mail messages via Amazon SES"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mime-string" = callPackage ({ mkDerivation, base, base64-string, bytestring, iconv, mtl , network, old-locale, old-time, random @@ -179582,8 +179647,8 @@ self: { pname = "netrc"; version = "0.2.0.0"; sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls"; - revision = "6"; - editedCabalFile = "0mn0ar2xhjdsm50kmpw5ndvbyfmc30b3x0bx291d2ml7hqspnnsw"; + revision = "7"; + editedCabalFile = "0cmkwkqxzbhrzzwypvmamwcr5ndyk1qc5pjy1rnc50xx7wznw7hf"; libraryHaskellDepends = [ base bytestring deepseq parsec ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-quickcheck @@ -204387,8 +204452,8 @@ self: { }: mkDerivation { pname = "proto-lens-jsonpb"; - version = "0.2.0.0"; - sha256 = "01m88qfi5lak15n14zlxb5yjyi67h5m47czkzirhi0a615v8bwbr"; + version = "0.2.0.1"; + sha256 = "0hsjn0iy0bbpb1sczk6vj2vah5f60w8cpm2gach5zlb9qpvkg4x4"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring proto-lens-runtime text vector @@ -234008,8 +234073,6 @@ self: { ]; description = "Scaffolding CLI for the Snap Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "snap-testing" = callPackage @@ -277151,6 +277214,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yaml_0_11_5_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, mtl, raw-strings-qq, resourcet, scientific + , template-haskell, temporary, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.11.5.0"; + sha256 = "1bfdsqckzql50j6ni4fa1470cvkmfiy4skb98cdwnj4rss5p93mj"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + filepath libyaml mtl resourcet scientific template-haskell text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat bytestring conduit containers + directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq + resourcet scientific template-haskell temporary text transformers + unordered-containers vector + ]; + description = "Support for parsing and rendering YAML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop , scientific, tasty, tasty-hunit, text, transformers From d1c2a9ed976166a81bd7362d3ec1fb5a96f1f4c0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 18 Aug 2020 20:57:51 -0500 Subject: [PATCH 310/520] lzfse: use cmake build system this builds .so correctly --- pkgs/tools/compression/lzfse/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix index 0a335b3602f..bd97620dba6 100644 --- a/pkgs/tools/compression/lzfse/default.nix +++ b/pkgs/tools/compression/lzfse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "lzfse"; @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1mfh6y6vpvxsdwmqmfbkqkwvxc0pz2dqqc72c6fk9sbsrxxaghd5"; }; - makeFlags = [ "INSTALL_PREFIX=$(out)" ]; - - enableParallelBuilding = false; #bug + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { homepage = "https://github.com/lzfse/lzfse"; From 4694b671b1aa47d4ee38556b56e6f71452065bb0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 19 Aug 2020 19:35:14 -0500 Subject: [PATCH 311/520] undmg: 1.0.5 -> 1.1.0 --- pkgs/tools/archivers/undmg/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix index 3641893cf74..0eaabdb627d 100644 --- a/pkgs/tools/archivers/undmg/default.nix +++ b/pkgs/tools/archivers/undmg/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, zlib, bzip2 }: +{ stdenv, fetchFromGitHub, zlib, bzip2, lzfse, pkg-config }: stdenv.mkDerivation rec { - version = "1.0.5"; + version = "1.1.0"; pname = "undmg"; src = fetchFromGitHub { owner = "matthewbauer"; repo = "undmg"; rev = "v${version}"; - sha256 = "0yz5fniaa5z33d8bdzgr263957r1c9l99237y2p8k0hdid207la1"; + sha256 = "0rb4h89jrl04vwf6p679ipa4mp95hzmc1ca11wqbanv3xd1kcpxm"; }; - buildInputs = [ zlib bzip2 ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ zlib bzip2 lzfse ]; setupHook = ./setup-hook.sh; From e57df5816dc2f3d3f179ceb187305ad344f39458 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 19 Aug 2020 19:35:29 -0500 Subject: [PATCH 312/520] undmg: use file name instead of pipe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There’s some issue in really big files with pipes that doesn’t occur in filename decompression. --- pkgs/tools/archivers/undmg/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/undmg/setup-hook.sh b/pkgs/tools/archivers/undmg/setup-hook.sh index e5c8dda23b6..bc7ed76107e 100644 --- a/pkgs/tools/archivers/undmg/setup-hook.sh +++ b/pkgs/tools/archivers/undmg/setup-hook.sh @@ -1,5 +1,5 @@ unpackCmdHooks+=(_tryUnpackDmg) _tryUnpackDmg() { if ! [[ "$curSrc" =~ \.dmg$ ]]; then return 1; fi - undmg < "$curSrc" + undmg "$curSrc" } From e7177adafcda5722ce8a7b0bbff80269a1957b90 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 20 Aug 2020 14:24:38 +0900 Subject: [PATCH 313/520] cargo-update: 3.0.0 -> 4.1.1 --- ...te-lockfile-for-cargo-update-v4.1.1.patch} | 132 +++++++++--------- .../cargo-update/default.nix | 10 +- 2 files changed, 69 insertions(+), 73 deletions(-) rename pkgs/tools/package-management/cargo-update/{0001-Generate-lockfile-for-cargo-update-v3.0.0.patch => 0001-Generate-lockfile-for-cargo-update-v4.1.1.patch} (83%) diff --git a/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch b/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.1.patch similarity index 83% rename from pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch rename to pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.1.patch index 40cd310b643..9aa7d8b1cc9 100644 --- a/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch +++ b/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.1.patch @@ -1,26 +1,16 @@ -From 893ee8e76cc8b4096c84fe3a537e312304ce214b Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Wed, 11 Mar 2020 22:32:47 +0100 -Subject: [PATCH] Generate lockfile for cargo-update v3.0.0 - ---- - Cargo.lock | 632 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 632 insertions(+) - create mode 100644 Cargo.lock - diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 000000000..0b3a75632 +index 000000000..8d77f4824 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,632 @@ +@@ -0,0 +1,641 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "aho-corasick" -+version = "0.7.10" ++version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" ++checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +dependencies = [ + "memchr", +] @@ -94,7 +84,7 @@ index 000000000..0b3a75632 + +[[package]] +name = "cargo-update" -+version = "3.0.0" ++version = "4.1.1" +dependencies = [ + "array_tool", + "clap", @@ -117,9 +107,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "cc" -+version = "1.0.50" ++version = "1.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" +dependencies = [ + "jobserver", +] @@ -132,9 +122,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "clap" -+version = "2.33.0" ++version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "ansi_term", + "atty", @@ -174,11 +164,10 @@ index 000000000..0b3a75632 + +[[package]] +name = "dirs-sys" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" ++checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" +dependencies = [ -+ "cfg-if", + "libc", + "redox_users", + "winapi", @@ -186,9 +175,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "embed-resource" -+version = "1.3.2" ++version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8398b939acbb266ade6939090e9f634147e7b426a33054a833d9ec935d814882" ++checksum = "1f6b0b4403da80c2fd32333937dd468292c001d778c587ae759b75432772715d" +dependencies = [ + "vswhom", + "winreg", @@ -222,9 +211,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "hermit-abi" -+version = "0.1.8" ++version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8" ++checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +dependencies = [ + "libc", +] @@ -275,9 +264,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "libc" -+version = "0.2.67" ++version = "0.2.75" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018" ++checksum = "55821a41348652c211bf26f6453cb9397af531fc358a33752c864a4f5bccc20e" + +[[package]] +name = "libgit2-sys" @@ -295,9 +284,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "libssh2-sys" -+version = "0.2.16" ++version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7bb70f29dc7c31d32c97577f13f41221af981b31248083e347b7f2c39225a6bc" ++checksum = "ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056" +dependencies = [ + "cc", + "libc", @@ -309,9 +298,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "libz-sys" -+version = "1.0.25" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" ++checksum = "af67924b8dd885cccea261866c8ce5b74d239d272e154053ff927dae839f5ae9" +dependencies = [ + "cc", + "libc", @@ -321,9 +310,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "log" -+version = "0.4.8" ++version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +dependencies = [ + "cfg-if", +] @@ -353,14 +342,24 @@ index 000000000..0b3a75632 +checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + +[[package]] -+name = "openssl-sys" -+version = "0.9.54" ++name = "openssl-src" ++version = "111.10.2+1.1.1g" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986" ++checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.58" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +dependencies = [ + "autocfg", + "cc", + "libc", ++ "openssl-src", + "pkg-config", + "vcpkg", +] @@ -373,33 +372,33 @@ index 000000000..0b3a75632 + +[[package]] +name = "pkg-config" -+version = "0.3.17" ++version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" ++checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" + +[[package]] +name = "proc-macro2" -+version = "1.0.9" ++version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435" ++checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" -+version = "1.0.3" ++version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" ++checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" -+version = "0.1.56" ++version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + +[[package]] +name = "redox_users" @@ -414,9 +413,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "regex" -+version = "1.3.4" ++version = "1.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" ++checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +dependencies = [ + "aho-corasick", + "memchr", @@ -426,9 +425,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "regex-syntax" -+version = "0.6.16" ++version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1" ++checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" + +[[package]] +name = "rust-argon2" @@ -460,15 +459,15 @@ index 000000000..0b3a75632 + +[[package]] +name = "serde" -+version = "1.0.104" ++version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" ++checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" + +[[package]] +name = "serde_derive" -+version = "1.0.104" ++version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" ++checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48" +dependencies = [ + "proc-macro2", + "quote", @@ -492,9 +491,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "syn" -+version = "1.0.16" ++version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859" ++checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4" +dependencies = [ + "proc-macro2", + "quote", @@ -557,15 +556,15 @@ index 000000000..0b3a75632 + +[[package]] +name = "unicode-width" -+version = "0.1.7" ++version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" -+version = "0.2.0" ++version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "url" @@ -580,15 +579,15 @@ index 000000000..0b3a75632 + +[[package]] +name = "vcpkg" -+version = "0.2.8" ++version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" ++checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" + +[[package]] +name = "vec_map" -+version = "0.8.1" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "vswhom" @@ -618,9 +617,9 @@ index 000000000..0b3a75632 + +[[package]] +name = "winapi" -+version = "0.3.8" ++version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", @@ -646,6 +645,3 @@ index 000000000..0b3a75632 +dependencies = [ + "winapi", +] --- -2.25.0 - diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index b9f586ccc6a..d85a03fe49c 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "3.0.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "nabijaczleweli"; repo = pname; rev = "v${version}"; - sha256 = "1jyfv8aa0gp67pvv8l2vkqq4j9rgjl4rq1wn4nqxb44gmvkg15l3"; + sha256 = "03yfn6jq33mykk2cicx54cpddilp62pb5ah75n96k1mwy7c46r6g"; }; - cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v3.0.0.patch ]; - cargoSha256 = "034v1ql5k3n3rgi3aqszkybvv3vc80v263c9nlwxcwbswsh9jpp1"; + cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v4.1.1.patch ]; + cargoSha256 = "1yaawp015gdnlfqkdmqsf95gszz0h5j1vpfjh763y7kk0bp7zswl"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libgit2 libssh2 openssl zlib ] @@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec { description = "A cargo subcommand for checking and applying updates to installed executables"; homepage = "https://github.com/nabijaczleweli/cargo-update"; license = licenses.mit; - maintainers = with maintainers; [ gerschtli filalex77 ]; + maintainers = with maintainers; [ gerschtli filalex77 johntitor ]; }; } From d82d3209de318df6c91bf17b0b846bfd0c47dffd Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 20 Aug 2020 14:38:44 +0900 Subject: [PATCH 314/520] cargo-release: 0.13.3 -> 0.13.5 --- pkgs/tools/package-management/cargo-release/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 66c5b29f6ac..b68a8208de1 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.13.3"; + version = "0.13.5"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "0d9fgmy87xjl9kcmx9crmmg83iyybisg0gfwmnlxz5529slqng5r"; + sha256 = "098p6yfq8nlfckr61j3pkimwzrg5xb2i34nxvk2hiv1njl1vrqng"; }; - cargoSha256 = "1a6ac4x51i1rg0bgrxbbdd54gmwldsiv7nn8vi81y20llnshgjk7"; + cargoSha256 = "07rmp4j4jpzd1rz59wsjmzmj2qkc2x4wrs9pafqrym58ypm8i4gx"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] From f839441f09679ecf255a6b09539586987f9bb1ff Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 13 Aug 2020 07:28:04 +0200 Subject: [PATCH 315/520] =?UTF-8?q?coqPackages.coqhammer:=201.2=20?= =?UTF-8?q?=E2=86=92=201.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/coqhammer/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 16813ac4f11..56fce9ac526 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -13,12 +13,16 @@ let buildInputs = [ coq.ocamlPackages.camlp5 ]; }; "8.10" = { - version = "1.2"; - sha256 = "1ir313mmkgp2c65wgw8c681a15clvri1wb1hyjqmj7ymx4shkl56"; + version = "1.3"; + sha256 = "1fj8497ir4m79hyrmmmmrag01001wrby0h24wv6525vz0w5py3cd"; }; "8.11" = { - version = "1.2"; - sha256 = "1w317h7r5llyamzn1kqb8j6p5sxks2j8vq8wnpzrx01jqbyibxgy"; + version = "1.3"; + sha256 = "08zf8qfna7b9p2myfaz4g7bas3a1q1156x78n5isqivlnqfrjc1b"; + }; + "8.12" = { + version = "1.3"; + sha256 = "1q1y3cwhd98pkm98g71fsdjz85bfwgcz2xn7s7wwmiraifv5l6z8"; }; }; param = params.${coq.coq-version}; From 769519073111c977dbbd3c4d39f887908c098b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 20 Aug 2020 08:41:44 +0200 Subject: [PATCH 316/520] cargo-update: install man pages --- .../cargo-update/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index d85a03fe49c..62f73565b94 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -2,11 +2,13 @@ , rustPlatform , fetchFromGitHub , cmake +, pkg-config +, installShellFiles +, ronn , curl , libgit2 , libssh2 , openssl -, pkg-config , Security , zlib }: @@ -25,10 +27,22 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v4.1.1.patch ]; cargoSha256 = "1yaawp015gdnlfqkdmqsf95gszz0h5j1vpfjh763y7kk0bp7zswl"; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ]; + buildInputs = [ libgit2 libssh2 openssl zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ]; + postBuild = '' + # Man pages contain non-ASCII, so explicitly set encoding to UTF-8. + HOME=$TMPDIR \ + RUBYOPT="-E utf-8:utf-8" \ + ronn -r --organization="cargo-update developers" man/*.md + ''; + + postInstall = '' + installManPage man/*.1 + ''; + meta = with stdenv.lib; { description = "A cargo subcommand for checking and applying updates to installed executables"; homepage = "https://github.com/nabijaczleweli/cargo-update"; From 003fa57c6484a63af1e72470fa2b101f4de7a79e Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 20 Aug 2020 10:00:54 +0200 Subject: [PATCH 317/520] grafana: 7.0.4 -> 7.1.3, enable checkPhase --- pkgs/servers/monitoring/grafana/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 4f0122c4fca..1f4d91c9c87 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "grafana"; - version = "7.0.4"; + version = "7.1.3"; excludedPackages = [ "release_publisher" ]; @@ -10,17 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "16vdbxq9vhv71jjk689xx0nn3qr4s5ybzbp41dm09pppvxzibpg7"; + sha256 = "1acvvqsgwfrkqmbgzdxfa8shwmx7c91agaqv3gsfgpqkqwp3pnmh"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1362rwmpv1y32w5m1fd9vqffs32244f0h7d5jm5cigiq2l7ix7n2"; + sha256 = "0c72xmazr3rgiccrqcy02w30159vsq9d78dkqf5c2yjqn8zzwf98"; }; - vendorSha256 = "00xvpxhnvxdf030978paywl794mlmgqzd94b64hh67946acnbjcl"; - - doCheck = false; + vendorSha256 = "11zi7a4mqi80m5z4zcrc6wnzhgk6xnmzisrk2v4vpmfp33s732lz"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ @@ -33,6 +31,8 @@ buildGoModule rec { mv grafana-*/{public,conf,tools} $out/share/grafana/ ''; + passthru.tests = { inherit (nixosTests) grafana; }; + meta = with lib; { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; license = licenses.asl20; From 609cdfae9aa71ddc74e9f01ef492a19ba5482a05 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 20 Aug 2020 10:38:50 +0200 Subject: [PATCH 318/520] freeradius: 3.0.20 -> 3.0.21 --- pkgs/servers/freeradius/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 9c80b7e7db3..84c92619f73 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -43,11 +43,11 @@ assert withRest -> curl != null && withJson; with stdenv.lib; stdenv.mkDerivation rec { pname = "freeradius"; - version = "3.0.20"; + version = "3.0.21"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "0zrnlpril8lcnyd6zz0wy45wj5i2k2krcf42dwa0rldjsjh6nazp"; + sha256 = "1bij07angf6ll6bq8lccd4fx1a1clf7k13kh5vbryh6lf7a19y9b"; }; nativeBuildInputs = [ autoreconfHook ]; From 8d45118da70dc11ab71cda76402b0b5c6d3271c9 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Wed, 19 Aug 2020 20:54:11 +0200 Subject: [PATCH 319/520] osu-lazer: add unfreeRedistributable license The unfree BASS library is a dependency of the osu framework, which includes the shared library in its repository. The library for the system runtime is included in the build output. --- pkgs/games/osu-lazer/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index d8197fae156..59e044b482b 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -99,7 +99,11 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Rhythm is just a *click* away"; homepage = "https://osu.ppy.sh"; - license = with licenses; [ mit cc-by-nc-40 ]; + license = with licenses; [ + mit + cc-by-nc-40 + unfreeRedistributable # osu-framework contains libbass.so in repository + ]; maintainers = with maintainers; [ oxalica ]; platforms = [ "x86_64-linux" ]; }; From 876396cac06d76bffe80a197551406fceca85fae Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 20 Aug 2020 11:14:02 +0200 Subject: [PATCH 320/520] prometheus: 2.19.3 -> 2.20.1, fix thanos test --- nixos/tests/prometheus.nix | 7 +++++-- pkgs/servers/monitoring/prometheus/default.nix | 8 +++++--- .../monitoring/prometheus/webui-yarndeps.nix | 16 ++++++++-------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index bce489168f9..af2aa66a552 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -158,7 +158,10 @@ in import ./make-test-python.nix { s3 = { pkgs, ... } : { # Minio requires at least 1GiB of free disk space to run. - virtualisation.diskSize = 2 * 1024; + virtualisation = { + diskSize = 2 * 1024; + memorySize = 1024; + }; networking.firewall.allowedTCPPorts = [ minioPort ]; services.minio = { @@ -235,7 +238,7 @@ in import ./make-test-python.nix { # Test if the Thanos bucket command is able to retrieve blocks from the S3 bucket # and check if the blocks have the correct labels: store.succeed( - "thanos bucket ls " + "thanos tools bucket ls " + "--objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file} " + "--output=json | " + "jq .thanos.labels.some_label | " diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 0b17f7801b6..7e729cd366f 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,13 @@ -{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }: +{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }: let - version = "2.19.3"; + version = "2.20.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "0dlvhbxahdq0x0qa0gv1rc4y5dp6lx44w280rbm9279nv1nplffh"; + sha256 = "0svhx08pbz55nhn6g9pn79zbhyvr394k5w3ny1mq3wp382h62r5j"; }; webui = mkYarnPackage { @@ -61,6 +61,8 @@ in buildGoPackage rec { doCheck = true; + passthru.tests = { inherit (nixosTests) prometheus; }; + meta = with lib; { description = "Service monitoring system and time series database"; homepage = "https://prometheus.io"; diff --git a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 7e9843dc98b..8b7d346e560 100644 --- a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -4122,11 +4122,11 @@ }; } { - name = "elliptic___elliptic_6.5.2.tgz"; + name = "elliptic___elliptic_6.5.3.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz"; - sha1 = "05c5678d7173c049d8ca433552224a495d0e3762"; + name = "elliptic___elliptic_6.5.3.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz"; + sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"; }; } { @@ -11698,11 +11698,11 @@ }; } { - name = "websocket_extensions___websocket_extensions_0.1.3.tgz"; + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; path = fetchurl { - name = "websocket_extensions___websocket_extensions_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz"; - sha1 = "5d2ff22977003ec687a4b87073dfbbac146ccf29"; + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; + sha1 = "7f8473bc839dfd87608adb95d7eb075211578a42"; }; } { From ccdb936226d2838c1cc080f0d5775f67e41a780e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 20 Aug 2020 04:20:00 -0500 Subject: [PATCH 321/520] timescale-prometheus: add buildFlagsArray --- pkgs/servers/monitoring/timescale-prometheus/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/monitoring/timescale-prometheus/default.nix b/pkgs/servers/monitoring/timescale-prometheus/default.nix index bd847176e0a..f5f4a4fd417 100644 --- a/pkgs/servers/monitoring/timescale-prometheus/default.nix +++ b/pkgs/servers/monitoring/timescale-prometheus/default.nix @@ -16,6 +16,8 @@ buildGoModule rec { vendorSha256 = "sha256:0y5rq2y48kf2z1z3a8ags6rqzfvjs54klk2679fk8x0yjamj5x04"; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/timescale-prometheus/pkg/version.Version=${version} -X github.com/timescale/timescale-prometheus/pkg/version.CommitHash=${src.rev}" ]; + doCheck = false; meta = with stdenv.lib; { From cf5b3e320aeb7fd6a4f95ca7e345aa9a9bb9a7ae Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 20 Aug 2020 04:20:00 -0500 Subject: [PATCH 322/520] timescaledb-tune: 0.6.0 -> 0.9.0 --- .../database/timescaledb-tune/default.nix | 20 ++++++++---------- .../tools/database/timescaledb-tune/deps.nix | 21 ------------------- 2 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 pkgs/development/tools/database/timescaledb-tune/deps.nix diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index da5ba3fea64..2079925049d 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -1,20 +1,18 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "timescaledb-tune"; - version = "0.6.0"; - - goPackagePath = "github.com/timescale/timescaledb-tune"; - - goDeps = ./deps.nix; +buildGoModule rec { + pname = "timescaledb-tune"; + version = "0.9.0"; src = fetchFromGitHub { owner = "timescale"; - repo = name; - rev = version; - sha256 = "0hjxmjgkqm9sbjbyhs3pzkk1d9vvlcbzwl7ghsigh4h7rw3a0mpk"; + repo = pname; + rev = "v${version}"; + sha256 = "0vncwwvw7y6g3crd4n5vvd6jwdsa8vsvsmfwy5mad4j6lix09ajx"; }; + vendorSha256 = "0hbpprbxs19fcar7xcy42kn9yfzhal2zsv5pml9ghiv2s61yns4z"; + meta = with stdenv.lib; { description = "A tool for tuning your TimescaleDB for better performance"; homepage = "https://github.com/timescale/timescaledb-tune"; diff --git a/pkgs/development/tools/database/timescaledb-tune/deps.nix b/pkgs/development/tools/database/timescaledb-tune/deps.nix deleted file mode 100644 index d898770fd4e..00000000000 --- a/pkgs/development/tools/database/timescaledb-tune/deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; - }; - } - { - goPackagePath = "github.com/pbnjay/memory"; - fetch = { - type = "git"; - url = "https://github.com/pbnjay/memory"; - rev = "974d429e7ae40c89e7dcd41cfcc22a0bfbe42510"; - sha256 = "0kazg5psdn90pqadrzma5chdwh0l2by9z31sspr47gx93fhjmkkq"; - }; - } -] From 9b9d3c47392158d91cc0192a461cf2c7e94b2f70 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 20 Aug 2020 04:20:00 -0500 Subject: [PATCH 323/520] timescaledb-parallel-copy: 0.2.0 -> 0.3.0 --- .../timescaledb-parallel-copy/default.nix | 28 ++++++++----------- .../timescaledb-parallel-copy/deps.nix | 21 -------------- 2 files changed, 12 insertions(+), 37 deletions(-) delete mode 100644 pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index 166cda52a3d..a0e05bf4ae5 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -1,26 +1,22 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "timescaledb-parallel-copy"; - version = "0.2.0"; - - owner = "timescale"; - repo = "timescaledb-parallel-copy"; - - goPackagePath = with src; "github.com/${owner}/${repo}"; - goDeps = ./deps.nix; +buildGoModule rec { + pname = "timescaledb-parallel-copy"; + version = "0.3.0"; src = fetchFromGitHub { - inherit owner repo; - rev = version; - sha256 = "1z9vf29vrxqs8imbisv681d02p4cfk3hlsrin6hhibxf1h0br9gd"; + owner = "timescale"; + repo = pname; + rev = "v${version}"; + sha256 = "0r8c78l8vg7l24c3vzs2qr2prfjpagvdkp95fh9gyz76nvik29ba"; }; + vendorSha256 = "03siay3hv1sgmmp7w4f9b0xb8c6bnbx0v4wy5grjl5k04zhnj76b"; + meta = with stdenv.lib; { description = "Bulk, parallel insert of CSV records into PostgreSQL"; - homepage = "https://github.com/timescale/timescaledb-parallel-copy"; - license = licenses.asl20; - platforms = platforms.unix; + homepage = "https://github.com/timescale/timescaledb-parallel-copy"; + license = licenses.asl20; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix deleted file mode 100644 index ac145fcd34e..00000000000 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/jmoiron/sqlx"; - fetch = { - type = "git"; - url = "https://github.com/jmoiron/sqlx"; - rev = "82935fac6c1a317907c8f43ed3f7f85ea844a78b"; - sha256 = "0cbscnss2ifc3qgmy97i0zbirrp4hix4jlcz853f4bg5n2zzgwh2"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "7aad666537ab32b76f0966145530335f1fed51fd"; - sha256 = "12qczn5afbf6203wnbpay1kazzh20jg5qyakrph3j1r13n91nc1r"; - }; - } -] From fa608f2cbbae03a87eb1477cff7311fa3d8e7d21 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 20 Aug 2020 04:20:00 -0500 Subject: [PATCH 324/520] docker-slim: 1.30.0 -> 1.31.0 --- pkgs/applications/virtualization/docker-slim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 6e5ba4abf37..c68c0d47e39 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.30.0"; + version = "1.31.0"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "10w5v0qqj8yqd81hpz65pq1lx0j9pl112s7hl6y9p3i3f0m0931f"; + sha256 = "0kj97kwyjs9hksaas0zic4m7w8b17c1d7c8vhiq2862w97ngxrsk"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; From b0cab4542d7da79044a968c9b326897aa3d4fa31 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Thu, 20 Aug 2020 02:46:31 -0700 Subject: [PATCH 325/520] relibc: build from source --- pkgs/development/libraries/relibc/default.nix | 79 +++++++++++++++---- 1 file changed, 62 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix index a1787ce24bb..43e02fc8758 100644 --- a/pkgs/development/libraries/relibc/default.nix +++ b/pkgs/development/libraries/relibc/default.nix @@ -1,27 +1,72 @@ -{ stdenvNoCC, buildPackages, fetchurl }: +{ stdenvNoCC, buildPackages, makeRustPlatform }: -stdenvNoCC.mkDerivation { - name = "binary-relibc-latest"; +let + rpath = stdenvNoCC.lib.makeLibraryPath [ + buildPackages.stdenv.cc.libc + "$out" + ]; + bootstrapCrossRust = stdenvNoCC.mkDerivation { + name = "binary-redox-rust"; + + src = fetchTarball { + name = "redox-rust-toolchain-bin.tar.gz"; + url = "https://www.dropbox.com/s/33r92en0t47l1ei/redox-rust-toolchain-bin.tar.gz?dl=1"; + sha256 = "1g17qp2q6b88p04yclkw6amm374pqlakrmw9kd86vw8z4g70jkxm"; + }; - # snapshot of https://static.redox-os.org/toolchain/x86_64-unknown-redox/relibc-install.tar.gz - src = fetchurl { - name = "relibc-install.tar.gz"; - url = "https://gateway.pinata.cloud/ipfs/QmNp6fPTjPA6LnCYvW1UmbAHcPpU7tqZhstfSpSXMJCRwp"; - sha256 = "1hjdzrj67jdag3pm8h2dqh6xipbfxr6f4navdra6q1h83gl7jkd9"; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + installPhase = '' + mkdir $out/ + cp -r * $out/ + + find $out/ -executable -type f -exec patchelf \ + --set-interpreter "${buildPackages.stdenv.cc.libc}/lib/ld-linux-x86-64.so.2" \ + --set-rpath "${rpath}" \ + "{}" \; + find $out/ -name "*.so" -type f -exec patchelf \ + --set-rpath "${rpath}" \ + "{}" \; + ''; + + meta.platforms = with stdenvNoCC.lib; platforms.redox ++ platforms.linux; }; - # to avoid "unpacker produced multiple directories" - unpackPhase = "unpackFile $src"; + redoxRustPlatform = buildPackages.makeRustPlatform { + rustc = bootstrapCrossRust; + cargo = bootstrapCrossRust; + }; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - installPhase = '' - mkdir $out/ - cp -r x86_64-unknown-redox/* $out/ - rm -rf $out/bin +in +redoxRustPlatform.buildRustPackage rec { + pname = "relibc"; + version = "latest"; + + LD_LIBRARY_PATH = "${buildPackages.zlib}/lib"; + + src = buildPackages.fetchgit { + url = "https://gitlab.redox-os.org/redox-os/relibc/"; + rev = "5af8e3ca35ad401014a867ac1a0cc3b08dee682b"; + sha256 = "1j4wsga9psl453031izkl3clkvm31d1wg4y8f3yqqvhml2aliws5"; + fetchSubmodules = true; + }; + + RUSTC_BOOTSTRAP = 1; + + dontInstall = true; + dontFixup = true; + doCheck = false; + + postBuild = '' + mkdir -p $out + DESTDIR=$out make install ''; + TARGET = buildPackages.rust.toRustTarget stdenvNoCC.targetPlatform; + + cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz"; + meta = with stdenvNoCC.lib; { homepage = "https://gitlab.redox-os.org/redox-os/relibc"; description = "C Library in Rust for Redox and Linux"; From 54acf58040890cf9449bea55b5693b42c13844b9 Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Thu, 20 Aug 2020 12:16:55 +0200 Subject: [PATCH 326/520] gitlab-runner: 13.2.2 -> 13.3.0 (#95838) --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 07803d6bd7c..890c561cadc 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.2.2"; + version = "13.3.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1m45jipn0lmlc4ynmm7g4nd1ryr5bzz1wvr8spd6gxvq5577i4pk"; + sha256 = "0pi33mgcmw1n5myyczg1nx1s8rqx6b4vr7s09jsjd6z81irhc87c"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "10nx0gjhbl4gz2n3yl8m7w60pmgdywgzins6y2pa7wvj5dkm04ax"; + sha256 = "071bsfnkasdj7lfidfhwcklycan2zpyalqia3rmbwd93m5rwqgrd"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1jii9rm11kcdh7hg9rif27b7rlj2cip6q9viknvs3ha1rf9fw96q"; + sha256 = "0idbj8jmycrh61bvkzjl5xffhvv9jnjqv9q0ivl457sn2jii9bhi"; }; patches = [ ./fix-shell-path.patch ]; From d4df3b70f75f608c6288967c309d284de4402886 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Aug 2020 12:54:47 +0200 Subject: [PATCH 327/520] homeassistant: 0.114.2 -> 0.114.3 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4290599cbf8..922755db1fb 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.114.2"; + version = "0.114.3"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "accuweather" = ps: with ps; [ ]; # missing inputs: accuweather diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f0a664dd635..4fe1e79105e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -72,7 +72,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.114.2"; + hassVersion = "0.114.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -91,7 +91,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0llyf3icdgb9mh7x02309m35hxhinzsbd6i31mmb9fjfzp0d27q9"; + sha256 = "1fn93vac9vi1wcbq8z9pc2cdvfdkkxpam2qhv5ni14wrmnjc4305"; }; propagatedBuildInputs = [ From 2b3d4e1c45c12800cae914ca13090a0382dca01b Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 20 Aug 2020 13:59:47 +0200 Subject: [PATCH 328/520] tamgamp.lv2: init at unstable-2020-06-10 (#82835) --- .../audio/tamgamp.lv2/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/audio/tamgamp.lv2/default.nix diff --git a/pkgs/applications/audio/tamgamp.lv2/default.nix b/pkgs/applications/audio/tamgamp.lv2/default.nix new file mode 100644 index 00000000000..9f51f9d022d --- /dev/null +++ b/pkgs/applications/audio/tamgamp.lv2/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, pkg-config, lv2, zita-resampler }: + +stdenv.mkDerivation rec { + pname = "tamgamp.lv2"; + version = "unstable-2020-06-14"; + + src = fetchFromGitHub { + owner = "sadko4u"; + repo = pname; + rev = "426da74142fcb6b7687a35b2b1dda3392e171b92"; + sha256 = "0dqsnim7v79rx13bkkh143gqz0xg26cpf6ya3mrwwprpf5hns2bp"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ lv2 zita-resampler ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/sadko4u/tamgamp.lv2"; + description = "Guitar amplifier simulator"; + longDescription = '' + Tamgamp (Pronouncement: "Damage Amp") is an LV2 guitar amp simulator that provides two plugins: + + - Tamgamp - a plugin based on Guitarix DK Builder simulated chains. + - TamgampGX - a plugin based on tuned Guitarix internal amplifiers implementation. + + The reference to the original Guitarix project: https://guitarix.org/ + + It simulates the set of the following guitar amplifiers: + + - Fender Princeton Reverb-amp AA1164 (without reverb module) + - Fender Twin Reverb-Amp AA769 (Normal channel, bright off) + - Fender Twin Reverb-Amp AA769 (Vibrato channel, bright on) + - Marshall JCM-800 High-gain input + - Marshall JCM-800 Low-gain input + - Mesa/Boogie DC3 preamplifier (lead channel) + - Mesa/Boogie DC3 preamplifier (rhythm channel) + - Mesa Dual Rectifier preamplifier (orange channel, less gain) + - Mesa Dual Rectifier preamplifier (red channel, more gain) + - Peavey 5150II crunch channel + - Peavey 5150II lead channel + - VOX AC-30 Brilliant channel + - VOX AC-30 normal channel + ''; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.lgpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 669e6025534..5b0985e7839 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22956,6 +22956,8 @@ in tambura = callPackage ../applications/audio/tambura { }; + tamgamp.lv2 = callPackage ../applications/audio/tamgamp.lv2 { }; + tanka = callPackage ../applications/networking/cluster/tanka { }; teams = callPackage ../applications/networking/instant-messengers/teams { }; From 4714dc1e9a4f1c4d4421a73fcc4d119806ba0094 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 20 Aug 2020 08:17:11 -0400 Subject: [PATCH 329/520] linux_latest-libre: 17583 -> 17624 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 9fd107661c0..d3ea80ecb22 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17583"; - sha256 = "0d65in4ggnqyc0s2qry883y6pjkakd2h7rdaai1763jsq6inm3ha"; + rev = "17624"; + sha256 = "0gs3mpiffny408l9kdrxpj48axarfb2fxvcw4w8zsz5wr7yig0n2"; } , ... }: From e857d071d3194aedd91494c7df01ad07761fa6b5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 20 Aug 2020 08:17:34 -0400 Subject: [PATCH 330/520] linux/hardened/patches/4.19: 4.19.139.a -> 4.19.140.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ac8ab628680..8418c4f3fa6 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.193.a/linux-hardened-4.14.193.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.139.a.patch", - "sha256": "02kzzzk09kiwimwmq437079kqrh4n76jc7a6q5y33wpvgpacdmc9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.139.a/linux-hardened-4.19.139.a.patch" + "name": "linux-hardened-4.19.140.a.patch", + "sha256": "03y0kp89wka9bjw44y2jqralnwi7rjxbgm7wym1ad5yqd4q29l4d", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.140.a/linux-hardened-4.19.140.a.patch" }, "5.4": { "name": "linux-hardened-5.4.58.a.patch", From 266521c7d8923d43d85dc874d7bdcb0fa8c00389 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 20 Aug 2020 08:17:36 -0400 Subject: [PATCH 331/520] linux/hardened/patches/5.4: 5.4.58.a -> 5.4.59.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 8418c4f3fa6..e1ff8226eb2 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.140.a/linux-hardened-4.19.140.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.58.a.patch", - "sha256": "0f2ll67skk78jxz7h8mxppq11giy2y0h2xw3pcp01dmnsci67vzj", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.58.a/linux-hardened-5.4.58.a.patch" + "name": "linux-hardened-5.4.59.a.patch", + "sha256": "138kms73rlj5zmsb2ivjzz1jr5aa8y8pmwzx02c7j1qk08v82823", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.59.a/linux-hardened-5.4.59.a.patch" }, "5.7": { "name": "linux-hardened-5.7.15.a.patch", From 9c5578b08f72f545906f3398780fdfd67db2f35c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 20 Aug 2020 08:17:38 -0400 Subject: [PATCH 332/520] linux/hardened/patches/5.7: 5.7.15.a -> 5.7.16.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index e1ff8226eb2..36277dd74cd 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -15,8 +15,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.59.a/linux-hardened-5.4.59.a.patch" }, "5.7": { - "name": "linux-hardened-5.7.15.a.patch", - "sha256": "052zwbgx2jbby7cqab45hvbnqr6mbkz0i17hncj94jsy15ghp6ir", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.15.a/linux-hardened-5.7.15.a.patch" + "name": "linux-hardened-5.7.16.a.patch", + "sha256": "1fiyd6qsf8r84p05cxhwma7zwi81xyn9pl6yci93n583z8n1k2sw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.16.a/linux-hardened-5.7.16.a.patch" } } From 725a3da8abf5b431289baf09437273c96c610aef Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 20 Aug 2020 08:18:29 -0400 Subject: [PATCH 333/520] oh-my-zsh: 2020-08-18 -> 2020-08-20 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 47a7b8c2af5..8fc189fbf15 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-08-18"; + version = "2020-08-20"; pname = "oh-my-zsh"; - rev = "89400f156a6e1d64acaeab9ec265f54cdab91817"; + rev = "03b6a72576cb0f0b53abde25d409e8026d5c4ee9"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1k659480dv7wi9rz1zdq8w0nysgjsm58jy2kzp3rnxaxm7fkzivm"; + sha256 = "0bm043r3pffbv74drrv2xa66rsadrrsayscwwnfgp24svdmx7a6z"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From d39d23d7373a62897f6b32b4f49e15dec19e177e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Aug 2020 14:39:32 +0200 Subject: [PATCH 334/520] python-m2crypto: update to version 0.36.0 This update fixes osc when run with Python 3.8. --- pkgs/development/python-modules/m2crypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 0e079dd832c..f3ca43f5e9a 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { - version = "0.35.2"; + version = "0.36.0"; pname = "M2Crypto"; src = fetchPypi { inherit pname version; - sha256 = "09yirf3w77w6f49q6nxhrjm9c3a4y9s30s1k09chqrw8zdgx8sjc"; + sha256 = "1hadbdckmjzfb8qzbkafypin6sakfx35j2qx0fsivh757s7c2hhm"; }; patches = [ From 1975efd411af43770cda90300ed8e40e5cdbb8ef Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 20 Aug 2020 15:29:52 +0200 Subject: [PATCH 335/520] =?UTF-8?q?lowdown:=200.7.2=20=E2=86=92=200.7.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/typesetting/lowdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index a7c6407705e..aa7a8598d66 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.7.2"; + version = "0.7.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "3ks1jfw4rjm0qb87ask7wx0xx1grxhbpg53r86q74zhsiqqi6xiza2czg75mydmgic1nr9ny43d5p44sl8ihhja9kwdx230nblx1176"; + sha512 = "14mx22aqr9cmin4cyhrclhm0hly1i21j2dmsikfp1c87wl2kpn9xgxnix5r0iqh5dwjxdh591rfh21xjp0l11m0nl5wkpnn7wmq7g6b"; }; nativeBuildInputs = [ which ]; From 5a3738d22b97c40f842a4a044fd9ad8484a8874c Mon Sep 17 00:00:00 2001 From: davidak Date: Thu, 20 Aug 2020 15:45:54 +0200 Subject: [PATCH 336/520] nixos/systemPackages: clean up (#91213) * nixos/systemPackages: clean up * Update nixos/doc/manual/release-notes/rl-2009.xml Co-authored-by: Jan Tojnar * Update nixos/doc/manual/release-notes/rl-2009.xml Co-authored-by: 8573 <8573@users.noreply.github.com> Co-authored-by: Jan Tojnar Co-authored-by: 8573 <8573@users.noreply.github.com> --- nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++ nixos/modules/config/system-path.nix | 5 +---- nixos/modules/profiles/base.nix | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 58f8e3cb8f2..59a4d78c27e 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -905,6 +905,11 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; Fontconfig 2.10.x was removed from Nixpkgs - it hasn't been used in any nixpkgs package anymore. + + + The packages perl, rsync and strace were removed from . If you need them, install them again with = with pkgs; [ perl rsync strace ]; in your configuration.nix. + + diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index ae9710e3518..b3c5c6f93f3 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -33,14 +33,11 @@ let pkgs.ncurses pkgs.netcat config.programs.ssh.package - pkgs.perl pkgs.procps - pkgs.rsync - pkgs.strace pkgs.su pkgs.time pkgs.utillinux - pkgs.which # 88K size + pkgs.which pkgs.zstd ]; diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 2a2fe119d30..3b67d628f9f 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -26,6 +26,7 @@ pkgs.fuse pkgs.fuse3 pkgs.sshfs-fuse + pkgs.rsync pkgs.socat pkgs.screen From b0705bcbcebfea359643112fd200b549035d9503 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 20 Aug 2020 15:54:13 +0200 Subject: [PATCH 337/520] lf: 15 -> 16 --- pkgs/tools/misc/lf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index f4271e86b4c..a00fd7494d8 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lf"; - version = "15"; + version = "16"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "1fjwkng6fnbl6dlicbxj0z92hl9xggni5zfi3nsxn3fa6rmzbiay"; + sha256 = "174h6xnm3amayf0wfiai16m8qnkx54h5zy4rs7j3yzycd7sirs5b"; }; vendorSha256 = "10na3jzvln353ygcvbhj4243yr83skw5zf3r2n8p6d7i83i86c8w"; From 674ec71f2dd29397ffcb4a640dadf03d5ec7f96f Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 20 Aug 2020 10:09:28 +0700 Subject: [PATCH 338/520] mozwire: 0.4.1 -> 0.5.1 --- pkgs/tools/networking/mozwire/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix index 533f2adab70..6264672cfaa 100644 --- a/pkgs/tools/networking/mozwire/default.nix +++ b/pkgs/tools/networking/mozwire/default.nix @@ -1,18 +1,19 @@ { rustPlatform, stdenv, fetchFromGitHub, Security }: + rustPlatform.buildRustPackage rec { pname = "MozWire"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "NilsIrl"; repo = pname; rev = "v${version}"; - sha256 = "1slfb6m22vzglnrxahlhdcwzwpf3b817mskdx628s92mjzngzyih"; + sha256 = "07icgswmfvrvlm3mkm78pbbk6m2hb73j7ffj7r77whzb11v027v1"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0b00j8vn1vvvphcyv8li7i73pq66sq6dr4wc1w4s3pppa151xr55"; + cargoSha256 = "10lhz7bdlfqj7wgsqnsxdfskms33pvj176fhf4kwci7nb8vgai4b"; meta = with stdenv.lib; { description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN"; From 3441ce5c0cd9d4c4e8d3a80803cd34ff75ec225e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Aug 2020 18:51:28 +0200 Subject: [PATCH 339/520] LTS Haskell 16.10 --- .../configuration-hackage2nix.yaml | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 229a79b3be9..0c93b0754fd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 16.9 + # LTS Haskell 16.10 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -243,7 +243,7 @@ default-package-overrides: - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - asn1-types ==0.3.4 - - assert-failure ==0.1.2.3 + - assert-failure ==0.1.2.4 - assoc ==1.0.2 - astro ==0.4.2.1 - async ==2.2.2 @@ -262,7 +262,7 @@ default-package-overrides: - attoparsec-path ==0.0.0.1 - audacity ==0.0.2 - aur ==7.0.3 - - aura ==3.1.6 + - aura ==3.1.7 - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 @@ -671,7 +671,7 @@ default-package-overrides: - doldol ==0.4.1.2 - do-list ==1.0.1 - do-notation ==0.1.0.2 - - dotenv ==0.8.0.4 + - dotenv ==0.8.0.6 - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 @@ -760,7 +760,7 @@ default-package-overrides: - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - - extra ==1.7.4 + - extra ==1.7.5 - extractable-singleton ==0.0.1 - extrapolate ==0.4.2 - fail ==4.9.0.0 @@ -979,7 +979,7 @@ default-package-overrides: - hall-symbols ==0.1.0.6 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - - hapistrano ==0.4.1.0 + - hapistrano ==0.4.1.2 - happstack-server ==7.6.1 - happy ==1.19.12 - HasBigDecimal ==0.1.1 @@ -1007,7 +1007,7 @@ default-package-overrides: - haskoin-core ==0.13.4 - haskoin-node ==0.13.0 - hasql ==1.4.3 - - hasql-optparse-applicative ==0.3.0.5 + - hasql-optparse-applicative ==0.3.0.6 - hasql-pool ==0.5.2 - hasql-transaction ==1.0.0.1 - hasty-hamiltonian ==1.3.3 @@ -1088,18 +1088,18 @@ default-package-overrides: - HSlippyMap ==3.0.1 - hslogger ==1.3.1.0 - hslua ==1.0.3.2 - - hslua-aeson ==1.0.2 + - hslua-aeson ==1.0.3 - hslua-module-doclayout ==0.1.0 - - hslua-module-system ==0.2.1 + - hslua-module-system ==0.2.2 - hslua-module-text ==0.2.1 - HsOpenSSL ==0.11.4.18 - hsp ==0.10.0 - - hspec ==2.7.1 + - hspec ==2.7.2 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.5.1 - - hspec-core ==2.7.1 - - hspec-discover ==2.7.1 + - hspec-core ==2.7.2 + - hspec-discover ==2.7.2 - hspec-expectations ==0.8.2 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.5 @@ -1258,7 +1258,7 @@ default-package-overrides: - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jira-wiki-markup ==1.1.4 - - jose ==0.8.3 + - jose ==0.8.3.1 - jose-jwt ==0.8.0 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1289,7 +1289,7 @@ default-package-overrides: - kmeans ==0.1.3 - koofr-client ==1.0.0.3 - krank ==0.2.2 - - kubernetes-webhook-haskell ==0.2.0.2 + - kubernetes-webhook-haskell ==0.2.0.3 - l10n ==0.1.0.1 - labels ==0.3.3 - lackey ==1.0.13 @@ -1394,7 +1394,7 @@ default-package-overrides: - massiv-test ==0.1.3.1 - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - - math-functions ==0.3.4.0 + - math-functions ==0.3.4.1 - matplotlib ==0.7.5 - matrices ==0.5.0 - matrix ==0.3.6.1 @@ -1466,7 +1466,7 @@ default-package-overrides: - monad-extras ==0.6.0 - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - - monad-logger ==0.3.34 + - monad-logger ==0.3.35 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.11 - monad-loops ==0.4.3 @@ -1589,7 +1589,7 @@ default-package-overrides: - OneTuple ==0.2.2.1 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.6.7005.0 + - opaleye ==0.6.7006.1 - OpenAL ==1.7.0.5 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 @@ -1786,7 +1786,7 @@ default-package-overrides: - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qrcode-core ==0.9.4 - - qrcode-juicypixels ==0.8.1 + - qrcode-juicypixels ==0.8.2 - quadratic-irrational ==0.1.1 - QuasiText ==0.1.2.6 - QuickCheck ==2.13.2 @@ -1835,7 +1835,7 @@ default-package-overrides: - reanimate ==0.3.3.0 - reanimate-svg ==0.9.8.0 - rebase ==1.6.1 - - record-dot-preprocessor ==0.2.5 + - record-dot-preprocessor ==0.2.6 - record-hasfield ==1.0 - records-sop ==0.1.0.3 - recursion-schemes ==5.1.3 @@ -2170,7 +2170,7 @@ default-package-overrides: - tasty-hunit ==0.10.0.2 - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.1 - - tasty-lua ==0.2.2 + - tasty-lua ==0.2.3 - tasty-program ==1.0.5 - tasty-quickcheck ==0.10.1.1 - tasty-rerun ==1.1.17 @@ -2294,7 +2294,7 @@ default-package-overrides: - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.19 + - turtle ==1.5.20 - TypeCompose ==0.9.14 - typed-process ==0.2.6.0 - typed-uuid ==0.0.0.2 @@ -2408,7 +2408,7 @@ default-package-overrides: - void ==0.7.3 - vty ==5.28.2 - wai ==3.2.2.1 - - wai-app-static ==3.1.7.1 + - wai-app-static ==3.1.7.2 - wai-conduit ==3.0.0.4 - wai-cors ==0.2.7 - wai-enforce-https ==0.0.2.1 From 019b21c45693cc144abb860f771360f46b96b25e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Aug 2020 18:52:43 +0200 Subject: [PATCH 340/520] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-13-g52041eb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/d0f6f2109f0c92012ea897f776cf84489e4be653. --- .../haskell-modules/hackage-packages.nix | 568 ++---------------- 1 file changed, 58 insertions(+), 510 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 637f85e2127..78fac57babb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -33337,18 +33337,6 @@ self: { }) {}; "assert-failure" = callPackage - ({ mkDerivation, base, pretty-show, text }: - mkDerivation { - pname = "assert-failure"; - version = "0.1.2.3"; - sha256 = "1cjl9xa8d4rmzafydcnjl7pnv40hl6q663k37kyx22dyg9frgc68"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base pretty-show text ]; - description = "Syntactic sugar improving 'assert' and 'error'"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "assert-failure_0_1_2_4" = callPackage ({ mkDerivation, base, pretty-show, text }: mkDerivation { pname = "assert-failure"; @@ -33358,7 +33346,6 @@ self: { libraryHaskellDepends = [ base pretty-show text ]; description = "Syntactic sugar improving 'assert' and 'error'"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "assertions" = callPackage @@ -34870,42 +34857,6 @@ self: { }) {}; "aura" = callPackage - ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring - , containers, filepath, hashable, http-client, http-client-tls - , http-types, language-bash, megaparsec, network-uri - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers - , typed-process, versions - }: - mkDerivation { - pname = "aura"; - version = "3.1.6"; - sha256 = "14qix9zpw6hanj3hrqnwl13fjfjrw0klkm7wm91lh8zpj5amjzcc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson algebraic-graphs aur base bytestring containers filepath - hashable http-client http-types language-bash megaparsec - network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler - stm text time transformers typed-process versions - ]; - executableHaskellDepends = [ - aeson aur base bytestring containers http-client http-client-tls - megaparsec optparse-applicative prettyprinter - prettyprinter-ansi-terminal rio scheduler text transformers - typed-process versions - ]; - testHaskellDepends = [ - base bytestring containers megaparsec rio tasty tasty-hunit text - versions - ]; - description = "A secure package manager for Arch Linux and the AUR"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "aura_3_1_7" = callPackage ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring , containers, filepath, hashable, http-client, http-client-tls , http-types, language-bash, megaparsec, network-uri @@ -66596,20 +66547,21 @@ self: { "darcs" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , binary, bytestring, Cabal, cmdargs, conduit, constraints - , containers, cryptonite, data-ordlist, directory, fgl, filepath - , FindBin, hashable, haskeline, html, http-conduit, http-types - , HUnit, leancheck, memory, mmap, mtl, network, network-uri - , old-time, parsec, process, QuickCheck, regex-applicative - , regex-compat-tdfa, sandi, shelly, split, stm, tar, temporary - , terminfo, test-framework, test-framework-hunit - , test-framework-leancheck, test-framework-quickcheck2, text, time - , transformers, unix, unix-compat, utf8-string, vector, zip-archive - , zlib + , containers, cryptonite, data-ordlist, directory, exceptions, fgl + , filepath, FindBin, hashable, haskeline, html, http-conduit + , http-types, HUnit, leancheck, memory, mmap, monad-control, mtl + , network, network-uri, old-time, parsec, process, QuickCheck + , regex-applicative, regex-compat-tdfa, sandi, split, stm + , system-fileio, system-filepath, tar, temporary, terminfo + , test-framework, test-framework-hunit, test-framework-leancheck + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unix, unix-compat, utf8-string, vector + , zip-archive, zlib }: mkDerivation { pname = "darcs"; - version = "2.16.1"; - sha256 = "1q837ibf97f3fm6gcr5l6cc4kb554gm1fhzc2a22fkkj15axivq0"; + version = "2.16.2"; + sha256 = "1nsmaai4l5zas4v1vk92nvh721dykcxrpd4c2v9bh3wi3n2m45qn"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -66625,10 +66577,12 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - array base bytestring cmdargs constraints containers directory - filepath FindBin HUnit leancheck mtl QuickCheck shelly split + array async base bytestring cmdargs constraints containers + directory exceptions filepath FindBin HUnit leancheck monad-control + mtl process QuickCheck split system-fileio system-filepath test-framework test-framework-hunit test-framework-leancheck - test-framework-quickcheck2 text transformers vector zip-archive + test-framework-quickcheck2 text time transformers transformers-base + unix-compat vector zip-archive ]; doCheck = false; postInstall = '' @@ -77069,34 +77023,6 @@ self: { }) {}; "dotenv" = callPackage - ({ mkDerivation, base, base-compat, containers, directory - , exceptions, hspec, hspec-megaparsec, megaparsec - , optparse-applicative, process, text, transformers, yaml - }: - mkDerivation { - pname = "dotenv"; - version = "0.8.0.4"; - sha256 = "05dqa91zmxkzkz1dcpx2jxkzhdr4f51gw0qql47da9bllavl0jj4"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base base-compat containers directory exceptions megaparsec process - text transformers yaml - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - transformers yaml - ]; - testHaskellDepends = [ - base base-compat containers directory exceptions hspec - hspec-megaparsec megaparsec process text transformers yaml - ]; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dotenv_0_8_0_6" = callPackage ({ mkDerivation, base, base-compat, containers, directory , exceptions, hspec, hspec-megaparsec, megaparsec , optparse-applicative, process, text, transformers, yaml @@ -77122,7 +77048,6 @@ self: { ]; description = "Loads environment variables from dotenv files"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dotfs" = callPackage @@ -85975,24 +85900,6 @@ self: { }) {}; "extra" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, quickcheck-instances, time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.7.4"; - sha256 = "0vcn8vid3ps7122zn3h0dzlwkx7kkxzsfhlwymalx6ph1fmxbq9y"; - libraryHaskellDepends = [ - base clock directory filepath process time unix - ]; - testHaskellDepends = [ - base directory filepath QuickCheck quickcheck-instances unix - ]; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extra_1_7_5" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, quickcheck-instances, time, unix }: @@ -86008,7 +85915,6 @@ self: { ]; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -113269,38 +113175,6 @@ self: { }) {}; "hapistrano" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, directory - , filepath, formatting, gitrev, hspec, hspec-discover, mtl - , optparse-applicative, path, path-io, process, QuickCheck - , silently, stm, temporary, time, transformers, typed-process, yaml - }: - mkDerivation { - pname = "hapistrano"; - version = "0.4.1.0"; - sha256 = "1fkjg5q70qpp8y9xkzksfrdfn09psz5pydqw5bd8z4nfwhyivql8"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-terminal base filepath formatting gitrev mtl path - process stm time transformers typed-process yaml - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process QuickCheck - silently temporary yaml - ]; - testToolDepends = [ hspec-discover ]; - description = "A deployment library for Haskell applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hapistrano_0_4_1_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, directory , filepath, formatting, gitrev, hspec, hspec-discover, mtl , optparse-applicative, path, path-io, process, QuickCheck @@ -119484,23 +119358,6 @@ self: { }) {}; "hasql-optparse-applicative" = callPackage - ({ mkDerivation, base-prelude, hasql, hasql-pool - , optparse-applicative - }: - mkDerivation { - pname = "hasql-optparse-applicative"; - version = "0.3.0.5"; - sha256 = "0q5ggbx3xlzq0lv6i6wac9zsf0x4k91cf1n5rg6q96wg90f0dxxq"; - libraryHaskellDepends = [ - base-prelude hasql hasql-pool optparse-applicative - ]; - description = "\"optparse-applicative\" parsers for \"hasql\""; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hasql-optparse-applicative_0_3_0_6" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative }: @@ -133411,29 +133268,6 @@ self: { }) {inherit (pkgs) lua5_3;}; "hslua-aeson" = callPackage - ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec - , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific - , text, unordered-containers, vector - }: - mkDerivation { - pname = "hslua-aeson"; - version = "1.0.2"; - sha256 = "1v5saxppbnq62ds00a7diadvqg8dnsx0sjlcanjj15h13j3yw964"; - revision = "1"; - editedCabalFile = "1bikj789x82f4b1pqij1wshkncvlxwjwyxf9z1spfvg8nsb5sd7y"; - libraryHaskellDepends = [ - aeson base hashable hslua scientific text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base bytestring hashable hslua hspec HUnit ieee754 QuickCheck - quickcheck-instances scientific text unordered-containers vector - ]; - description = "Allow aeson data types to be used with lua"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hslua-aeson_1_0_3" = callPackage ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific , text, unordered-containers, vector @@ -133452,7 +133286,6 @@ self: { ]; description = "Allow aeson data types to be used with lua"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslua-module-doclayout" = callPackage @@ -133472,22 +133305,6 @@ self: { }) {}; "hslua-module-system" = callPackage - ({ mkDerivation, base, containers, directory, exceptions, hslua - , tasty, tasty-hunit, temporary, text - }: - mkDerivation { - pname = "hslua-module-system"; - version = "0.2.1"; - sha256 = "1m7wz3g5c34pyizqw5mllzhsy2vziddhlbhjfwdvd7nhd3p4v3hh"; - libraryHaskellDepends = [ - base containers directory exceptions hslua temporary - ]; - testHaskellDepends = [ base hslua tasty tasty-hunit text ]; - description = "Lua module wrapper around Haskell's System module"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hslua-module-system_0_2_2" = callPackage ({ mkDerivation, base, containers, directory, exceptions, hslua , tasty, tasty-hunit, tasty-lua, temporary, text }: @@ -133503,7 +133320,6 @@ self: { ]; description = "Lua module wrapper around Haskell's System module"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslua-module-text" = callPackage @@ -133891,21 +133707,6 @@ self: { }) {}; "hspec" = callPackage - ({ mkDerivation, base, hspec-core, hspec-discover - , hspec-expectations, QuickCheck - }: - mkDerivation { - pname = "hspec"; - version = "2.7.1"; - sha256 = "1x8rcr7j1azcaw0fg1xzp8j0gr4ias36z09aj24i4xp8pnyfp341"; - libraryHaskellDepends = [ - base hspec-core hspec-discover hspec-expectations QuickCheck - ]; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec_2_7_2" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: @@ -133918,7 +133719,6 @@ self: { ]; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-attoparsec" = callPackage @@ -133977,35 +133777,6 @@ self: { }) {}; "hspec-core" = callPackage - ({ mkDerivation, ansi-terminal, array, base, call-stack, clock - , deepseq, directory, filepath, hspec-expectations, hspec-meta - , HUnit, process, QuickCheck, quickcheck-io, random, setenv - , silently, stm, temporary, tf-random, transformers - }: - mkDerivation { - pname = "hspec-core"; - version = "2.7.1"; - sha256 = "08vk8588lap00hsln8zl64dazbb28lzk4b4h5vnm7xvhg7r21k1c"; - revision = "1"; - editedCabalFile = "0aw68sgz2p63y0vg07c1jx2pr8lmhp5c1ck60dlipyxsa00455i6"; - libraryHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv stm tf-random transformers - ]; - testHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations hspec-meta HUnit process QuickCheck - quickcheck-io random setenv silently stm temporary tf-random - transformers - ]; - testToolDepends = [ hspec-meta ]; - testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-core_2_7_2" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -134030,7 +133801,6 @@ self: { testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-dirstream" = callPackage @@ -134052,25 +133822,6 @@ self: { }) {}; "hspec-discover" = callPackage - ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck - }: - mkDerivation { - pname = "hspec-discover"; - version = "2.7.1"; - sha256 = "0r47fm94wa6qrhp8cc1zzkjrxc32rnagfn9m9ga4dm6p6ydw4c8b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base directory filepath hspec-meta QuickCheck - ]; - testToolDepends = [ hspec-meta ]; - description = "Automatically discover and run Hspec tests"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-discover_2_7_2" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { @@ -134087,7 +133838,6 @@ self: { testToolDepends = [ hspec-meta ]; description = "Automatically discover and run Hspec tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-expectations" = callPackage @@ -136370,7 +136120,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_7_1" = callPackage + "http-client_0_7_2" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , case-insensitive, containers, cookie, deepseq, directory , exceptions, filepath, ghc-prim, hspec, http-types, memory @@ -136379,8 +136129,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.7.1"; - sha256 = "0qjdjpxwqbnxfgqny0iylv11ng2swmdz57bwzy3mif5hfamvr6p0"; + version = "0.7.2"; + sha256 = "1ld8bx1bnf1gpvdy9wn14b31k94rjvl40zqrgd7nb20zd2l354vp"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -148194,37 +147944,6 @@ self: { }) {}; "jose" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, concise, containers, cryptonite, hspec, lens, memory - , monad-time, mtl, network-uri, pem, QuickCheck - , quickcheck-instances, safe, semigroups, tasty, tasty-hspec - , tasty-quickcheck, template-haskell, text, time - , unordered-containers, vector, x509 - }: - mkDerivation { - pname = "jose"; - version = "0.8.3"; - sha256 = "0izrbjcmsiv67d2vmiqgmnzn27pvs0kvka3rw5x33fwjgq0b3jyv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring concise - containers cryptonite lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe semigroups template-haskell - text time unordered-containers vector x509 - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring concise - containers cryptonite hspec lens memory monad-time mtl network-uri - pem QuickCheck quickcheck-instances safe semigroups tasty - tasty-hspec tasty-quickcheck template-haskell text time - unordered-containers vector x509 - ]; - description = "Javascript Object Signing and Encryption and JSON Web Token library"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "jose_0_8_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, concise, containers, cryptonite, hspec, lens, memory , monad-time, mtl, network-uri, pem, QuickCheck @@ -148252,7 +147971,6 @@ self: { ]; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jose-jwt" = callPackage @@ -152477,22 +152195,6 @@ self: { }) {}; "kubernetes-webhook-haskell" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , text, unordered-containers - }: - mkDerivation { - pname = "kubernetes-webhook-haskell"; - version = "0.2.0.2"; - sha256 = "1zhknc4bpdm3xcynn1jm7yii615sj7xcq3mv31xlx4kc4bh566al"; - libraryHaskellDepends = [ - aeson base base64-bytestring binary bytestring text - unordered-containers - ]; - description = "Create Kubernetes Admission Webhooks in Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "kubernetes-webhook-haskell_0_2_0_3" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring , text, unordered-containers }: @@ -152506,7 +152208,6 @@ self: { ]; description = "Create Kubernetes Admission Webhooks in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kuifje" = callPackage @@ -166334,28 +166035,6 @@ self: { }) {}; "math-functions" = callPackage - ({ mkDerivation, base, data-default-class, deepseq, erf, primitive - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, vector - , vector-th-unbox - }: - mkDerivation { - pname = "math-functions"; - version = "0.3.4.0"; - sha256 = "1r77ifqjxr8waf9ljgggyhl2a7gpqhhsi7m7cnc9v5kxqzgdbn4a"; - revision = "1"; - editedCabalFile = "1gyrzczs1df98l2d21xrpqqsxs9yw27pfwl27fx8lshd9n25x5h5"; - libraryHaskellDepends = [ - base data-default-class deepseq primitive vector - ]; - testHaskellDepends = [ - base data-default-class deepseq erf primitive QuickCheck tasty - tasty-hunit tasty-quickcheck vector vector-th-unbox - ]; - description = "Collection of tools for numeric computations"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "math-functions_0_3_4_1" = callPackage ({ mkDerivation, base, data-default-class, deepseq, erf, gauge , primitive, QuickCheck, random, tasty, tasty-hunit , tasty-quickcheck, vector, vector-th-unbox @@ -166376,7 +166055,6 @@ self: { ]; description = "Collection of tools for numeric computations"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "math-grads" = callPackage @@ -172282,27 +171960,6 @@ self: { }) {}; "monad-logger" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , exceptions, fast-logger, lifted-base, monad-control, monad-loops - , mtl, resourcet, stm, stm-chans, template-haskell, text - , transformers, transformers-base, transformers-compat - , unliftio-core - }: - mkDerivation { - pname = "monad-logger"; - version = "0.3.34"; - sha256 = "0sxphrd7g1iwb0nlx0g4y3a661sdsgh098cbyisrm288k9iws91f"; - libraryHaskellDepends = [ - base bytestring conduit conduit-extra exceptions fast-logger - lifted-base monad-control monad-loops mtl resourcet stm stm-chans - template-haskell text transformers transformers-base - transformers-compat unliftio-core - ]; - description = "A class of monads which can log messages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-logger_0_3_35" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra , exceptions, fast-logger, lifted-base, monad-control, monad-loops , mtl, resourcet, stm, stm-chans, template-haskell, text @@ -172321,7 +171978,6 @@ self: { ]; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger-json" = callPackage @@ -176922,8 +176578,8 @@ self: { }: mkDerivation { pname = "musicw"; - version = "0.3.5.1"; - sha256 = "1fhvkgjhfjvk2df46r9yicmsdqa9790h8dsnmjz6i8a2mqm02vnj"; + version = "0.3.5.2"; + sha256 = "0mn5vnjxqkpd2pgjxmchlih74a1m52v06h6f08kyb26l0sjpbfx7"; libraryHaskellDepends = [ array base bytestring containers data-default file-embed ghcjs-base ghcjs-dom ghcjs-prim json monad-loops mtl safe text time @@ -185444,36 +185100,6 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, scientific - , semigroups, text, time, time-locale-compat, transformers, uuid - , void - }: - mkDerivation { - pname = "opaleye"; - version = "0.6.7005.0"; - sha256 = "0i5lwfvj7382ayxzdbip1nwjiiy7jn58g7qa33s44x3pnjv3wssy"; - revision = "1"; - editedCabalFile = "0bby89fvbx89b882b2qx07lg8npnfa325qg0gyabrd950510vzr2"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors scientific semigroups text time time-locale-compat - transformers uuid void - ]; - testHaskellDepends = [ - aeson base bytestring containers contravariant dotenv hspec - hspec-discover multiset postgresql-simple product-profunctors - profunctors QuickCheck semigroups text time transformers uuid - ]; - testToolDepends = [ hspec-discover ]; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye_0_6_7006_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -185499,7 +185125,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -206718,22 +206343,6 @@ self: { }) {}; "qrcode-juicypixels" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels - , qrcode-core, text, vector - }: - mkDerivation { - pname = "qrcode-juicypixels"; - version = "0.8.1"; - sha256 = "0yd22dygh2z8i0yhgdgr1m25ag9bdkpmd1ciq4iq42k0yhk6iqx9"; - libraryHaskellDepends = [ - base base64-bytestring bytestring JuicyPixels qrcode-core text - vector - ]; - description = "Converts a qrcode-core image to JuicyPixels"; - license = stdenv.lib.licenses.mit; - }) {}; - - "qrcode-juicypixels_0_8_2" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels , qrcode-core, text, vector }: @@ -206747,7 +206356,6 @@ self: { ]; description = "Converts a qrcode-core image to JuicyPixels"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "qsem" = callPackage @@ -211349,23 +210957,6 @@ self: { }) {}; "record-dot-preprocessor" = callPackage - ({ mkDerivation, base, extra, filepath, ghc, record-hasfield - , uniplate - }: - mkDerivation { - pname = "record-dot-preprocessor"; - version = "0.2.5"; - sha256 = "10f054da8iz38mplgbq4j78r4jl4l07iridd89ivk9d366z1c0ly"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base extra ghc uniplate ]; - executableHaskellDepends = [ base extra ]; - testHaskellDepends = [ base extra filepath record-hasfield ]; - description = "Preprocessor to allow record.field syntax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "record-dot-preprocessor_0_2_6" = callPackage ({ mkDerivation, base, extra, filepath, ghc, record-hasfield , uniplate }: @@ -211380,7 +210971,6 @@ self: { testHaskellDepends = [ base extra filepath record-hasfield ]; description = "Preprocessor to allow record.field syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "record-encode" = callPackage @@ -248089,24 +247679,6 @@ self: { }) {}; "tasty-lua" = callPackage - ({ mkDerivation, base, bytestring, directory, file-embed, filepath - , hslua, tasty, tasty-hunit, text - }: - mkDerivation { - pname = "tasty-lua"; - version = "0.2.2"; - sha256 = "0m75dffrj6ziaalrch91kzj76ki0chbf33pi7mrx0c1gzmpvn8gv"; - libraryHaskellDepends = [ - base bytestring file-embed hslua tasty text - ]; - testHaskellDepends = [ - base directory filepath hslua tasty tasty-hunit - ]; - description = "Write tests in Lua, integrate into tasty"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-lua_0_2_3" = callPackage ({ mkDerivation, base, bytestring, directory, file-embed, filepath , hslua, tasty, tasty-hunit, text }: @@ -248122,7 +247694,6 @@ self: { ]; description = "Write tests in Lua, integrate into tasty"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-mgolden" = callPackage @@ -258828,28 +258399,22 @@ self: { "turtle" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , containers, criterion, directory, doctest, exceptions, fail - , foldl, hostname, managed, optional-args, optparse-applicative - , process, semigroups, stm, streaming-commons, system-fileio - , system-filepath, temporary, text, time, transformers, unix - , unix-compat + , containers, criterion, directory, doctest, exceptions, foldl + , hostname, managed, optional-args, optparse-applicative, process + , stm, streaming-commons, system-fileio, system-filepath, temporary + , text, time, transformers, unix, unix-compat }: mkDerivation { pname = "turtle"; - version = "1.5.19"; - sha256 = "06hxmhz1i6f5r8k3bf5h54g4ahjsvxhv44sa4xiy52rz6qp0211g"; - revision = "1"; - editedCabalFile = "1z0wjrd25k7zc0bvsy1cxicfml0sdchs7sfr6fz5jlnlggpbn0fq"; + version = "1.5.20"; + sha256 = "1dk8ddp1p77l7gbg81ryqrkaxhrj3an24mx572b5wmhmjmbjfk9l"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args - optparse-applicative process semigroups stm streaming-commons - system-fileio system-filepath temporary text time transformers unix - unix-compat - ]; - testHaskellDepends = [ - base doctest fail system-filepath temporary + optparse-applicative process stm streaming-commons system-fileio + system-filepath temporary text time transformers unix unix-compat ]; + testHaskellDepends = [ base doctest system-filepath temporary ]; benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; @@ -266506,6 +266071,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-sized_1_4_2" = callPackage + ({ mkDerivation, adjunctions, base, binary, comonad, deepseq + , distributive, finite-typelits, hashable, indexed-list-literals + , primitive, vector + }: + mkDerivation { + pname = "vector-sized"; + version = "1.4.2"; + sha256 = "02a7jzik6a6w1xb6bwpvl6hmii6jgi9wr0q7p48bfbq0mlqjv42h"; + libraryHaskellDepends = [ + adjunctions base binary comonad deepseq distributive + finite-typelits hashable indexed-list-literals primitive vector + ]; + description = "Size tagged vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { @@ -268195,41 +267778,6 @@ self: { }) {}; "wai-app-static" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , containers, cryptonite, directory, file-embed, filepath, hspec - , http-date, http-types, memory, mime-types, mockery, network - , old-locale, optparse-applicative, template-haskell, temporary - , text, time, transformers, unix-compat, unordered-containers, wai - , wai-extra, warp, zlib - }: - mkDerivation { - pname = "wai-app-static"; - version = "3.1.7.1"; - sha256 = "10k6jb450p89r6dgpnwh428gg0wfw2qbx9n126jkvbchcjr1f4v8"; - revision = "1"; - editedCabalFile = "0bkmml30rzifvb7nxddj3pxczk0kniahra19mjn0qrkzy1n5752p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring containers cryptonite - directory file-embed filepath http-date http-types memory - mime-types old-locale optparse-applicative template-haskell text - time transformers unix-compat unordered-containers wai wai-extra - warp zlib - ]; - executableHaskellDepends = [ - base bytestring containers directory mime-types text - ]; - testHaskellDepends = [ - base bytestring filepath hspec http-date http-types mime-types - mockery network old-locale temporary text time transformers - unix-compat wai wai-extra zlib - ]; - description = "WAI application for static serving"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-app-static_3_1_7_2" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , containers, cryptonite, directory, file-embed, filepath, hspec , http-date, http-types, memory, mime-types, mockery, network @@ -268260,7 +267808,6 @@ self: { ]; description = "WAI application for static serving"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-cli" = callPackage @@ -278521,20 +278068,21 @@ self: { }) {}; "yesod-auth-oauth2" = callPackage - ({ mkDerivation, aeson, base, bytestring, errors, hoauth2, hspec - , http-client, http-conduit, http-types, microlens, random - , safe-exceptions, text, uri-bytestring, yesod-auth, yesod-core + ({ mkDerivation, aeson, base, bytestring, cryptonite, errors + , hoauth2, hspec, http-client, http-conduit, http-types, memory + , microlens, safe-exceptions, text, uri-bytestring, yesod-auth + , yesod-core }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.6.1.2"; - sha256 = "07jm60q1fbdk53ncirbi8clsimg28k9j12kaq0vx2apn2rlmdy2w"; + version = "0.6.1.3"; + sha256 = "0vgxc5xsdhxws8jasngd66pmy4nmz5768fibfzn5m4dc0f5sw4mr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring errors hoauth2 http-client http-conduit - http-types microlens random safe-exceptions text uri-bytestring - yesod-auth yesod-core + aeson base bytestring cryptonite errors hoauth2 http-client + http-conduit http-types memory microlens safe-exceptions text + uri-bytestring yesod-auth yesod-core ]; testHaskellDepends = [ base hspec uri-bytestring ]; description = "OAuth 2.0 authentication plugins"; From fe1b9ebaf1874e6adb7ceb556c97d85ca81ea0ab Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 20 Aug 2020 20:09:28 +0200 Subject: [PATCH 341/520] nixos/fontconfig: fix local.conf regression Another part of edf2541f02c6b24ea791710d5cadeae36f9b1a3a was missed while rebasing https://github.com/NixOS/nixpkgs/pull/93562, resulting in incorrect path as described by https://github.com/NixOS/nixpkgs/issues/86601#issuecomment-675462227 --- nixos/modules/config/fonts/fontconfig.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 1b6848c652e..1f1044bc5af 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -190,13 +190,6 @@ let ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \ $dst/ - # update 51-local.conf path to look at local.conf - rm $dst/51-local.conf - - substitute ${pkg.out}/etc/fonts/conf.d/51-local.conf \ - $dst/51-local.conf \ - --replace local.conf /etc/fonts/${pkg.configVersion}/local.conf - # 00-nixos-cache.conf ln -s ${cacheConf} $dst/00-nixos-cache.conf From 911b44e763416d103247601fb52f28179f0146a2 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Thu, 20 Aug 2020 14:15:23 -0400 Subject: [PATCH 342/520] fujprog: init at 4.6 --- .../tools/misc/fujprog/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/misc/fujprog/default.nix diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/tools/misc/fujprog/default.nix new file mode 100644 index 00000000000..61aeea9967d --- /dev/null +++ b/pkgs/development/tools/misc/fujprog/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkgconfig +, libftdi1 +, libusb-compat-0_1 +}: + +stdenv.mkDerivation rec { + pname = "fujprog"; + version = "4.6"; + + src = fetchFromGitHub { + owner = "kost"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "04l5rrfrp3pflwz5ncwvb4ibbsqib2259m23bzfi8m80aj216shd"; + }; + + nativeBuildInputs = [ + cmake + pkgconfig + ]; + + buildInputs = [ + libftdi1 + libusb-compat-0_1 + ]; + + meta = with stdenv.lib; { + description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards."; + homepage = "https://github.com/kost/fujprog"; + license = licenses.bsd2; + maintainers = with maintainers; [ trepetti ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c6d61f7099..b97ac8e9e7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10745,6 +10745,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; + fujprog = callPackage ../development/tools/misc/fujprog { }; + funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; gede = libsForQt5.callPackage ../development/tools/misc/gede { }; From 96b6e5bc1212d410a08771c974c22dfb668af746 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 20 Aug 2020 10:35:49 +0200 Subject: [PATCH 343/520] bomutils: init at 0.2 --- pkgs/tools/archivers/bomutils/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/archivers/bomutils/default.nix diff --git a/pkgs/tools/archivers/bomutils/default.nix b/pkgs/tools/archivers/bomutils/default.nix new file mode 100644 index 00000000000..fc68184be31 --- /dev/null +++ b/pkgs/tools/archivers/bomutils/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "bomutils"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "hogliux"; + repo = pname; + rev = version; + sha256 = "1i7nhbq1fcbrjwfg64znz8p4l7662f7qz2l6xcvwd5z93dnmgmdr"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/hogliux/bomutils"; + description = "Open source tools to create bill-of-materials files used in macOS installers"; + platforms = platforms.all; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a15825b5a6..bfe17300a49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2483,6 +2483,8 @@ in bogofilter = callPackage ../tools/misc/bogofilter { }; + bomutils = callPackage ../tools/archivers/bomutils { }; + bsdbuild = callPackage ../development/tools/misc/bsdbuild { }; bsdiff = callPackage ../tools/compression/bsdiff { }; From cd9b4e02d0be7d215cb3a8bd383d52fd66b29d97 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Sun, 31 May 2020 18:18:15 +0200 Subject: [PATCH 344/520] nodePackages.tsun: add typescript to NODE_PATH This package has typescript as dependency, but it is specified as peer dependency which is not reflected via the nodePackages generation script which is using node2nix which is requiring `--include-peer-dependencies` to include such dependencies. In order to be able to run this package stand alone, it needs to add the typescript module to the NODE_PATH. Fix #88046 --- pkgs/development/node-packages/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 2ceef0f477f..6768c6834dc 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -131,6 +131,14 @@ let ''; }; + tsun = super.tsun.overrideAttrs (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/tsun" \ + --prefix NODE_PATH : ${self.typescript}/lib/node_modules + ''; + }); + stf = super.stf.override { meta.broken = since "10"; }; From 531cf77114a84c68c16e25813533cef75156078c Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 11 Jul 2020 11:53:55 +0200 Subject: [PATCH 345/520] labelImg: 1.8.1 -> 1.8.3 Switch to python3 and qt5 libraries also --- .../machine-learning/labelimg/default.nix | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index a952fb559ce..05c56b0b095 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -1,20 +1,31 @@ -{ stdenv, python2Packages, fetchurl }: - python2Packages.buildPythonApplication rec { +{ stdenv, python3Packages, fetchFromGitHub, qt5 }: + python3Packages.buildPythonApplication rec { pname = "labelImg"; - version = "1.8.1"; - src = fetchurl { - url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz"; - sha256 = "1banpkpbrny1jx3zsgs544xai62z5yvislbq782a5r47gv2f2k4a"; + version = "1.8.3"; + src = fetchFromGitHub { + owner = "tzutalin"; + repo = "labelImg"; + rev = "v${version}"; + sha256 = "07v106fzlmxrbag4xm06m4mx9m0gckb27vpwsn7sap1bbgc1pap5"; }; - nativeBuildInputs = with python2Packages; [ - pyqt4 + nativeBuildInputs = with python3Packages; [ + pyqt5 + qt5.wrapQtAppsHook ]; - propagatedBuildInputs = with python2Packages; [ - pyqt4 + propagatedBuildInputs = with python3Packages; [ + pyqt5 lxml + sip ]; preBuild = '' - make qt4py2 + make qt5py3 + ''; + postInstall = '' + cp libs/resources.py $out/${python3Packages.python.sitePackages}/libs + ''; + dontWrapQtApps = true; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with stdenv.lib; { description = "LabelImg is a graphical image annotation tool and label object bounding boxes in images"; From f04daaa23a1939460a22ff8beaf9ccdef3c30707 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 19 Aug 2020 07:49:04 +0200 Subject: [PATCH 346/520] =?UTF-8?q?python.nbxmpp:=200.6.10=20=E2=86=92=201?= =?UTF-8?q?.0.2;=20gajim:=201.1.3=20=E2=86=92=201.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../instant-messengers/gajim/default.nix | 30 ++++++++++--------- .../python-modules/nbxmpp/default.nix | 16 ++++------ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 930d288c365..2ee017dfdba 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -2,12 +2,13 @@ # Native dependencies , python3, gtk3, gobject-introspection, gnome3 +, glib-networking # Test dependencies , xvfb_run, dbus # Optional dependencies -, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly, libnice +, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-good, libnice , enableE2E ? true , enableSecrets ? true, libsecret , enableRST ? true, docutils @@ -19,32 +20,33 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - majorVersion = "1.1"; - version = "${majorVersion}.3"; + version = "1.2.2"; src = fetchurl { - url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2"; - sha256 = "0bzxwcpdd4ydh6d6mzpr0gxwhcb0x9ympk55fpvm1hcw9d28a716"; + url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; + sha256 = "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"; }; - postPatch = '' - # This test requires network access - echo "" > test/integration/test_resolver.py - ''; - buildInputs = [ - gobject-introspection gtk3 gnome3.adwaita-icon-theme wrapGAppsHook - ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly libnice ] + gobject-introspection gtk3 gnome3.adwaita-icon-theme + glib-networking + ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] ++ lib.optional enableSecrets libsecret ++ lib.optional enableSpelling gspell ++ lib.optional enableUPnP gupnp-igd; nativeBuildInputs = [ - gettext + gettext wrapGAppsHook ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + propagatedBuildInputs = with python3.pkgs; [ - nbxmpp pyasn1 pygobject3 dbus-python pillow cssutils precis-i18n keyring setuptools + nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ] ++ lib.optional enableRST docutils ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 0f84486674e..fb1945ddf42 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchzip, pyopenssl, python }: +{ stdenv, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }: let pname = "nbxmpp"; - version = "0.6.10"; + version = "1.0.2"; name = "${pname}-${version}"; in buildPythonPackage { inherit pname version; @@ -11,16 +11,12 @@ in buildPythonPackage { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "1w31a747mj9rvlp3n20z0fnvyvihphkgkyr22sk2kap3migw8vai"; + sha256 = "1rhzsakqrybzq5j5b9400wjd14pncph47c1ggn5a6f3di03lk4az"; }; - propagatedBuildInputs = [ pyopenssl ]; - - checkPhase = '' - # Disable tests requiring networking - echo "" > test/unit/test_xmpp_transports_nb2.py - ${python.executable} test/runtests.py - ''; + buildInputs = [ precis-i18n ]; + checkInputs = [ gobject-introspection libsoup pygobject3 ]; + propagatedBuildInputs = [ idna pyopenssl ]; meta = with stdenv.lib; { homepage = "https://dev.gajim.org/gajim/python-nbxmpp"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9380fa235d9..4433fed2de3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26316,7 +26316,8 @@ in fuse-emulator = callPackage ../misc/emulators/fuse-emulator {}; gajim = callPackage ../applications/networking/instant-messengers/gajim { - inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly; + inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; + gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; gammu = callPackage ../applications/misc/gammu { }; From 13276abce97fae047ff42604646c0fca58338de9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 21 Aug 2020 00:21:02 +0200 Subject: [PATCH 347/520] emacs25: Drop outdated version --- pkgs/applications/editors/emacs/25.nix | 146 ------------------ pkgs/development/compilers/mozart/default.nix | 3 +- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 24 +-- pkgs/top-level/release-small.nix | 2 +- 5 files changed, 5 insertions(+), 171 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/25.nix diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix deleted file mode 100644 index 5bc29a046bc..00000000000 --- a/pkgs/applications/editors/emacs/25.nix +++ /dev/null @@ -1,146 +0,0 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, fetchpatch -, 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, webkitgtk, wrapGAppsHook ? null, glib-networking ? null -, withCsrc ? true -, 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 && webkitgtk != 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"; - }) - ] ++ [ - # Backport patches so we can use webkitgtk with xwidgets. - (fetchpatch { - name = "0001-Omit-unnecessary-includes-from-xwidget-c.patch"; - url = "https://github.com/emacs-mirror/emacs/commit/a36ed9b5e95afea5716256bac24d883263aefbaf.patch"; - sha256 = "1j34c0vkj87il87xy1px23yk6bw73adpr7wqa79ncj89i4lc8qkb"; - }) - (fetchpatch { - name = "0002-xwidget-Use-WebKit2-API.patch"; - url = "https://github.com/emacs-mirror/emacs/commit/d781662873f228b110a128f7a2b6583a4d5e0a3a.patch"; - sha256 = "1lld56zi4cw2hmjxhhdcc0f07k8lbj32h10wcq4ml3asdwa31ryr"; - }) - ]; - - nativeBuildInputs = [ pkgconfig 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) [ webkitgtk glib-networking ] - ++ 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 = '' - ./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 = "https://www.gnu.org/software/emacs/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 peti 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/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index b8951c8c800..d2c2d98e411 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -9,7 +9,6 @@ , llvmPackages_5 , gmp , emacs -, emacs25-nox , jre_headless , tcl , tk @@ -73,7 +72,7 @@ in stdenv.mkDerivation rec { llvmPackages_5.clang llvmPackages_5.clang-unwrapped gmp - emacs25-nox + emacs jre_headless tcl tk diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d1eb331c5bb..9f959c8d16e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -114,7 +114,6 @@ mapAliases ({ docker_compose = docker-compose; # 2018-11-10 draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14 dwarf_fortress = dwarf-fortress; # added 2016-01-23 - emacsMelpa = emacs25Packages; # for backward compatibility emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bede1b52fdf..e3fee57f252 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9305,7 +9305,9 @@ in mosml = callPackage ../development/compilers/mosml { }; - mozart2 = callPackage ../development/compilers/mozart { }; + mozart2 = callPackage ../development/compilers/mozart { + emacs = emacs-nox; + }; mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; @@ -19899,24 +19901,6 @@ in withGTK3 = false; })); - emacs25 = callPackage ../applications/editors/emacs/25.nix { - # use override to enable additional features - libXaw = xorg.libXaw; - Xaw3d = null; - gconf = null; - alsaLib = null; - imagemagick = null; - acl = null; - gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; - }; - - emacs25-nox = lowPrio (appendToName "nox" (emacs25.override { - withX = false; - withGTK2 = false; - withGTK3 = false; - })); - emacsMacport = callPackage ../applications/editors/emacs/macport.nix { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit @@ -19948,10 +19932,8 @@ in }; }; - emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25); emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26); - emacs25WithPackages = emacs25Packages.emacsWithPackages; emacs26WithPackages = emacs26Packages.emacsWithPackages; emacsWithPackages = emacsPackages.emacsWithPackages; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 031acba4d23..7f84f02f006 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -38,7 +38,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; dhcp = linux; diffutils = all; e2fsprogs = linux; - emacs25 = linux; + emacs = linux; enscript = all; file = all; findutils = all; From d339f8379d14e25e29206b945787ec010047f08d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 21 Aug 2020 00:22:18 +0200 Subject: [PATCH 348/520] emacs: emacs26 -> emacs27 The attribute names were wrong --- .../editors/emacs-modes/updater-emacs.nix | 2 +- pkgs/top-level/all-packages.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/pkgs/applications/editors/emacs-modes/updater-emacs.nix index 518ee67e451..b5de993eaa7 100644 --- a/pkgs/applications/editors/emacs-modes/updater-emacs.nix +++ b/pkgs/applications/editors/emacs-modes/updater-emacs.nix @@ -1,7 +1,7 @@ let pkgs = import ../../../.. {}; - emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs26).emacsWithPackages (epkgs: let + emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: let promise = epkgs.trivialBuild { pname = "promise"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3fee57f252..2b1f8345caf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19878,11 +19878,11 @@ in elvis = callPackage ../applications/editors/elvis { }; - emacs = emacs26; - emacsPackages = emacs26Packages; - emacs-nox = emacs26-nox; + emacs = emacs27; + emacsPackages = emacs27Packages; + emacs-nox = emacs27-nox; - emacs26 = callPackage ../applications/editors/emacs { + emacs27 = callPackage ../applications/editors/emacs { # use override to enable additional features libXaw = xorg.libXaw; Xaw3d = null; @@ -19894,7 +19894,7 @@ in inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; - emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { + emacs27-nox = lowPrio (appendToName "nox" (emacs27.override { withX = false; withNS = false; withGTK2 = false; @@ -19932,9 +19932,9 @@ in }; }; - emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26); + emacs27Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs27); - emacs26WithPackages = emacs26Packages.emacsWithPackages; + emacs27WithPackages = emacs27Packages.emacsWithPackages; emacsWithPackages = emacsPackages.emacsWithPackages; inherit (gnome3) empathy; From d1fdc67c539e9e69bcd54470e0576a28a8d9ff10 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 21 Aug 2020 00:34:15 +0200 Subject: [PATCH 349/520] nixos/editors: Remove any explicit mention of Emacs 25 --- nixos/modules/services/editors/emacs.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 74c60014dce..05f87df43bc 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -53,11 +53,11 @@ emacs - emacs25 + emacs - The latest stable version of Emacs 25 using the + The latest stable version of Emacs using the GTK 2 widget toolkit. @@ -66,11 +66,11 @@ - emacs25-nox + emacs-nox - Emacs 25 built without any dependency on X11 libraries. + Emacs built without any dependency on X11 libraries. @@ -79,11 +79,11 @@ emacsMacport - emacs25Macport + emacsMacport - Emacs 25 with the "Mac port" patches, providing a more native look and + Emacs with the "Mac port" patches, providing a more native look and feel under macOS. From 967259e6b495c19aa367d598e8d20d73475d2cfc Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 21 Aug 2020 00:54:00 +0200 Subject: [PATCH 350/520] emacs: Factor out expression to a generic build --- pkgs/applications/editors/emacs/27.nix | 8 ++++++++ .../emacs/{default.nix => generic.nix} | 20 +++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 pkgs/applications/editors/emacs/27.nix rename pkgs/applications/editors/emacs/{default.nix => generic.nix} (96%) diff --git a/pkgs/applications/editors/emacs/27.nix b/pkgs/applications/editors/emacs/27.nix new file mode 100644 index 00000000000..1037c0cd91d --- /dev/null +++ b/pkgs/applications/editors/emacs/27.nix @@ -0,0 +1,8 @@ +import ./generic.nix (rec { + version = "27.1"; + sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a"; + patches = [ + ./clean-env.patch + ./tramp-detect-wrapped-gvfsd.patch + ]; +}) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/generic.nix similarity index 96% rename from pkgs/applications/editors/emacs/default.nix rename to pkgs/applications/editors/emacs/generic.nix index dfa917ac572..69bb51e10f2 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -1,3 +1,11 @@ +{ + version + , sha256 + , versionModifier ? "" + , pname ? "emacs" + , name ? "emacs-${version}${versionModifier}" + , patches ? [ ] +}: { stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm , Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux @@ -32,25 +40,17 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; let - version = "27.1"; - versionModifier = ""; - name = "emacs-${version}${versionModifier}"; in stdenv.mkDerivation { - inherit name version; + inherit pname version; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a"; + inherit sha256; }; enableParallelBuilding = true; - patches = [ - ./clean-env.patch - ./tramp-detect-wrapped-gvfsd.patch - ]; - postPatch = lib.concatStringsSep "\n" [ (lib.optionalString srcRepo '' rm -fr .git diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b1f8345caf..aad9a4fe13c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19882,7 +19882,7 @@ in emacsPackages = emacs27Packages; emacs-nox = emacs27-nox; - emacs27 = callPackage ../applications/editors/emacs { + emacs27 = callPackage ../applications/editors/emacs/27.nix { # use override to enable additional features libXaw = xorg.libXaw; Xaw3d = null; From edd6216a00437161ddbb658f6d9c9271daa70942 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 21 Aug 2020 00:58:17 +0200 Subject: [PATCH 351/520] emacs26: Add back at version 26.3 --- pkgs/applications/editors/emacs/26.nix | 8 +++++++ .../editors/emacs/clean-env-26.patch | 15 ++++++++++++ .../emacs/tramp-detect-wrapped-gvfsd-26.patch | 14 +++++++++++ pkgs/top-level/all-packages.nix | 24 +++++++++++++++++-- 4 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/editors/emacs/26.nix create mode 100644 pkgs/applications/editors/emacs/clean-env-26.patch create mode 100644 pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch diff --git a/pkgs/applications/editors/emacs/26.nix b/pkgs/applications/editors/emacs/26.nix new file mode 100644 index 00000000000..a151006a995 --- /dev/null +++ b/pkgs/applications/editors/emacs/26.nix @@ -0,0 +1,8 @@ +import ./generic.nix (rec { + version = "26.3"; + sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"; + patches = [ + ./clean-env-26.patch + ./tramp-detect-wrapped-gvfsd-26.patch + ]; +}) diff --git a/pkgs/applications/editors/emacs/clean-env-26.patch b/pkgs/applications/editors/emacs/clean-env-26.patch new file mode 100644 index 00000000000..88befda899a --- /dev/null +++ b/pkgs/applications/editors/emacs/clean-env-26.patch @@ -0,0 +1,15 @@ +Dump temacs in an empty environment to prevent -dev paths from ending +up in the dumped image. + +diff --git a/src/Makefile.in b/src/Makefile.in +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -535,7 +535,7 @@ ifeq ($(CANNOT_DUMP),yes) + ln -f temacs$(EXEEXT) $@ + else + unset EMACS_HEAP_EXEC; \ +- 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/tramp-detect-wrapped-gvfsd-26.patch b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch new file mode 100644 index 00000000000..5d16194fd20 --- /dev/null +++ b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch @@ -0,0 +1,14 @@ +diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el +index f370abba31..f2806263a9 100644 +--- a/lisp/net/tramp-gvfs.el ++++ b/lisp/net/tramp-gvfs.el +@@ -164,7 +164,8 @@ tramp-gvfs-enabled + (and (featurep 'dbusbind) + (tramp-compat-funcall 'dbus-get-unique-name :system) + (tramp-compat-funcall 'dbus-get-unique-name :session) +- (or (tramp-compat-process-running-p "gvfs-fuse-daemon") ++ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped") ++ (tramp-compat-process-running-p "gvfs-fuse-daemon") + (tramp-compat-process-running-p "gvfsd-fuse")))) + "Non-nil when GVFS is available.") + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aad9a4fe13c..500d023829f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19881,6 +19881,7 @@ in emacs = emacs27; emacsPackages = emacs27Packages; emacs-nox = emacs27-nox; + emacsWithPackages = emacsPackages.emacsWithPackages; emacs27 = callPackage ../applications/editors/emacs/27.nix { # use override to enable additional features @@ -19901,6 +19902,25 @@ in withGTK3 = false; })); + emacs26 = callPackage ../applications/editors/emacs/26.nix { + # use override to enable additional features + libXaw = xorg.libXaw; + Xaw3d = null; + gconf = null; + alsaLib = null; + imagemagick = null; + acl = null; + gpm = null; + inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; + }; + + emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { + withX = false; + withNS = false; + withGTK2 = false; + withGTK3 = false; + })); + emacsMacport = callPackage ../applications/editors/emacs/macport.nix { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit @@ -19932,10 +19952,10 @@ in }; }; + emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26); emacs27Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs27); - + emacs26WithPackages = emacs26Packages.emacsWithPackages; emacs27WithPackages = emacs27Packages.emacsWithPackages; - emacsWithPackages = emacsPackages.emacsWithPackages; inherit (gnome3) empathy; From 87883f86b62ba9122877dc2a357bd406d574cf85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Aug 2020 02:30:31 +0200 Subject: [PATCH 352/520] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-13-g52041eb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/ece47fbda9c7e3f4074d2a4dc36ff5b335d74b78. --- .../haskell-modules/hackage-packages.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 78fac57babb..fccd74ad5f5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -43984,17 +43984,17 @@ self: { }) {}; "boolector" = callPackage - ({ mkDerivation, base, boolector, c2hs, Cabal, containers - , directory, mtl, temporary, time + ({ mkDerivation, base, boolector, c2hs, containers, directory, mtl + , temporary, time }: mkDerivation { pname = "boolector"; - version = "0.0.0.12"; - sha256 = "10lmc0rcza22w3mv3l0z97w2d4nymylglv3sz4ffnpkcc2cinz41"; - setupHaskellDepends = [ base Cabal ]; + version = "0.0.0.13"; + sha256 = "0by1pw9i0f9kb81pd3ivi0rz9yxxzvmlg338p45wqf1k583c6jrg"; libraryHaskellDepends = [ base containers directory mtl temporary time ]; + librarySystemDepends = [ boolector ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base ]; testSystemDepends = [ boolector ]; @@ -60547,6 +60547,8 @@ self: { pname = "configuration-tools"; version = "0.5.0"; sha256 = "0pgx2wzzqxgafgf3qjys05hp89lz4fwczsx0i581n8ngs3p4i0wh"; + revision = "1"; + editedCabalFile = "0srscnmj5dhaq0djx0lhcggl53ipn6pw8vgsvgzhhjrbmnn2zb2p"; setupHaskellDepends = [ base bytestring Cabal directory filepath process ]; @@ -70087,8 +70089,8 @@ self: { }: mkDerivation { pname = "debug-me"; - version = "1.20190926"; - sha256 = "0qy2ianwal4v4s0m13yjszk032dp3y6k4p61whwmlp49xmqvwjyb"; + version = "1.20200820"; + sha256 = "1pxcycgdd0gmiqabpbjkish31yb2n7bqgwd1fm1na6w6xmjlh58a"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -114483,8 +114485,8 @@ self: { }: mkDerivation { pname = "hascard"; - version = "0.2.1.0"; - sha256 = "13f7vmdrd3ibr78pjy7144qj0qa8s07k4j341fzw8w8af83m9wvc"; + version = "0.3.0.1"; + sha256 = "17f08qqwdzala1ldyarp841gpjl9iayi1440r77n8bkzcq3hpl54"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194965,10 +194967,8 @@ self: { ({ mkDerivation, base, containers, network, stm, text }: mkDerivation { pname = "pickle"; - version = "1.0.0.0"; - sha256 = "066vla7x4ls59rhx9adr4lqx9yi5d047vcy90wgqh3lmnm7nj77m"; - revision = "1"; - editedCabalFile = "10fbbygp1w79h8spmcdwz56vl0gw761rfvb731fhmsvm35390jd9"; + version = "1.0.1.0"; + sha256 = "13c1n06v6mh9lyplfg0y1gdijk2mhxg4ln59v7i2z4j1y65y8cz9"; libraryHaskellDepends = [ base containers network stm text ]; description = "Instant StatsD in Haskell"; license = stdenv.lib.licenses.mit; @@ -228185,8 +228185,8 @@ self: { ({ mkDerivation, base, containers, dhall, filepath, shake, text }: mkDerivation { pname = "shake-dhall"; - version = "0.1.0.0"; - sha256 = "1nhc6sfzsr7adv6xh8r2fyp64gzkiv563xqwmvhmk3pi3zxnlcll"; + version = "0.1.1.0"; + sha256 = "1nqcgcxcm6p0w99zvm5g4g7yda1k9sfwxf1jq2jk8rfbkk49sz7g"; libraryHaskellDepends = [ base containers dhall filepath shake text ]; From 24d5c73aa81b95e5aedcb92bc93e0a865a84885e Mon Sep 17 00:00:00 2001 From: wchresta <34962284+wchresta@users.noreply.github.com> Date: Sun, 16 Aug 2020 23:41:02 -0400 Subject: [PATCH 353/520] idris2: Enable --install, bugfixes This removes the need of the bin/idris2_app folder and replaces it with proper links to the nix-storage folders. This allows the user to override IDRIS2_PREFIX which will allow them to use --install to install libraries. * Fix: idris2_app/ was exposed in bin/ * Remove native Idris2 wrapper that set LD_LIBRARY_PATH * Improve new Idris2 wrapper to set Idris2 paths to out folders --- pkgs/development/compilers/idris2/default.nix | 41 +++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index f0785aead84..5bde4bbb720 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -4,7 +4,7 @@ # Uses scheme to bootstrap the build of idris2 stdenv.mkDerivation rec { - name = "idris2"; + pname = "idris2"; version = "0.2.1"; src = fetchFromGitHub { @@ -30,9 +30,42 @@ stdenv.mkDerivation rec { checkTarget = "bootstrap-test"; - # idris2 needs to find scheme at runtime to compile - postInstall = '' - wrapProgram "$out/bin/idris2" --set CHEZ "${chez}/bin/scheme" + # TODO: Move this into its own derivation, such that this can be changed + # without having to recompile idris2 every time. + postInstall = let + includedLibs = [ "base" "contrib" "network" "prelude" ]; + name = "${pname}-${version}"; + packagePaths = builtins.map (l: "$out/${name}/" + l) includedLibs; + additionalIdris2Paths = builtins.concatStringsSep ":" packagePaths; + in '' + # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH + rm $out/bin/idris2 + # Move actual idris2 binary + mv $out/bin/idris2_app/idris2.so $out/bin/idris2 + + # After moving the binary, there is nothing left in idris2_app that isn't + # either contained in lib/ or is useless to us. + rm $out/bin/idris2_app/* + rmdir $out/bin/idris2_app + + # idris2 needs to find scheme at runtime to compile + # idris2 installs packages with --install into the path given by PREFIX. + # Since PREFIX is in nix-store, it is immutable so --install does not work. + # If the user redefines PREFIX to be able to install packages, idris2 will + # not find the libraries and packages since all paths are relative to + # PREFIX by default. + # We explicitly make all paths to point to nix-store, such that they are + # independent of what IDRIS2_PREFIX is. This allows the user to redefine + # IDRIS2_PREFIX and use --install as expected. + # TODO: Make support libraries their own derivation such that + # overriding LD_LIBRARY_PATH is unnecessary + # TODO: Maybe set IDRIS2_PREFIX to the users home directory + wrapProgram "$out/bin/idris2" \ + --set-default CHEZ "${chez}/bin/scheme" \ + --suffix IDRIS2_LIBS ':' "$out/${name}/lib" \ + --suffix IDRIS2_DATA ':' "$out/${name}/support" \ + --suffix IDRIS2_PATH ':' "${additionalIdris2Paths}" \ + --suffix LD_LIBRARY_PATH ':' "$out/${name}/lib" ''; meta = { From 71dd85bffaf717f80873ab9428aac871a9ba1a0c Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Sun, 16 Aug 2020 12:34:51 +0200 Subject: [PATCH 354/520] cri-o: add pinns path and witch to crio.conf.d config style This adds the pinns path to the configuration let CRI-O start properly. We also change the configuration to the new drop-in syntax. Signed-off-by: Sascha Grunert --- nixos/modules/virtualisation/cri-o.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index f267c97b178..f8a75d3faa5 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -85,7 +85,7 @@ in environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; - environment.etc."crio/crio.conf".text = '' + environment.etc."crio/crio.conf.d/00-default.conf".text = '' [crio] storage_driver = "${cfg.storageDriver}" @@ -100,6 +100,7 @@ in cgroup_manager = "systemd" log_level = "${cfg.logLevel}" manage_ns_lifecycle = true + pinns_path = "${cfg.package}/bin/pinns" ${optionalString (cfg.runtime != null) '' default_runtime = "${cfg.runtime}" From a3b69f46af28caf2bed70b080d3e55338a5c7498 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Tue, 11 Aug 2020 23:10:25 -0400 Subject: [PATCH 355/520] go_1_15: 1.15beta1 -> 1.15 --- pkgs/development/compilers/go/1.15.nix | 4 ++-- .../compilers/go/ssl-cert-file-1.15.patch | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index cd6d5faaabb..b3851741c69 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -31,11 +31,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15beta1"; + version = "1.15"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1h1sg6j9jac5bw2pjrd13bf4nr18prs89147izdhzbhp896sikbq"; + sha256 = "0fmc53pamxxbvmp5bcvh1fhffirpv3gz6y7qz97iacpmsiz8yhv9"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.15.patch b/pkgs/development/compilers/go/ssl-cert-file-1.15.patch index cca48eb5705..1884c681ca3 100644 --- a/pkgs/development/compilers/go/ssl-cert-file-1.15.patch +++ b/pkgs/development/compilers/go/ssl-cert-file-1.15.patch @@ -1,16 +1,16 @@ diff --git a/src/crypto/x509/root_darwin_amd64.go b/src/crypto/x509/root_darwin_amd64.go -index 8ad5a9607d..1d6091cf83 100644 +index ce88de025e..258ecc45d1 100644 --- a/src/crypto/x509/root_darwin_amd64.go +++ b/src/crypto/x509/root_darwin_amd64.go -@@ -8,6 +8,7 @@ import ( +@@ -10,6 +10,7 @@ import ( "bytes" - "crypto/x509/internal/macOS" + macOS "crypto/x509/internal/macos" "fmt" + "io/ioutil" "os" "strings" ) -@@ -23,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate +@@ -25,6 +26,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate var loadSystemRootsWithCgo func() (*CertPool, error) func loadSystemRoots() (*CertPool, error) { @@ -25,10 +25,10 @@ index 8ad5a9607d..1d6091cf83 100644 var trustedRoots []*Certificate untrustedRoots := make(map[string]bool) -diff --git a/src/crypto/x509/root_darwin_arm64.go b/src/crypto/x509/root_darwin_arm64.go -index 2fb079ba66..6a072f3e78 100644 ---- a/src/crypto/x509/root_darwin_arm64.go -+++ b/src/crypto/x509/root_darwin_arm64.go +diff --git a/src/crypto/x509/root_darwin_ios.go b/src/crypto/x509/root_darwin_ios.go +index 5ecc4911b3..14b4205c00 100644 +--- a/src/crypto/x509/root_darwin_ios.go ++++ b/src/crypto/x509/root_darwin_ios.go @@ -6,6 +6,11 @@ package x509 From 73b2f83560751036c1575ae8763bdd4fac225e47 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Fri, 21 Aug 2020 08:26:02 +0200 Subject: [PATCH 356/520] jellyfin: 10.6.2 -> 10.6.3 --- pkgs/servers/jellyfin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 9194681d63b..5ae355ab8b2 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.6.2"; + version = "10.6.3"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://repo.jellyfin.org/releases/server/portable/stable/combined/jellyfin_${version}.tar.gz"; - sha256 = "16yib2k9adch784p6p0whgfb6lrjzwiigg1n14cp88dx64hyhxhb"; + sha256 = "bqGIXS+T82jGMObMPMyYSjzQ+qZnACW4Q7WpV948crc="; }; buildInputs = [ From d559c776a1308662651fd032a1ad10b01736168a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 21 Aug 2020 16:28:54 +1000 Subject: [PATCH 357/520] shfmt: fix failing test on go 1.15 --- pkgs/tools/text/shfmt/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 43c945ac769..ec58cbdd1a9 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "shfmt"; @@ -17,6 +17,14 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + patches = [ + # fix failing test on go 1.15, remove with > 3.1.2 + (fetchpatch { + url = "https://github.com/mvdan/sh/commit/88956f97dae1f268af6c030bf2ba60762ebb488a.patch"; + sha256 = "1zg8i7kklr12zjkaxh8djd2bzkdx8klgfj271r2wivkc2x61shgv"; + }) + ]; + meta = with lib; { homepage = "https://github.com/mvdan/sh"; description = "A shell parser and formatter"; From 89567e206406672ba156ba44e23f93cc215a8223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 15 Aug 2020 07:58:24 +0200 Subject: [PATCH 358/520] llvmPackages_rocm: 3.5.1 -> 3.7.0 --- pkgs/development/compilers/llvm/rocm/clang.nix | 3 +-- pkgs/development/compilers/llvm/rocm/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/llvm/rocm/clang.nix b/pkgs/development/compilers/llvm/rocm/clang.nix index 86853a97c93..6bb23b77543 100644 --- a/pkgs/development/compilers/llvm/rocm/clang.nix +++ b/pkgs/development/compilers/llvm/rocm/clang.nix @@ -4,7 +4,6 @@ , python , llvm , clang-tools-extra_src ? null -, rocm-runtime , lld , version @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ]; - buildInputs = [ llvm rocm-runtime ]; + buildInputs = [ llvm ]; hardeningDisable = [ "all" ]; diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index e90818d8505..d29a2bda330 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, callPackage, wrapCCWith }: let - version = "3.5.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - sha256 = "03k2xp8wf4awf1zcjc2hb3kf9bqp567c3s569gp1q3q1zjg6r2ib"; + sha256 = "02p0s041wwsi4q0dhs1sj5l6059y02s31az505h0f22agz3jnpfn"; }; in rec { clang = wrapCCWith rec { From acc68bba6a2d846572a4019b9c33e2c1810b7599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 15 Aug 2020 07:59:31 +0200 Subject: [PATCH 359/520] rocm-device-libs: 3.5.1 -> 3.7.0 --- pkgs/development/libraries/rocm-device-libs/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index dcdbb1cb6d1..c1878700aaa 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -5,23 +5,22 @@ , clang-unwrapped , lld , llvm -, rocm-runtime }: stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "3.5.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - sha256 = "180bx05l293hrhzk2ymx41j5lhskysywvx33igbbsngzailwsc22"; + sha256 = "1sg7wzj2mi5vhba53cp52gnya7c799f0p325ig262vi70r7mr7n2"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ clang lld llvm rocm-runtime ]; + buildInputs = [ clang lld llvm ]; cmakeBuildType = "Release"; From d4e40af5898539faec5f65d47a67fd603733a5aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 21 Aug 2020 08:40:30 +0200 Subject: [PATCH 360/520] rocm-runtime: 3.5.0 -> 3.7.0 --- .../libraries/rocm-runtime/default.nix | 31 ++++++++++--------- .../libraries/rocm-runtime/rocr-ext-dir.diff | 23 -------------- pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 19 insertions(+), 39 deletions(-) delete mode 100644 pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diff diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 7470784d489..6f573adabe1 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -1,41 +1,42 @@ { stdenv , fetchFromGitHub , addOpenGLRunpath +, clang-unwrapped , cmake +, xxd , elfutils +, llvm +, rocm-device-libs , rocm-thunk }: stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "3.5.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - sha256 = "028x1f0if6lw41cpfpysp82ikp6c3fdxxd2a6ixs0vpm4424svb1"; + sha256 = "1lm4cbx1d727zll85vjc1kykc72mk82nfhyyhjljv82gd4mnz00c"; }; sourceRoot = "source/src"; - buildInputs = [ cmake elfutils ]; + nativeBuildInputs = [ cmake xxd ]; - cmakeFlags = [ "-DCMAKE_PREFIX_PATH=${rocm-thunk}" ]; + buildInputs = [ clang-unwrapped elfutils llvm ]; - # Use the ROCR_EXT_DIR environment variable and/or OpenGL driver - # link path to try to find binary-only ROCm runtime extension - # libraries. Without this change, we would have to rely on - # LD_LIBRARY_PATH to let the HSA runtime discover the shared - # libraries. - patchPhase = '' - substitute '${./rocr-ext-dir.diff}' ./rocr-ext-dir.diff \ - --subst-var-by rocrExtDir "${addOpenGLRunpath.driverLink}/lib/rocm-runtime-ext" - patch -p2 < ./rocr-ext-dir.diff + cmakeFlags = [ + "-DBITCODE_DIR=${rocm-device-libs}/lib" + "-DCMAKE_PREFIX_PATH=${rocm-thunk}" + ]; + + postPatch = '' + patchShebangs image/blit_src/create_hsaco_ascii_file.sh ''; fixupPhase = '' - rm -r $out/lib $out/include - mv $out/hsa/lib $out/hsa/include $out + rm -rf $out/hsa ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diff b/pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diff deleted file mode 100644 index 21ffe7d8c34..00000000000 --- a/pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/core/runtime/runtime.cpp b/src/core/runtime/runtime.cpp -index dd6a15c..fb6de49 100644 ---- a/src/core/runtime/runtime.cpp -+++ b/src/core/runtime/runtime.cpp -@@ -1358,7 +1358,17 @@ void Runtime::LoadExtensions() { - core::HsaApiTable::HSA_EXT_FINALIZER_API_TABLE_ID); - - // Update Hsa Api Table with handle of Image extension Apis -- extensions_.LoadImage(kImageLib[os_index(os::current_os)]); -+ // -+ // Use ROCR_EXT_DIR when it is non-empty. Otherwise, try to load the -+ // library from the OpenGL driver path. -+ std::string extDirVar = os::GetEnvVar("ROCR_EXT_DIR"); -+ if (!extDirVar.empty()) { -+ extensions_.LoadImage(extDirVar + "/" + kImageLib[os_index(os::current_os)]); -+ } else { -+ std::string globalDriverDir("@rocrExtDir@"); -+ extensions_.LoadImage(globalDriverDir + "/" + kImageLib[os_index(os::current_os)]); -+ } -+ - hsa_api_table_.LinkExts(&extensions_.image_api, - core::HsaApiTable::HSA_EXT_IMAGE_API_TABLE_ID); - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0964ed81cb9..0ccc4d05c1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9354,7 +9354,9 @@ in inherit (llvmPackages_rocm) clang clang-unwrapped lld llvm; }; - rocm-runtime = callPackage ../development/libraries/rocm-runtime { }; + rocm-runtime = callPackage ../development/libraries/rocm-runtime { + inherit (llvmPackages_rocm) clang-unwrapped llvm; + }; rocm-runtime-ext = callPackage ../development/libraries/rocm-runtime-ext { }; From f511f4359261eccdd5c79aa623705d765c31d17f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 15 Aug 2020 08:01:33 +0200 Subject: [PATCH 361/520] rocm-comgr: 3.5.0 -> 3.7.0 --- pkgs/development/libraries/rocm-comgr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index c86b081a14c..22fbc0e998a 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "3.5.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - sha256 = "0h9bxz98sskgzc3xpnp469iq1wi59nbijbqprlylha91y10hqb88"; + sha256 = "1r7arfdqfh6pfvjza6x2dzd5gjmkndngrp688d3n2ab92n5ijiqf"; }; sourceRoot = "source/lib/comgr"; From 8c2bc9a8c093811e42ec0524d78f8a954500866a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 21 Aug 2020 06:50:43 +0200 Subject: [PATCH 362/520] rocm-cmake: 3.5.0 -> 3.7.0 This only bumps the tag. But the tag points at the same commit, so no sha256 changes. --- pkgs/development/tools/build-managers/rocm-cmake/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 41149522e72..f146929019f 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "3.5.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; From e0ef874e676da1dfb2107a450ed46248baa4dfad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 21 Aug 2020 08:38:43 +0200 Subject: [PATCH 363/520] rocclr: 3.5.0 -> 3.7.0 --- pkgs/development/libraries/rocclr/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 6b561b3c9dd..4e0836946c1 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -10,24 +10,25 @@ , libelf , libglvnd , libX11 +, numactl }: stdenv.mkDerivation rec { pname = "rocclr"; - version = "3.5.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; - rev = "roc-${version}"; - sha256 = "0j70lxpwrdrb1v4lbcyzk7kilw62ip4py9fj149d8k3x5x6wkji1"; + rev = "rocm-${version}"; + sha256 = "0sx4irbmjgs5bm8dc8jc9fl1jmfdnrp3ar14hdhrsmbani7gqah3"; }; nativeBuildInputs = [ cmake rocm-cmake ]; buildInputs = [ clang rocm-comgr rocm-runtime rocm-thunk ]; - propagatedBuildInputs = [ libelf libglvnd libX11 ]; + propagatedBuildInputs = [ libelf libglvnd libX11 numactl ]; prePatch = '' substituteInPlace CMakeLists.txt \ @@ -45,10 +46,9 @@ stdenv.mkDerivation rec { ]; preFixup = '' - mv $out/include/include/* $out/include - ln -s $out/include/compiler/lib/include/* $out/include/include ln -s $out/include/compiler/lib/include/* $out/include - sed "s|^\([[:space:]]*IMPORTED_LOCATION_RELEASE \).*|\1 \"$out/lib/libamdrocclr_static.a\"|" -i $out/lib/cmake/amdrocclr_staticTargets.cmake + substituteInPlace $out/lib/cmake/rocclr/ROCclrConfig.cmake \ + --replace "/build/source/build" "$out" ''; meta = with stdenv.lib; { From 29775a4175205f055f5f4a003d7489f4bf764758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 21 Aug 2020 08:41:17 +0200 Subject: [PATCH 364/520] rocm-opencl-runtime: 3.5.0 -> 3.7.0 --- .../libraries/rocm-opencl-runtime/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 0c7ce260217..dba1533d81e 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -5,7 +5,8 @@ , rocm-cmake , clang , clang-unwrapped -, libGLU +, glew +, libglvnd , libX11 , lld , llvm @@ -18,20 +19,15 @@ , rocm-thunk }: -let - version = "3.5.0"; - tag = "roc-${version}"; -in stdenv.mkDerivation rec { - inherit version; - +stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; + version = "3.7.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; - rev = tag; - sha256 = "1wrr6mmn4gf6i0vxp4yqk0ny2wglvj1jfj50il8czjwy0cwmhykk"; - name = "ROCm-OpenCL-Runtime-${tag}-src"; + rev = "rocm-${version}"; + sha256 = "15rz11a8qwvxmd0kkaikj04q1glfg9sgqqblcqp3iahr3by8z0wd"; }; nativeBuildInputs = [ cmake rocm-cmake ]; @@ -39,7 +35,8 @@ in stdenv.mkDerivation rec { buildInputs = [ clang clang-unwrapped - libGLU + glew + libglvnd libX11 lld llvm From cc47462054fdb5ef5097065bd51a6147b0f3a37b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 15 Aug 2020 08:05:24 +0200 Subject: [PATCH 365/520] rocm-opencl-icd: set version to rocm-opencl-runtime.version --- pkgs/development/libraries/rocm-opencl-icd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/rocm-opencl-icd/default.nix b/pkgs/development/libraries/rocm-opencl-icd/default.nix index 6830d956193..5f2188f6e7e 100644 --- a/pkgs/development/libraries/rocm-opencl-icd/default.nix +++ b/pkgs/development/libraries/rocm-opencl-icd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-icd"; - version = "3.5.0"; + version = rocm-opencl-runtime.version; dontUnpack = true; From 5ce029d582d3841b3f5707e8f501a913b31f6d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 21 Aug 2020 08:44:15 +0200 Subject: [PATCH 366/520] rocm-runtime-ext: remove --- .../libraries/rocm-runtime-ext/default.nix | 42 ------------------- .../libraries/rocm-runtime-ext/setup-hook.sh | 7 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 pkgs/development/libraries/rocm-runtime-ext/default.nix delete mode 100644 pkgs/development/libraries/rocm-runtime-ext/setup-hook.sh diff --git a/pkgs/development/libraries/rocm-runtime-ext/default.nix b/pkgs/development/libraries/rocm-runtime-ext/default.nix deleted file mode 100644 index 3962804306a..00000000000 --- a/pkgs/development/libraries/rocm-runtime-ext/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, autoPatchelfHook, rpmextract, rocm-runtime }: - -stdenv.mkDerivation rec { - pname = "rocm-runtime-ext"; - version = "3.5.1"; - - src = fetchurl { - url = "https://repo.radeon.com/rocm/yum/3.5.1/hsa-ext-rocr-dev-1.1.30501.0-rocm-rel-3.5-34-def83d8a-Linux.rpm"; - sha256 = "0r7lrmnplr10hs6wrji55i3dnczfzlmp8jahm1g3mhq2x12zmly0"; - }; - - nativeBuildInputs = [ autoPatchelfHook rpmextract ]; - - buildInputs = [ rocm-runtime stdenv.cc.cc ]; - - unpackPhase = "rpmextract ${src}"; - - installPhase = '' - mkdir -p $out/lib - cp -R opt/rocm-${version}/hsa/lib $out/lib/rocm-runtime-ext - ''; - - setupHook = ./setup-hook.sh; - - meta = with stdenv.lib; { - description = "Platform runtime for ROCm (closed-source extensions)"; - longDescription = '' - This package provides closed-source extensions to the ROCm - runtime. Currently this adds support for OpenCL image - processing. - - In order for the ROCm runtime to pick up the extension, you - should either set the ROCR_EXT_DIR environment variable should - be set to ''${rocm-runtime-ext}/lib/rocm-runtime-ext or this - package should be added to the hardware.opengl.extraPackages - NixOS configuration option. - ''; - homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; - license = with licenses; [ unfreeRedistributable ]; - maintainers = with maintainers; [ danieldk ]; - }; -} diff --git a/pkgs/development/libraries/rocm-runtime-ext/setup-hook.sh b/pkgs/development/libraries/rocm-runtime-ext/setup-hook.sh deleted file mode 100644 index 150d65570e6..00000000000 --- a/pkgs/development/libraries/rocm-runtime-ext/setup-hook.sh +++ /dev/null @@ -1,7 +0,0 @@ -addRocmRuntimeExtDir () { - if [[ -z "${ROCR_EXT_DIR-}" ]]; then - export ROCR_EXT_DIR="@out@/lib/rocm-runtime-ext" - fi -} - -addEnvHooks "$hostOffset" addRocmRuntimeExtDir diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 19d1218e3db..df39ab73da4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -455,6 +455,7 @@ mapAliases ({ rhc = throw "deprecated in 2019-04-09: abandoned by upstream."; rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 + rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21 rssglx = rss-glx; #added 2015-03-25 recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ccc4d05c1a..47fb33c4c45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9358,8 +9358,6 @@ in inherit (llvmPackages_rocm) clang-unwrapped llvm; }; - rocm-runtime-ext = callPackage ../development/libraries/rocm-runtime-ext { }; - # Python >= 3.8 still gives a bunch of warnings. rocm-smi = python37.pkgs.callPackage ../tools/system/rocm-smi { }; From 95e50896078c249ecb57c2cbf36a553d2880f47d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 21 Aug 2020 08:46:44 +0200 Subject: [PATCH 367/520] nixos/manual: remove references to rocm-runtime-ext rocm-runtime-ext is not needed anymore for OpenCL image support. --- nixos/doc/manual/configuration/gpu-accel.xml | 25 +------------------- 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/nixos/doc/manual/configuration/gpu-accel.xml b/nixos/doc/manual/configuration/gpu-accel.xml index 9928121a56e..251e5c26ba4 100644 --- a/nixos/doc/manual/configuration/gpu-accel.xml +++ b/nixos/doc/manual/configuration/gpu-accel.xml @@ -70,35 +70,12 @@ Platform Vendor Advanced Micro Devices, Inc. Core Next (GCN) GPUs are supported through the rocm-opencl-icd package. Adding this package to enables OpenCL - support. However, OpenCL Image support is provided through the - non-free rocm-runtime-ext package. This package can - be added to the same configuration option, but requires that - allowUnfree option is is enabled for nixpkgs. Full - OpenCL support on supported AMD GPUs is thus enabled as follows: + support: = [ rocm-opencl-icd - rocm-runtime-ext ]; - - - It is also possible to use the OpenCL Image extension without a - system-wide installation of the rocm-runtime-ext - package by setting the ROCR_EXT_DIR environment - variable to the directory that contains the extension: - - $ export \ -ROCR_EXT_DIR=`nix-build '<nixpkgs>' --no-out-link -A rocm-runtime-ext`/lib/rocm-runtime-ext - - - - With either approach, you can verify that OpenCL Image support - is indeed working with the clinfo command: - - $ clinfo | grep Image - Image support Yes -
From f3a1a087e8a85303bc03e5b2770f6318a135dfb8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Aug 2020 07:42:07 +0200 Subject: [PATCH 368/520] ocamlPackages.uunf: re-generate source from the Unicode Character Database --- .../ocaml-modules/uunf/default.nix | 38 ++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index aa251742628..1d0e5b2bcd9 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,21 +1,50 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner }: +{ stdenv, fetchurl, unzip, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner, uucd }: let pname = "uunf"; webpage = "https://erratique.ch/software/${pname}"; + version = "13.0.0"; + ucdxml = fetchurl { + url = "http://www.unicode.org/Public/${version}/ucdxml/ucd.all.grouped.zip"; + sha256 = "04gpl09ggb6fb0kmk6298rd8184dv6vcscn28l1gpdv1yjlw1a8q"; + }; + gen = fetchurl { + url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen.ml"; + sha256 = "08j2mpi7j6q3rqc6bcdwspqn1s7pkkphznxfdycqjv4h9yaqsymj"; + }; + gen_norm = fetchurl { + url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen_norm.ml"; + sha256 = "11vx5l5bag6bja7qj8jv4s2x9fknj3557n0mj87k2apq5gs5f4m5"; + }; + gen_props = fetchurl { + url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen_props.ml"; + sha256 = "0a6lhja498kp9lxql0pbfvkgvajs10wx88wkqc7y5m3lrvw46268"; + }; in assert stdenv.lib.versionAtLeast ocaml.version "4.03"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml-${pname}-${version}"; - version = "13.0.0"; + inherit version; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; sha256 = "1qci04nkp24kdls1z4s8kz5dzgky4nwd5r8345nwdrgwmxhw7ksm"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner ]; + postConfigure = '' + rm -f src/uunf_data.ml + mkdir -p support/ + cp ${gen} support/gen.ml + cp ${gen_norm} support/gen_norm.ml + cp ${gen_props} support/gen_props.ml + funzip ${ucdxml} > support/ucd.xml + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/build_support.ml + ''; + + nativeBuildInputs = [ unzip ]; + + buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner uucd ]; propagatedBuildInputs = [ uchar ]; @@ -27,6 +56,5 @@ stdenv.mkDerivation rec { platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - broken = stdenv.isAarch64; }; } From 1a6f998619fa0f93a10aeb1b4e0763535076960a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 21 Aug 2020 01:13:15 -0700 Subject: [PATCH 369/520] vimPlugins.dracula-vim: fix name --- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index bbe0bf273db..6b521cadfc3 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -83,7 +83,7 @@ digitaltoad/vim-pug direnv/direnv.vim dleonard0/pony-vim-syntax dmix/elvish.vim -dracula/vim +dracula/vim as dracula-vim drewtempelmeyer/palenight.vim drmingdrmer/xptemplate dylanaraps/wal.vim From 40970bee0ea64784c72237ba062ad838cb1f4361 Mon Sep 17 00:00:00 2001 From: "\"Jonathan Ringer\"" <"jonringer117@gmail.com"> Date: Fri, 21 Aug 2020 01:11:18 -0700 Subject: [PATCH 370/520] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 234 ++++++++++++++-------------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 56a49061e33..0db9069b748 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-08-14"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "5ceda0164c5fae0d61fd51d4c9e083b27abdc9d2"; - sha256 = "1bq3q6sqxb6ihipnm1hv8yyj78yl9wygv6xr9xafy0zk338sg7ph"; + rev = "2b785688ead505dcbc1007374d3dca9914aa247a"; + sha256 = "1n91vm354fd45vvg4skvx7s9mpjpsk1l61n2x5ylqr8dlm7vgjkw"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -425,24 +425,24 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-08-15"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "294ee401d81656ff9e383e98b9d963a6c0edaf44"; - sha256 = "0s8fnzimk26rzrkky13si2iacw0nahyvcvicv3g8xc28sppddvd4"; + rev = "341ea7db0ab85a2ecb3a067ca721c1327fcd7013"; + sha256 = "0gqs6xdnmg33xraxqv10jl7dhaca19dlidmc86zdki2hg1bckr9b"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2020-08-08"; + version = "2020-08-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "eef63ac3807ff32fe60743b4041dc293f76401bf"; - sha256 = "1m1nzrzy7c5ggl87adbla9zcnaqr3dvx72sd3mcfxq5g9qglr2gk"; + rev = "5a768cd395fc94e0448c596fafaf5f78d15fb968"; + sha256 = "019mb2v7ldyzjjh86kxyxrbrgyf9chgp0f0nkwk0fiwf2qi2141y"; }; meta.homepage = "https://github.com/neoclide/coc-git/"; }; @@ -557,12 +557,12 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-08-15"; + version = "2020-08-19"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "b2d58e9e352afcc324bc23a0359fed390e069307"; - sha256 = "0hsqb71w9ypgd2w8zwv4vmjcjyxjpk4qb67k9cwfp589nrfkw6xb"; + rev = "14c820dad44b057e2b8343f7d8896529cd973ee6"; + sha256 = "0569by8x73dpb3hapbx73x9fg2wzzb965mkkifqgdq4wdg6wizkx"; }; meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; @@ -641,12 +641,12 @@ let coc-rust-analyzer = buildVimPluginFrom2Nix { pname = "coc-rust-analyzer"; - version = "2020-08-15"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "60b75af3c86ce5c310cc39007cefcac6f36bc02a"; - sha256 = "1j4mmh45s5rchw3wf76gph4wm95kpzyql8i1dlqc7qndf06wwq37"; + rev = "ac57b7b3cdaee3cfb56b76a8fc13444337f09276"; + sha256 = "0n26d63qifhnsrpwq8x587mh9y83rmayc2car222hjqbrg705r28"; }; meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; }; @@ -677,12 +677,12 @@ let coc-solargraph = buildVimPluginFrom2Nix { pname = "coc-solargraph"; - version = "2020-08-08"; + version = "2020-08-16"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-solargraph"; - rev = "66d1ca9d5fd10927d618561b81447a22f6929a6a"; - sha256 = "0i48hzgsnn9ghk41c885nslwv8hi98ym6yzcsayncs2vasv7gcnl"; + rev = "e61385cc483768afc8d8c064b5c98baa474d0d9c"; + sha256 = "1hiy12h85z8m6i4nc92jpi6z0zph8rpdmgb75czhy5y0cjwkn59q"; }; meta.homepage = "https://github.com/neoclide/coc-solargraph/"; }; @@ -749,12 +749,12 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2020-08-08"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "47d3dba90a52eb1126cda486fb788e76404dc668"; - sha256 = "1s0xnk0f1hqp9nkcqzn31wfjl5sq9qpwriim946wbjg0cfng1xh2"; + rev = "e4f3ab555b35a0057d22dcc8bb7b7af7e43546d6"; + sha256 = "0i1fpvbl228jhh50fbz8cppv2v20zy0zywb1qgh9hsmw6pfgjg1w"; }; meta.homepage = "https://github.com/neoclide/coc-tsserver/"; }; @@ -809,12 +809,12 @@ let coc-yaml = buildVimPluginFrom2Nix { pname = "coc-yaml"; - version = "2020-06-26"; + version = "2020-08-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-yaml"; - rev = "e3db99f415a1439b44548473fbaa3f79df4f383e"; - sha256 = "0aij94s5jak5g2myd6xmcwx5aclpvgcbg9nwxqzkij5m24wpi23n"; + rev = "a453c70b2507d66e48a2d4e89f78cb5f340f140f"; + sha256 = "0av0jv0g01cpkf5rsicniq7maa6c509bc3gs5piczf5za990nrsx"; }; meta.homepage = "https://github.com/neoclide/coc-yaml/"; }; @@ -1086,12 +1086,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-08-14"; + version = "2020-08-19"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "c533595c435e776297e84ff739eb6bf84523cf22"; - sha256 = "1y6fwy6hrdpf3znkrcbfj1gk0agdcl80a6i2027qlsar1k7w2pyp"; + rev = "1cfffcff2aba8a7b819f8b27414021d451abb4ce"; + sha256 = "0ysnkwv9hk84i4rdglrmjms24nh9i5x5qvr8lyzrjzzp8zj7qs2l"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1122,12 +1122,12 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2020-08-15"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "denite-git"; - rev = "6992366697e5509c405c0ae8386cca91a186fd0b"; - sha256 = "1iqlf7669qxf80g30j5zjyx6w7hjvmylnlwcmq3rdcsyk1b0iiwy"; + rev = "281f45114ba5673d671683ee19194a4958a2da57"; + sha256 = "0j4vmljk6zvgvrj5s6ij5h5v4am7y9sd467f1fn3g6wqgm8432g6"; }; meta.homepage = "https://github.com/neoclide/denite-git/"; }; @@ -1376,12 +1376,12 @@ let dhall-vim = buildVimPluginFrom2Nix { pname = "dhall-vim"; - version = "2020-07-15"; + version = "2020-08-19"; src = fetchFromGitHub { owner = "vmchale"; repo = "dhall-vim"; - rev = "2b89ae34b07fc305741a58ba2c584a4cfc3377fc"; - sha256 = "0jnxy5wy2mf4j01rgxjirqp3pyjwhsf3z2zxdzwz1bykhlwp7xhl"; + rev = "77d1c165bcbe6bb7f9eedbeafe390c2107d3c52e"; + sha256 = "03x55x0gvf7n4i8hh6s5453mf5h43pf7kdy817q6w1149bd90vxy"; }; meta.homepage = "https://github.com/vmchale/dhall-vim/"; }; @@ -1422,6 +1422,18 @@ let meta.homepage = "https://github.com/vim-scripts/DoxygenToolkit.vim/"; }; + dracula-vim = buildVimPluginFrom2Nix { + pname = "dracula-vim"; + version = "2020-07-19"; + src = fetchFromGitHub { + owner = "dracula"; + repo = "vim"; + rev = "b64b22affafca7d3831a20949115b91031d596ec"; + sha256 = "1f5hwfcrsfq3yk53kkn4syaxmri8wh8h6rpq867468b8rdcnhq01"; + }; + meta.homepage = "https://github.com/dracula/vim/"; + }; + echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; version = "2020-06-08"; @@ -1703,12 +1715,12 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2020-08-03"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "2069a081cb83aab8ed5e275a97aa178a30cf47a0"; - sha256 = "1xj95c2hhlalf2zjp2qh414dr50cp3gly8zk4bsk82v65rdwcqv1"; + rev = "c16b0d43ca57e77081f1f23f67552efe37110b39"; + sha256 = "171w3dv3jl4mw1ikh5p688v0a8nf85h862d9zvsmdzs2v6ajigpw"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -2196,12 +2208,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-08-12"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "70237012f9be89d0ce4c0ea728f5ca8bba9818fd"; - sha256 = "18faws5vhh0v78c8xs68iklsmd9mddg2s0ha4z5adhfa6ddhbks6"; + rev = "15722c04a41d49027c7b499703fc1dac376653a8"; + sha256 = "1h94zzanzlixlmlyy3r54hk2lw9hwd49v9ij9lq3ghyc79gvhvgi"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2220,24 +2232,24 @@ let lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2020-08-04"; + version = "2020-08-17"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "deac5994a0bf6795b743d444dde11a407416ddc7"; - sha256 = "0y6cill4pwck6ajm55br2prhgj928yb94dq2wxxsrk6xw2mn0y79"; + rev = "4e0c69a53b64ac90ca5235f176a070e003108113"; + sha256 = "1rhin9pcry3sgggvkzsmxd2s4x262m4x9xdvsrshkc2zj8wy8b0i"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-08-15"; + version = "2020-08-16"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "c1883dbf23632e6c3ba0a26ba2bd8f92f5690fb3"; - sha256 = "0lkix2dbmmdp40qp5mlcmqscxs7sjg57mjjrvlsr9gg8r05dv6fq"; + rev = "1b412cf3af3dad79ee5807e6b151b8ac6aa4e2fc"; + sha256 = "074jp56m55mbvyhl5sw4pmg8ivjxqmah1kl3nyxk61hnnv1ackb3"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2580,12 +2592,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-08-02"; + version = "2020-08-16"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "2721992fa64b0c26031f514f7cce4f6b1399427f"; - sha256 = "0fp6r5zw3hn0wg6fhk1f90qcmamnxx18rwjx173d7rqap375pfgg"; + rev = "56a9d6259981d0d9c2b33a4d65ccbb674af70baa"; + sha256 = "0kn35l7kfqa0zvh1l8mdl3755hv1rx6xp5wjib9acsbk2czhg5nx"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2628,12 +2640,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-07-28"; + version = "2020-08-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "06f8fdc40262f5f6b0cec19f0e572f0477ecc022"; - sha256 = "0mdf0qpnly4y7fh02zdpx59gvvj33nd5p90cc5620y6qfld0y13y"; + rev = "b7ba77a4eb39a95ffbb6b3ff0c3c43746441b2aa"; + sha256 = "0yf55pi6d35brdva4n0x7yygjnymwbgwn1fx83nbzxhixmgbk45b"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; @@ -2724,12 +2736,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-08-14"; + version = "2020-08-18"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "23000acd7f9744667abc840dd10dd07a16e18fc6"; - sha256 = "1sapl458rrswgyqlm2pg8wxjqplryn3qnb1qqsh727ihfq5vfqjr"; + rev = "577ddc73f0a1d2fd6166ed3268ab8536111037e0"; + sha256 = "0bccr18nr42vwbb4i765yxjw18piyiyd12sm4snbkkxahp9yswf7"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2820,12 +2832,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2020-05-20"; + version = "2020-08-16"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "67c37060deba03d123c4654c1b3da426c92d6f61"; - sha256 = "0rsgpnl20pxfqcwd5gr89mkqv3im4s7v4d1cvxvi9wj0ix06pxm1"; + rev = "47b0828287b410b56ff1a31906c4d5709d143d4a"; + sha256 = "0kl2d58plpnlz2w9haadmbpmkb04bjwgfrs1scwi04mcc8dfpbmn"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -2868,12 +2880,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-08-15"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "83210fa412b5b63a6e7717ae576536b7a10f6aef"; - sha256 = "14lkzdkkkzk8xp7ambzz688mh9cvibka82gqy063w75hrnz8y8yy"; + rev = "5c0ca925af3332769f04c122ecb5bb9a5ca36dd0"; + sha256 = "0fmciqdmg5fy1jx2wind0vyykfdvdbls0lyrn85xi4c7d8yg74h2"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3613,12 +3625,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-08-03"; + version = "2020-08-17"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "a5090717dd8862be0a47a96731c6120ace544fe1"; - sha256 = "1iz26xj3mrshj0n6gpqa9xbk0i3lr0383bqdrq0yk0lp32ys5gh0"; + rev = "a81c01c29406df6aa59be221a17953c18ed57ccc"; + sha256 = "1amqxazfjnljylkj5jz3in927mkkhbvchs9pb5cnijfbvrf3dh5s"; }; meta.homepage = "https://github.com/majutsushi/tagbar/"; }; @@ -3746,12 +3758,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2020-07-13"; + version = "2020-08-19"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "d8ff43209d6464d5239db724207d588e4153767d"; - sha256 = "0gf7jdisll5cz9myh67947xwh0v8513n64jxbsh2fbxh8rq5wb21"; + rev = "b38bdda4378b17888f5132787c49d79722c25752"; + sha256 = "0q29h348pgqxqw1pqq1nsj0nxccnb2x6jd92bpsqnjf452wsh2f2"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -3888,18 +3900,6 @@ let meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; - vim = buildVimPluginFrom2Nix { - pname = "vim"; - version = "2020-07-19"; - src = fetchFromGitHub { - owner = "dracula"; - repo = "vim"; - rev = "b64b22affafca7d3831a20949115b91031d596ec"; - sha256 = "1f5hwfcrsfq3yk53kkn4syaxmri8wh8h6rpq867468b8rdcnhq01"; - }; - meta.homepage = "https://github.com/dracula/vim/"; - }; - vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; version = "2019-11-13"; @@ -4142,12 +4142,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-08-12"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "19d1990f8613fa29fccbec60aa58101faf7549c1"; - sha256 = "14wbhgarwhq4akknv79vnqvl5q2pfx6pqpb42wf6d079j54x4ay1"; + rev = "ef4666bd86ea1d6ac06a709cde0cde3df537c9e3"; + sha256 = "0rql6vbfr78pnjpbavpkdh47bh4jlzcg5pjf7xcl0273v03b6rbf"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4358,12 +4358,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-08-13"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "b51fdf94f4dec9c0e32b2a07ccd157aa3dfa6d57"; - sha256 = "0v4j192jixd8akiw4iclwkrjqix3ms5mb17gwhkcjksw4205r5zv"; + rev = "e690bde9e7838894b68f9d3d4d1a131e86c13ffb"; + sha256 = "1pl32zgwn7ffyfn8xqqlck48sqv78jv8v4pfjay0rgr3jvaxis1v"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4538,12 +4538,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2020-08-15"; + version = "2020-08-16"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "d2ccb376ebfeeef842456a7883164ef2c0d1656c"; - sha256 = "0260h5yhghyaxsbmx3imnjq1rfz5f5w60ypzr4y8p5a0bh8kvwmq"; + rev = "4694c6ea03a065a3f6ddbebce56797a21e8241ef"; + sha256 = "12bzxrdvb9s0d8llkq6h63g86qxs0gv9x7401apl6qrs79prrb4a"; }; meta.homepage = "https://github.com/ap/vim-css-color/"; }; @@ -4922,12 +4922,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-08-11"; + version = "2020-08-21"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "268a0744b9959d78a54b1257d0462e5f34fc52c5"; - sha256 = "1gk3jk8iqj41sw4wn4kqr66gxp75bs8c1fxc47n33gca8mpnr8l0"; + rev = "2de1b9bdea54baeb40bc6f3fe761309b4435d156"; + sha256 = "09m31j8cgd8pnyd4p2rh7bj74gh27df98cjy13diljaa56jd6grr"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5066,12 +5066,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-08-13"; + version = "2020-08-19"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "bd56f5690807d4a92652fe7a4d10dc08f260564e"; - sha256 = "1gd30pnmrg4422dg7g14r9z539bz8vzssyfmm6ml6kgzn0pagzi0"; + rev = "7c14e8ae5de7f4562c365249c83abc4d0e0d906c"; + sha256 = "1l96mlkfvpsa2bw9rc4m8s7abjvcfyy05gsm445rzbijqxigkknk"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5090,12 +5090,12 @@ let vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2020-03-30"; + version = "2020-08-17"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "a3ff39f955e60baeddd8c3c4d1cab291ce37d66e"; - sha256 = "0d98b0zpbyjcafp0q25c3qsx13q74nszxsi5jxxjnpz1wv6s83x1"; + rev = "1b9db5b2089751dc80a5dab9fa976a9750c3066c"; + sha256 = "14bp6knckqa8rc9xwd5cnd6cnfhi0j6vgv0yl5nin47yzv0navha"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -6159,12 +6159,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-08-14"; + version = "2020-08-18"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "a3bdbcdb3c60a9563fb90e02b28ae46cee5ef974"; - sha256 = "1h9993j9w8883hi4fllykim261srphlzv7lfww0bvr0whi77hv1r"; + rev = "0df1bfa0c5f3efb6688566d5656a330034772037"; + sha256 = "1ba96gk3qs1d2zaxs24dk624z9b9ip7yx4vg0klasf4xq8s6kwjs"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6627,12 +6627,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-08-14"; + version = "2020-08-19"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "a7486b266a5e1dc92228e575969e10b5b95efad8"; - sha256 = "05di0x6a0cd9w02l3aybixin2yidpla2js0pyx4v4as595izl10q"; + rev = "c093074fec6ba83aced4958ea44af11c5e5dff30"; + sha256 = "0919fhzpg7scm7idq4vh7kqjvlmc4037cn5d24ggsvziybi07k9p"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6771,24 +6771,24 @@ let vim-SyntaxRange = buildVimPluginFrom2Nix { pname = "vim-SyntaxRange"; - version = "2020-06-17"; + version = "2020-08-18"; src = fetchFromGitHub { owner = "inkarkat"; repo = "vim-SyntaxRange"; - rev = "63c382eabfb5dd0b1e837dc6a42b14f3fe000ff9"; - sha256 = "1c62m2k08vnla3zd3rb716y6vp5ijn8b36fv48jw77y579k9l6pk"; + rev = "602316468bc044e047db88f50157b61fa00b65cb"; + sha256 = "0zrrvd9xrivx61fiz799mdbwdzl7damdgm6i9h0sl1v95hclhi3i"; }; meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/"; }; vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2020-08-02"; + version = "2020-08-19"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "88cb2e44b60f4fa7d2e242c43ee90c5f6079e82c"; - sha256 = "1ny17d30pk8z96zr8qh9g04n57ix4pjm3sg0a80b2qq82anxkmvs"; + rev = "3476c4e517aa86bc131c707d32f2e508bd5be468"; + sha256 = "0vglazxlsg7ai4c5znxaddpjnfhz6a9slzs0kzzqvmhd3xr7vfg1"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -7120,24 +7120,24 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-08-15"; + version = "2020-08-21"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "fa412d7ad3d98446bfd3c14cf2e279226161de9d"; - sha256 = "1kpi2ygj1b7n93md66awrg9jna9q4iqzgjm95695b6403ljkpvnv"; + rev = "bf0d6c142721d3c1e3ce1f35b205655657db13c9"; + sha256 = "1z90g90h0yc9xiwl4bwbq3nawks0rzsbxr1ryy07w3qjcg7kwrdp"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2020-07-07"; + version = "2020-08-19"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "b3188a81a753a5274809a99c1550d7c981560b1b"; - sha256 = "03cqz9rnv9fwjygrr3iflcbcvr0mjdjx0l32cdr9lkaddavlwqkz"; + rev = "4a076bea73e307738ac5d08f60a0936cab391efd"; + sha256 = "1jx6ijmj48ffymfn20d0syp1ywv19gmjvf3hb6rdwsk421y58chv"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -7372,12 +7372,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-08-13"; + version = "2020-08-21"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ebb422c3c87c9f2cb333fac2b42b8e45ecc7f441"; - sha256 = "04vzv73bdiqdj1f1k62yzrdrb3qlql62sxpyq8hwc8sz1gc1kh8h"; + rev = "e14617591fcf59b638d25320215a80f437009119"; + sha256 = "10nlqbqfna5lvlk6rd4zsr5056vx2d22n6hm8sdpxp094nrqbdic"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From a3aae2271925e8f110dfdf3c9e5fde77e80663a0 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Wed, 19 Aug 2020 17:40:55 +0100 Subject: [PATCH 371/520] ocamlPackages.genspio: init at 0.0.2 with dependencies --- .../ocaml-modules/genspio/default.nix | 32 +++++++++++++++++++ .../ocaml-modules/nonstd/default.nix | 24 ++++++++++++++ .../ocaml-modules/sosa/default.nix | 30 +++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 6 ++++ 4 files changed, 92 insertions(+) create mode 100644 pkgs/development/ocaml-modules/genspio/default.nix create mode 100644 pkgs/development/ocaml-modules/nonstd/default.nix create mode 100644 pkgs/development/ocaml-modules/sosa/default.nix diff --git a/pkgs/development/ocaml-modules/genspio/default.nix b/pkgs/development/ocaml-modules/genspio/default.nix new file mode 100644 index 00000000000..7e7b3a0b9ae --- /dev/null +++ b/pkgs/development/ocaml-modules/genspio/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, buildDunePackage +, nonstd, sosa +}: + +buildDunePackage rec { + pname = "genspio"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "hammerlab"; + repo = pname; + rev = "${pname}.${version}"; + sha256 = "0cp6p1f713sfv4p2r03bzvjvakzn4ili7hf3a952b3w1k39hv37x"; + }; + + minimumOCamlVersion = "4.03"; + + propagatedBuildInputs = [ nonstd sosa ]; + + configurePhase = '' + ocaml please.mlt configure + ''; + + doCheck = true; + + meta = with lib; { + homepage = https://smondet.gitlab.io/genspio-doc/; + description = "Typed EDSL to generate POSIX Shell scripts"; + license = licenses.asl20; + maintainers = [ maintainers.alexfmpe ]; + }; +} diff --git a/pkgs/development/ocaml-modules/nonstd/default.nix b/pkgs/development/ocaml-modules/nonstd/default.nix new file mode 100644 index 00000000000..150edb3174c --- /dev/null +++ b/pkgs/development/ocaml-modules/nonstd/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromBitbucket, buildDunePackage }: + +buildDunePackage rec { + pname = "nonstd"; + version = "0.0.3"; + + minimumOCamlVersion = "4.02"; + + src = fetchFromBitbucket { + owner = "smondet"; + repo = pname; + rev = "${pname}.${version}"; + sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46"; + }; + + doCheck = true; + + meta = with lib; { + homepage = https://bitbucket.org/smondet/nonstd; + description = "Non-standard mini-library"; + license = licenses.isc; + maintainers = [ maintainers.alexfmpe ]; + }; +} diff --git a/pkgs/development/ocaml-modules/sosa/default.nix b/pkgs/development/ocaml-modules/sosa/default.nix new file mode 100644 index 00000000000..4278989341f --- /dev/null +++ b/pkgs/development/ocaml-modules/sosa/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, stdenv +, findlib, nonstd, ocaml, ocamlbuild +}: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-sosa-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "hammerlab"; + repo = "sosa"; + rev = "sosa.${version}"; + sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk"; + }; + + buildInputs = [ nonstd ocaml ocamlbuild findlib ]; + + buildPhase = "make build"; + + createFindlibDestdir = true; + + doCheck = true; + + meta = with lib; { + homepage = http://www.hammerlab.org/docs/sosa/master/index.html; + description = "Sane OCaml String API"; + license = licenses.isc; + maintainers = [ maintainers.alexfmpe ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7f2e2e1a4bd..4854a983c79 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -300,6 +300,8 @@ let gen = callPackage ../development/ocaml-modules/gen { }; + genspio = callPackage ../development/ocaml-modules/genspio { }; + gmap = callPackage ../development/ocaml-modules/gmap { }; gnuplot = callPackage ../development/ocaml-modules/gnuplot { @@ -573,6 +575,8 @@ let nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; + nonstd = callPackage ../development/ocaml-modules/nonstd { }; + notty = callPackage ../development/ocaml-modules/notty { }; npy = callPackage ../development/ocaml-modules/npy { @@ -756,6 +760,8 @@ let seq = callPackage ../development/ocaml-modules/seq { }; + sosa = callPackage ../development/ocaml-modules/sosa { }; + spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { }; From f96ec7d99439331e4b945a3fc8ee06f8882a3f02 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 21 Aug 2020 03:52:11 -0500 Subject: [PATCH 372/520] ocamlPackages.lablgtk3: propagate gtk3 (#95849) --- pkgs/applications/science/logic/coq/default.nix | 2 -- pkgs/development/ocaml-modules/lablgtk3/default.nix | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 9b9647a2ac5..946cba41b14 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -9,7 +9,6 @@ , ocamlPackages, ncurses , buildIde ? !(stdenv.isDarwin && stdenv.lib.versionAtLeast version "8.10") , glib, gnome3, wrapGAppsHook -, darwin , csdp ? null , version }: @@ -116,7 +115,6 @@ self = stdenv.mkDerivation { ++ stdenv.lib.optionals buildIde (if versionAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa else [ ocamlPackages.lablgtk ]); propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num; diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 8a45e617677..767e087a7f0 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -12,8 +12,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 ]; - propagatedBuildInputs = [ cairo2 ]; + propagatedBuildInputs = [ gtk3 cairo2 ]; meta = { description = "OCaml interface to GTK 3"; From e48ddd2270d77678a7890cb5c25f8f3a5cde42b9 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 17 Aug 2020 10:39:20 +0200 Subject: [PATCH 373/520] oci-seccomp-bpf-hook: new at 1.2.0 Add a new package for the OCI seccomp BPF hook package. Signed-off-by: Sascha Grunert --- .../oci-seccomp-bpf-hook/default.nix | 58 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/virtualization/oci-seccomp-bpf-hook/default.nix diff --git a/pkgs/applications/virtualization/oci-seccomp-bpf-hook/default.nix b/pkgs/applications/virtualization/oci-seccomp-bpf-hook/default.nix new file mode 100644 index 00000000000..0e97a7c3646 --- /dev/null +++ b/pkgs/applications/virtualization/oci-seccomp-bpf-hook/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +, go-md2man +, installShellFiles +, libseccomp +, linuxPackages +, pkg-config +}: + +buildGoModule rec { + pname = "oci-seccomp-bpf-hook"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "containers"; + repo = "oci-seccomp-bpf-hook"; + rev = "v${version}"; + sha256 = "143x4daixzhhhpli1l14r7dr7dn3q42w8dddr16jzhhwighsirqw"; + }; + vendorSha256 = null; + doCheck = false; + + outputs = [ "out" "man" ]; + nativeBuildInputs = [ + go-md2man + installShellFiles + pkg-config + ]; + buildInputs = [ + libseccomp + linuxPackages.bcc + ]; + + buildPhase = '' + make + ''; + + postBuild = '' + substituteInPlace oci-seccomp-bpf-hook.json --replace HOOK_BIN_DIR "$out/bin" + ''; + + installPhase = '' + install -Dm755 bin/* -t $out/bin + install -Dm644 oci-seccomp-bpf-hook.json -t $out + installManPage docs/*.[1-9] + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/containers/oci-seccomp-bpf-hook"; + description = '' + OCI hook to trace syscalls and generate a seccomp profile + ''; + license = licenses.asl20; + maintainers = with maintainers; [ saschagrunert ]; + platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6630d2a5d3b..528d288dfba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24612,6 +24612,8 @@ in nxengine-evo = callPackage ../games/nxengine-evo { }; + oci-seccomp-bpf-hook = callPackage ../applications/virtualization/oci-seccomp-bpf-hook { }; + odamex = callPackage ../games/odamex { }; oilrush = callPackage ../games/oilrush { }; From 1683f3ae53d76e5297248a15489ffb8abccd6d9e Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 20 Aug 2020 22:11:30 +0200 Subject: [PATCH 374/520] perlPackages.Apprainbarf: init at 1.4 Signed-off-by: Sascha Grunert --- pkgs/top-level/perl-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d623610ad71..d845fbde0d9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16716,6 +16716,24 @@ let }; }; + Apprainbarf = buildPerlModule { + pname = "Apprainbarf"; + version = "1.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SY/SYP/App-rainbarf-1.4.tar.gz"; + sha256 = "4f139ad35faaf2de0623dc0bb1dd89fa5a431e548bfec87dee194cf0e25cc97d"; + }; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/rainbarf + ''; + meta = { + homepage = "https://github.com/creaktive/rainbarf"; + description = "CPU/RAM/battery stats chart bar for tmux (and GNU screen)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Razor2ClientAgent = buildPerlPackage { pname = "Razor2-Client-Agent"; version = "2.86"; From 1d43f3490e7b2e872c262b8f6f0e3ebfcbc00991 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 21 Aug 2020 12:37:33 +0200 Subject: [PATCH 375/520] php: use system-sendmail By default PHP is looking for sendmail in /usr/bin/sendmail which isn't a correct path for NixOS. --- pkgs/development/interpreters/php/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 53d435ebb82..8921cf78aa8 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -8,7 +8,7 @@ let { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 - , systemd, valgrind, xcbuild + , systemd, system-sendmail, valgrind, xcbuild , version , sha256 @@ -195,6 +195,10 @@ let ++ lib.optional systemdSupport "--with-fpm-systemd" ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" ++ lib.optional ztsSupport "--enable-maintainer-zts" + + + # Sendmail + ++ [ "PROG_SENDMAIL=${system-sendmail}/bin/sendmail" ] ; hardeningDisable = [ "bindnow" ]; From 7682995e84b4e0d6ba23872184e10474285da41c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Aug 2020 12:56:30 +0200 Subject: [PATCH 376/520] haskell-configuration-common: cosmetic --- .../haskell-modules/configuration-common.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fabd05f586a..5eb95757d3a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1452,9 +1452,9 @@ self: super: { # brittany has an aeson upper bound of 1.5 brittany = doJailbreak super.brittany; }; -in { - haskell-language-server = dontCheck (super.haskell-language-server.overrideScope hlsScopeOverride); - hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride); - fourmolu = super.fourmolu.overrideScope hlsScopeOverride; -} + in { + haskell-language-server = dontCheck (super.haskell-language-server.overrideScope hlsScopeOverride); + hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride); + fourmolu = super.fourmolu.overrideScope hlsScopeOverride; + } ) // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From cebfd6929a07c26baf57d7f2813758d2174c7dd1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Aug 2020 13:07:06 +0200 Subject: [PATCH 377/520] haskell-hspec-core: needs latest QuickCheck to compile tests --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5eb95757d3a..6c9855eaef9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -296,7 +296,6 @@ self: super: { hs2048 = dontCheck super.hs2048; hsbencher = dontCheck super.hsbencher; hsexif = dontCheck super.hsexif; - hspec-core = if pkgs.stdenv.isi686 then dontCheck super.hspec-core else super.hspec-core; # tests rely on `Int` being 64-bit; https://github.com/hspec/hspec/issues/431 hspec-server = dontCheck super.hspec-server; HTF = dontCheck super.HTF; htsn = dontCheck super.htsn; @@ -1437,6 +1436,11 @@ self: super: { doCheck = false; }); + # tests rely on `Int` being 64-bit: https://github.com/hspec/hspec/issues/431 + hspec-core = let hspec-core = super.hspec-core.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_14_1; }); in + if pkgs.stdenv.isi686 then dontCheck hspec-core else hspec-core; + QuickCheck_2_14_1 = super.QuickCheck_2_14_1.override { splitmix = dontCheck super.splitmix_0_1_0_1; }; + # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let From 9d5733098b9431022f4cdcefec3a2d3364087948 Mon Sep 17 00:00:00 2001 From: Julien Coolen Date: Tue, 11 Aug 2020 14:33:59 +0200 Subject: [PATCH 378/520] ocamlPackages.jwto: init at 0.3.0 (#95173) --- .../ocaml-modules/jwto/default.nix | 30 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/ocaml-modules/jwto/default.nix diff --git a/pkgs/development/ocaml-modules/jwto/default.nix b/pkgs/development/ocaml-modules/jwto/default.nix new file mode 100644 index 00000000000..a4cf0aae691 --- /dev/null +++ b/pkgs/development/ocaml-modules/jwto/default.nix @@ -0,0 +1,30 @@ +{ lib, buildDunePackage, fetchFromGitHub, alcotest, cryptokit, fmt, yojson +, base64, re, ppx_deriving }: + +buildDunePackage rec { + pname = "jwto"; + version = "0.3.0"; + + minimumOCamlVersion = "4.05"; + + src = fetchFromGitHub { + owner = "sporto"; + repo = "jwto"; + rev = version; + sha256 = "1p799zk8j9c0002xzi2x7ndj1bzqf14744ampcqndrjnsi7mq71s"; + }; + + propagatedBuildInputs = + [ cryptokit fmt yojson base64 re ppx_deriving ]; + + checkInputs = [ alcotest ]; + + doCheck = true; + + meta = { + homepage = "https://github.com/sporto/jwto"; + description = "JSON Web Tokens (JWT) for OCaml"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Zimmi48 jtcoolen ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4854a983c79..f47fd2fbcfa 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -431,6 +431,8 @@ let jsonm = callPackage ../development/ocaml-modules/jsonm { }; + jwto = callPackage ../development/ocaml-modules/jwto { }; + kafka = callPackage ../development/ocaml-modules/kafka { }; ke = callPackage ../development/ocaml-modules/ke { }; From 60fc2dd607d89f6938cab6f3c27aa6e21730fb68 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Aug 2020 13:45:17 +0200 Subject: [PATCH 379/520] pythonPackages.mocket: 3.8.7 -> 3.8.8 --- pkgs/development/python-modules/mocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index fa469b619a1..3ff85f9f5c7 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.8.7"; + version = "3.8.8"; src = fetchPypi { inherit pname version; - sha256 = "1zj2p20blf4p071kcs86h2c9sc964x6sahff60gg7y4d2c0iq3rs"; + sha256 = "0yqls2hqmfs6i4p2nb89j5icyrqwabalsmwfixfvbjir4fmgad2l"; }; patchPhase = '' From fcd447bfed52b95d8e63314c0e8ab3c01649dfdc Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 21 Aug 2020 14:26:28 +0200 Subject: [PATCH 380/520] pythonPackages.avro: 1.9.2 -> 1.10.0 (#95790) pythonPackages.avro: 1.9.2 -> 1.10.0 --- .../python-modules/avro/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 58c3b46cdba..fbda87404f6 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -1,20 +1,30 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pycodestyle, isort }: +{ stdenv, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }: buildPythonPackage rec { pname = "avro"; - version = "1.9.2"; - disabled = isPy3k; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "4487f0e91d0d44142bd08b3c6da57073b720c3effb02eeb4e2e822804964c56b"; + sha256 = "00rg1nn9szwm0p1lcda0w3iyqy9mx2y9zv0hdwaz6k0bsagziydv"; }; + patchPhase = '' + # this test requires network access + sed -i 's/test_server_with_path/noop/' avro/test/test_ipc.py + '' + (stdenv.lib.optionalString isPy3k '' + # these files require twisted, which is not python3 compatible + rm avro/txipc.py + rm avro/test/txsample* + ''); + nativeBuildInputs = [ pycodestyle ]; propagatedBuildInputs = [ isort ]; meta = with stdenv.lib; { description = "A serialization and RPC framework"; homepage = "https://pypi.python.org/pypi/avro/"; + license = licenses.asl20; + maintainers = [ maintainers.zimbatm ]; }; } From b88ac0415c16a4064eaf6387620474bcc00b945c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 21 Aug 2020 14:33:26 +0200 Subject: [PATCH 381/520] rocm-opencl-runtime: remove clinfo from the output --- .../libraries/rocm-opencl-runtime/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index dba1533d81e..90bc206a7bc 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -60,6 +60,12 @@ stdenv.mkDerivation rec { dontStrip = true; + # Remove clinfo, which is already provided through the + # `clinfo` package. + postInstall = '' + rm -rf $out/bin + ''; + # Fix the ICD installation path for NixOS postPatch = '' substituteInPlace khronos/icd/loader/linux/icd_linux.c \ @@ -67,10 +73,6 @@ stdenv.mkDerivation rec { echo 'add_dependencies(amdocl64 OpenCL)' >> amdocl/CMakeLists.txt ''; - preFixup = '' - patchelf --set-rpath "$out/lib" $out/bin/clinfo - ''; - meta = with stdenv.lib; { description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; From a770258f82b32b4398d2dc79219bb51d054dee06 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Fri, 21 Aug 2020 14:39:46 +0200 Subject: [PATCH 382/520] lutris: 0.5.6 -> 0.5.7.1 --- pkgs/applications/misc/lutris/default.nix | 9 ++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 99e24eea158..b3a68cffeff 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -8,7 +8,6 @@ , gobject-introspection , gst_all_1 , gtk3 -, libgnome-keyring , libnotify , pango , webkitgtk @@ -22,6 +21,7 @@ , pygobject3 , pyyaml , requests +, keyring # commands that lutris needs , xrandr @@ -71,13 +71,13 @@ let in buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.6"; + version = "0.5.7.1"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - sha256 = "1f78qhyy8xqdg0rhxcwkap1bmg5mfxhb8qw1vbpxr6g62ajpwksa"; + sha256 = "12ispwkbbm5aq263n3bdjmjfkpwplizacnqs2c0wnag4zj4kpm29"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -88,14 +88,13 @@ in buildPythonApplication rec { gnome-desktop gobject-introspection gtk3 - libgnome-keyring libnotify pango webkitgtk ] ++ gstDeps; propagatedBuildInputs = [ - evdev distro pyyaml pygobject3 requests pillow dbus-python + evdev distro pyyaml pygobject3 requests pillow dbus-python keyring ]; # avoid double wrapping diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 528d288dfba..27552408dc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21366,7 +21366,7 @@ in luppp = callPackage ../applications/audio/luppp { }; lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { - inherit (gnome3) gnome-desktop libgnome-keyring; + inherit (gnome3) gnome-desktop; wine = wineWowPackages.staging; }; lutris = callPackage ../applications/misc/lutris/fhsenv.nix { From 4a87da1b1011ed78584b64e51863ac24ba6b6a1d Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Tue, 11 Aug 2020 16:10:40 +1000 Subject: [PATCH 383/520] pandoc-plantuml-filter: init at 0.1.2 --- .../misc/pandoc-plantuml-filter/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/pandoc-plantuml-filter/default.nix diff --git a/pkgs/tools/misc/pandoc-plantuml-filter/default.nix b/pkgs/tools/misc/pandoc-plantuml-filter/default.nix new file mode 100644 index 00000000000..61a0f14d597 --- /dev/null +++ b/pkgs/tools/misc/pandoc-plantuml-filter/default.nix @@ -0,0 +1,26 @@ +{ buildPythonApplication +, fetchPypi +, pandocfilters +, lib +}: + +buildPythonApplication rec { + pname = "pandoc-plantuml-filter"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "08673mfwxsw6s52mgglbdz7ybb68svqyr3s9w97d7rifbwvvc9ia"; + }; + + propagatedBuildInputs = [ + pandocfilters + ]; + + meta = with lib; { + homepage = "https://github.com/timofurrer/pandoc-plantuml-filter"; + description = "Pandoc filter which converts PlantUML code blocks to PlantUML images."; + license = licenses.mit; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9074f5c3be2..560392b6d65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5667,6 +5667,8 @@ in pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { }; + pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { }; + pasystray = callPackage ../tools/audio/pasystray { }; phash = callPackage ../development/libraries/phash { }; From 8c22c883768331892e2c049c7ec82d14fc35b3a2 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 20 Aug 2020 15:57:33 +0700 Subject: [PATCH 384/520] mkrom: init at 1.0.1 --- pkgs/development/tools/misc/mkrom/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/misc/mkrom/default.nix diff --git a/pkgs/development/tools/misc/mkrom/default.nix b/pkgs/development/tools/misc/mkrom/default.nix new file mode 100644 index 00000000000..eec63f75e71 --- /dev/null +++ b/pkgs/development/tools/misc/mkrom/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, asciidoc }: + +stdenv.mkDerivation rec { + pname = "mkrom"; + version = "unstable-2020-06-11"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "mkrom"; + rev = "7a735ecbe09409e74680a9dc1c50dd4db99a409f"; + sha256 = "18h7a0fb5zb991iy9ljpknmk9qvl9nz3yh1zh5bm399rpxn4nzx3"; + }; + + nativeBuildInputs = [ + asciidoc + cmake + ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "Packages KnightOS distribution files into a ROM"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbf0595b1fb..6a9af02c6a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11039,6 +11039,10 @@ in mkcert = callPackage ../development/tools/misc/mkcert { }; + mkrom = callPackage ../development/tools/misc/mkrom { + asciidoc = asciidoc-full; + }; + mkdocs = callPackage ../development/tools/documentation/mkdocs { }; mockgen = callPackage ../development/tools/mockgen { }; From 64de900dc84259780f7307168bbe46603b068b35 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Aug 2020 16:48:15 +0200 Subject: [PATCH 385/520] haskell-hspec-core: needs latest QuickCheck to compile tests some more --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6c9855eaef9..54c4e7c5465 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1436,10 +1436,10 @@ self: super: { doCheck = false; }); - # tests rely on `Int` being 64-bit: https://github.com/hspec/hspec/issues/431 - hspec-core = let hspec-core = super.hspec-core.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_14_1; }); in - if pkgs.stdenv.isi686 then dontCheck hspec-core else hspec-core; - QuickCheck_2_14_1 = super.QuickCheck_2_14_1.override { splitmix = dontCheck super.splitmix_0_1_0_1; }; + # Tests rely on `Int` being 64-bit: https://github.com/hspec/hspec/issues/431. + # Also, we need QuickCheck-2.14.x to build the test suite, which isn't easy in LTS-16.x. + # So let's not go there any just disable the tests altogether. + hspec-core = dontCheck super.hspec-core; # INSERT NEW OVERRIDES ABOVE THIS LINE From c5cee4ba4390cc45a787984505263929ba7ea5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Ch=C3=A9rel?= Date: Fri, 21 Aug 2020 13:06:22 +0200 Subject: [PATCH 386/520] pubs: 0.8.2 -> 0.8.3 --- pkgs/tools/misc/pubs/default.nix | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 96d1a5fc6a0..158b56e2a5d 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -2,34 +2,29 @@ python3Packages.buildPythonApplication rec { pname = "pubs"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "pubs"; repo = "pubs"; rev = "v${version}"; - sha256 = "16zwdqfbmlla6906g3a57a4nj8wnl11fq78r20qms717bzv211j0"; + sha256 = "0npgsyxj7kby5laznk5ilkrychs3i68y57gphwk48w8k9fvnl3zc"; }; - patches = [ - # Fix for bibtexparser 1.1.0 - (fetchpatch { - url = "https://github.com/pubs/pubs/pull/185/commits/e58ae98b93b8364a07fd5f5f452ba88ad332c948.patch"; - sha256 = "1n7zrk119v395jj8wqg8wlymc9l9pq3v752yy3kam9kflc0aashp"; - }) - # Fix test broken by PyYAML 5.1 - (fetchpatch { - url = "https://github.com/pubs/pubs/pull/194/commits/c3cb713ae76528eeeaaeb948fe319a76ab3934d8.patch"; - sha256 = "05as418m7wzs65839bb91b2jrs8l68z8ldcjcd9cn4b9fcgsf3rk"; - }) - ]; - propagatedBuildInputs = with python3Packages; [ - argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six beautifulsoup4 + argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six + beautifulsoup4 ]; checkInputs = with python3Packages; [ pyfakefs mock ddt ]; + # Disabling git tests because they expect git to be preconfigured + # with the user's details. See + # https://github.com/NixOS/nixpkgs/issues/94663 + preCheck = '' + rm tests/test_git.py + ''; + meta = with stdenv.lib; { description = "Command-line bibliography manager"; homepage = "https://github.com/pubs/pubs"; From 348051b40ab31863f40ea7cac06005b4af228163 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 21 Aug 2020 13:37:10 -0300 Subject: [PATCH 387/520] p4: init at 2020.1.1991450 (#95103) --- .../version-management/p4/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/version-management/p4/default.nix diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix new file mode 100644 index 00000000000..3a397b5bf87 --- /dev/null +++ b/pkgs/applications/version-management/p4/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, lib, autoPatchelfHook }: + +stdenv.mkDerivation rec { + pname = "p4"; + version = "2020.1.1991450"; + + src = fetchurl { + url = "https://cdist2.perforce.com/perforce/r20.1/bin.linux26x86_64/helix-core-server.tgz"; + sha256 = "0nhcxhwx3scx6vf7i2bc8j0b1l57lmq9bfy1cfbfbqasd3an721k"; + }; + + sourceRoot = "."; + + dontBuild = true; + + nativeBuildInputs = [ autoPatchelfHook ]; + + installPhase = '' + mkdir -p $out/bin + cp p4 p4broker p4d p4p $out/bin + ''; + + meta = { + description = "Perforce Command-Line Client"; + homepage = "https://www.perforce.com"; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ corngood ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45f0e50311b..5ce5dde18de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21758,6 +21758,7 @@ in ostinato = callPackage ../applications/networking/ostinato { }; + p4 = callPackage ../applications/version-management/p4 { }; p4v = libsForQt5.callPackage ../applications/version-management/p4v { }; partio = callPackage ../development/libraries/partio {}; From 738d3dda54b39f62be82886a17f6fbcb311c9ab4 Mon Sep 17 00:00:00 2001 From: Michael Faille Date: Sun, 9 Aug 2020 18:59:39 -0400 Subject: [PATCH 388/520] tanka: add bash completion --- pkgs/applications/networking/cluster/tanka/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index b4900a2018d..fcf1fc054e0 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: buildGoModule rec { pname = "tanka"; @@ -15,6 +15,13 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + echo "complete -C $out/bin/tk tk" > tk.bash + installShellCompletion tk.bash + ''; + meta = with lib; { description = "Flexible, reusable and concise configuration for Kubernetes"; homepage = "https://github.com/grafana/tanka/"; From 798672d6fa2c91c53835c8d5978fc71db1d17150 Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Tue, 18 Aug 2020 10:37:41 +0300 Subject: [PATCH 389/520] maintainers: add maxxk --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0acf720c4eb..2aeb55d4f9b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5206,6 +5206,12 @@ githubId = 35892750; name = "Maxine Aubrey"; }; + maxxk = { + email = "maxim.krivchikov@gmail.com"; + github = "maxxk"; + githubId = 1191859; + name = "Maxim Krivchikov"; + }; mbakke = { email = "mbakke@fastmail.com"; github = "mbakke"; From 2126015ad4dbe7da2ac313bddf0873888f4c4a0d Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Fri, 21 Aug 2020 19:49:56 +0300 Subject: [PATCH 390/520] python3Packages.cucumber-tag-expressions: init at 3.0.0 --- .../cucumber-tag-expressions/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/cucumber-tag-expressions/default.nix diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix new file mode 100644 index 00000000000..789a58bb6a7 --- /dev/null +++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchPypi, buildPythonPackage, pytest, pytest-html }: + +buildPythonPackage rec { + pname = "cucumber-tag-expressions"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kb8dq458sflwl2agb2v9hp04qwygslrhdps819vq27wc44jabxw"; + }; + + checkInputs = [ pytest pytest-html ]; + checkPhase = "pytest tests/*/*.py"; + + meta = with lib; { + homepage = "https://github.com/cucumber/tag-expressions-python"; + description = "Provides tag-expression parser for cucumber/behave"; + license = licenses.mit; + maintainers = with maintainers; [ maxxk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1000d615ac1..38ba125fb5f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7637,6 +7637,8 @@ in { pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { }; + cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; + behave = callPackage ../development/python-modules/behave { }; bellows = callPackage ../development/python-modules/bellows { }; From cedbb56d8312720ae0e21a603415b0eb8ef41f0e Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Fri, 21 Aug 2020 19:56:54 +0300 Subject: [PATCH 391/520] python3Packages.behave: 1.2.6 -> 1.2.7.dev1 --- .../python-modules/behave/default.nix | 36 ++++++++----------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index fbe108e2a02..ea7af2dfeaa 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,30 +1,24 @@ -{ stdenv, fetchPypi, fetchpatch -, buildPythonApplication, python, pythonOlder -, mock, nose, pathpy, pyhamcrest, pytest_4 -, glibcLocales, parse, parse-type, six -, traceback2 +{ stdenv, fetchFromGitHub +, buildPythonApplication, python +, mock, pathpy, pyhamcrest, pytest, pytest-html +, glibcLocales +, colorama, cucumber-tag-expressions, parse, parse-type, six }: buildPythonApplication rec { pname = "behave"; - version = "1.2.6"; + version = "1.2.7.dev1"; - src = fetchPypi { - inherit pname version; - sha256 = "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr"; + src = fetchFromGitHub { + owner = "behave"; + repo = pname; + rev = "v${version}"; + sha256 = "1ssgixmqlg8sxsyalr83a1970njc2wg3zl8idsmxnsljwacv7qwv"; }; - patches = [ - # Fix tests on Python 2.7 - (fetchpatch { - url = "https://github.com/behave/behave/commit/0a9430a94881cd18437deb03d2ae23afea0f009c.patch"; - sha256 = "1nrh9ii6ik6gw2kjh8a6jk4mg5yqw3jfjfllbyxardclsab62ydy"; - }) - ]; - - checkInputs = [ mock nose pathpy pyhamcrest pytest_4 ]; + checkInputs = [ mock pathpy pyhamcrest pytest pytest-html ]; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ parse parse-type six ] ++ stdenv.lib.optional (pythonOlder "3.0") traceback2; + propagatedBuildInputs = [ colorama cucumber-tag-expressions parse parse-type six ]; postPatch = '' patchShebangs bin @@ -36,7 +30,7 @@ buildPythonApplication rec { export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" - pytest test tests + pytest tests ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' tools/test-features/ @@ -47,6 +41,6 @@ buildPythonApplication rec { homepage = "https://github.com/behave/behave"; description = "behaviour-driven development, Python style"; license = licenses.bsd2; - maintainers = with maintainers; [ alunduil ]; + maintainers = with maintainers; [ alunduil maxxk ]; }; } From 7ab4ee96132b5f54cc0566d5292207d1f68cbb8d Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 19 Aug 2020 21:54:53 -0400 Subject: [PATCH 392/520] python3Packages.pytorch-lightning: init at 0.8.5 --- .../pytorch-lightning/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/pytorch-lightning/default.nix diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix new file mode 100644 index 00000000000..152fa6a92e5 --- /dev/null +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, future +, pytestCheckHook +, pytorch +, pyyaml +, tensorflow-tensorboard +, tqdm }: + +buildPythonPackage rec { + pname = "pytorch-lightning"; + version = "0.8.5"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "PyTorchLightning"; + repo = pname; + rev = version; + sha256 = "12zhq4pnfcwbgcx7cs99c751gp3w0ysaf5ykv2lv8f4i360w3r5a"; + }; + + propagatedBuildInputs = [ + future + pytorch + pyyaml + tensorflow-tensorboard + tqdm + ]; + + checkInputs = [ pytestCheckHook ]; + # Some packages are not in NixPkgs; other tests try to build distributed + # models, which doesn't work in the sandbox. + doCheck = false; + + pythonImportsCheck = [ "pytorch_lightning" ]; + + meta = with lib; { + description = "Lightweight PyTorch wrapper for machine learning researchers"; + homepage = "https://pytorch-lightning.readthedocs.io"; + license = licenses.asl20; + maintainers = with maintainers; [ tbenst ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 38ba125fb5f..8a40d5625e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4083,6 +4083,8 @@ in { cudaSupport = false; }; + pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; + pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; pythondialog = callPackage ../development/python-modules/pythondialog { }; From 38b7da9144e1a3502b57f061df8c829cdc182778 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Aug 2020 13:35:58 +0200 Subject: [PATCH 393/520] ansible: 2.9.12 -> 2.10.0 --- pkgs/tools/admin/ansible/default.nix | 19 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 4783e98204d..88346c3606c 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,7 +1,22 @@ -{ python3Packages, fetchurl }: +{ python3Packages, fetchurl, fetchFromGitHub }: rec { - ansible = ansible_2_9; + ansible = ansible_2_10; + + # The python module stays at v2.9.x until the related package set has caught up. Therefore v2.10 gets an override + # for now. + ansible_2_10 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { + pname = "ansible"; + version = "2.10.0"; + + # TODO: migrate to fetchurl, when release becomes available on releases.ansible.com + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0k9rs5ajx0chaq0xr1cj4x7fr5n8kd4y856miss6k01iv2m7yx42"; + }; + })); ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ce5dde18de..e33aebd9b93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10264,7 +10264,8 @@ in ansible ansible_2_7 ansible_2_8 - ansible_2_9; + ansible_2_9 + ansible_2_10; ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; From 0d131f81ebd240e8f8da672697be3f6116e7184a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Aug 2020 13:37:51 +0200 Subject: [PATCH 394/520] ansible_2_7: drop This version went EOL on 2020/06/18. --- pkgs/tools/admin/ansible/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 11 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 88346c3606c..58b2852baca 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -29,14 +29,4 @@ rec { sha256 = "19ga0c9qs2b216qjg5k2yknz8ksjn8qskicqspg2d4b8x2nr1294"; }; })); - - ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { - pname = "ansible"; - version = "2.7.18"; - - src = fetchurl { - url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "0sgshaaqyjq3i035yi5hivmrrwrq05hxrbjrv1w3hfzmvljn41d1"; - }; - })); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e33aebd9b93..6f6c3c8be02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10262,7 +10262,6 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible - ansible_2_7 ansible_2_8 ansible_2_9 ansible_2_10; From c8384cc8a59946046a67aeda2f3a56bea59b9d6c Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Tue, 18 Aug 2020 12:05:57 +0300 Subject: [PATCH 395/520] pythonPackages.django-widget-tweaks: init at 1.4.8 --- .../django-widget-tweaks/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/django-widget-tweaks/default.nix diff --git a/pkgs/development/python-modules/django-widget-tweaks/default.nix b/pkgs/development/python-modules/django-widget-tweaks/default.nix new file mode 100644 index 00000000000..99e3abda890 --- /dev/null +++ b/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage, fetchFromGitHub, python, stdenv, django }: + +buildPythonPackage rec { + pname = "django-widget-tweaks"; + version = "1.4.8"; + + src = fetchFromGitHub { # package from Pypi missing runtests.py + owner = "jazzband"; + repo = pname; + rev = version; + sha256 = "00w1ja56dc7cyw7a3mph69ax6mkch1lsh4p98ijdhzfpjdy36rbg"; + }; + + checkPhase = "${python.interpreter} runtests.py"; + propagatedBuildInputs = [ django ]; + + meta = with stdenv.lib; { + description = "Tweak the form field rendering in templates, not in python-level form definitions."; + homepage = "https://github.com/jazzband/django-widget-tweaks"; + license = licenses.mit; + maintainers = with maintainers; [ + maxxk + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a40d5625e7..dd5b52edc90 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3824,6 +3824,8 @@ in { django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { }; + django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { }; + django_tagging = callPackage ../development/python-modules/django_tagging { }; django_classytags = callPackage ../development/python-modules/django_classytags { }; From 9b06980c61028fb81d2b579539d17b3fb3c261fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Fri, 21 Aug 2020 20:39:05 +0200 Subject: [PATCH 396/520] google-chrome-{beta,dev}: fix icons (#95389) The icon naming scheme for Chrome Beta/Dev has changed from `product_logo_{res}.png` to `product_logo_{res}_{branch}.png`. --- .../networking/browsers/google-chrome/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 8d711b6de2f..fa19c4efa9d 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -119,9 +119,13 @@ in stdenv.mkDerivation { --replace /opt $out/share \ --replace $out/share/google/$appname/google-$appname $exe - for icon_file in $out/share/google/chrome*/product_logo_*[0-9].png; do + for icon_file in $out/share/google/chrome*/product_logo_[0-9]*.png; do num_and_suffix="''${icon_file##*logo_}" - icon_size="''${num_and_suffix%.*}" + if [ $dist = "stable" ]; then + icon_size="''${num_and_suffix%.*}" + else + icon_size="''${num_and_suffix%_*}" + fi logo_output_prefix="$out/share/icons/hicolor" logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" mkdir -p "$logo_output_path" From ac4b0e8eb0096b96d5ef36658321ae2d84375b53 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Aug 2020 20:48:59 +0200 Subject: [PATCH 397/520] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/45e25ffd142c902097679e24cb95e235eb8ddc8b. --- .../haskell-modules/hackage-packages.nix | 176 ++++++++++++------ 1 file changed, 123 insertions(+), 53 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fccd74ad5f5..26c79d1f409 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12692,6 +12692,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ListLike_4_7_2" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string + , vector + }: + mkDerivation { + pname = "ListLike"; + version = "4.7.2"; + sha256 = "15c1q4rl4kwpgpsdf4x7k17m2fgzimm9915k71cpjiv0sq9b2rn2"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist fmlist text + utf8-string vector + ]; + testHaskellDepends = [ + array base bytestring containers dlist fmlist HUnit QuickCheck + random text utf8-string vector + ]; + description = "Generalized support for list-like structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ListT" = callPackage ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck , transformers, util @@ -52076,6 +52098,32 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "chainweb-mining-client" = callPackage + ({ mkDerivation, aeson, async, base, bytes, bytestring, Cabal + , configuration-tools, connection, containers, cryptonite + , exceptions, hashable, hostaddress, http-client, http-client-tls + , http-types, lens, loglevel, memory, mwc-random, process, retry + , stm, streaming, streaming-events, text, time + , unordered-containers, wai-extra + }: + mkDerivation { + pname = "chainweb-mining-client"; + version = "0.2"; + sha256 = "1zbqbc3icgz1fb0fgpfi1cf1i7pz2lf3wd82671ks1yixf893ypm"; + isLibrary = false; + isExecutable = true; + setupHaskellDepends = [ base Cabal configuration-tools ]; + executableHaskellDepends = [ + aeson async base bytes bytestring configuration-tools connection + containers cryptonite exceptions hashable hostaddress http-client + http-client-tls http-types lens loglevel memory mwc-random process + retry stm streaming streaming-events text time unordered-containers + wai-extra + ]; + description = "Mining Client for Kadena Chainweb"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chalk" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -81219,8 +81267,8 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.3.3"; - sha256 = "1cmp0f9rs0wb42400zsy65bzikjzk5rqd7vb7z86iqj2z9j4y4gx"; + version = "0.3.4"; + sha256 = "0pm8gwaz6yzdhqw4cs98kbardcc6qsnvzx67f48hamrqvnvqa2ym"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -81240,8 +81288,8 @@ self: { }: mkDerivation { pname = "elynx-markov"; - version = "0.3.3"; - sha256 = "1anbfsgrn0s6aqhwnay9ki17812ybaygibpzss9l4c91qsr7wzmz"; + version = "0.3.4"; + sha256 = "0kd92zkafnx6bbzpn9xswl2wnkzzgjwmd7l6ycj43vrlgigp27v6"; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-seq hmatrix integration math-functions mwc-random parallel primitive statistics @@ -81260,8 +81308,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.3.3"; - sha256 = "19yj4h6gavcvfz79bvyfajdhl2mq8ghiy7rv8bq7l0b28sf59m6r"; + version = "0.3.4"; + sha256 = "16ckh34xywxggq0vf4aig912zb8n1fybz52k1vchrj0y0rxbvsa4"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; @@ -81277,8 +81325,8 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.3.3"; - sha256 = "0cwk7g23gb72q91dy5gwwn74rhcwsmmfnzc07lia1cv6qmj4y4q5"; + version = "0.3.4"; + sha256 = "1zz0b2p8znigy5m12qacsdb52h09c2khc3l7i8glirhca74flsif"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers matrices mwc-random parallel primitive vector vector-th-unbox word8 @@ -81301,8 +81349,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.3.3"; - sha256 = "1mmy6h6h8rknclahyxsdv08ynfr12wn35lk632h6n4pmsfzhi0zw"; + version = "0.3.4"; + sha256 = "0nldyxbj3ym4nnq62asi70w9c8h79s10g50gr7dkhdgbr07v47vs"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptohash-sha256 deepseq directory fast-logger hmatrix @@ -81324,8 +81372,8 @@ self: { }: mkDerivation { pname = "elynx-tree"; - version = "0.3.3"; - sha256 = "1pcl7nis867dkz30zl3dyzls8ccpk9rsm5vfwklx697jj5fglihf"; + version = "0.3.4"; + sha256 = "1xhrmpnqg4gjr262xqi31rc406l40v0f5yfj0ah7jb1z45m23hsk"; libraryHaskellDepends = [ aeson attoparsec base bytestring comonad containers deepseq double-conversion elynx-nexus math-functions mwc-random primitive @@ -83298,15 +83346,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding_0_2_1" = callPackage + "essence-of-live-coding_0_2_2" = callPackage ({ mkDerivation, base, containers, foreign-store, mtl, QuickCheck , syb, test-framework, test-framework-quickcheck2, transformers , vector-sized }: mkDerivation { pname = "essence-of-live-coding"; - version = "0.2.1"; - sha256 = "1bjpzz5ph2n4ljhckn2p88pg6c49phigw2f1y9l83wgnvdavdz83"; + version = "0.2.2"; + sha256 = "1hczvr1byk8qjkb45w9nvjmbqfmxl15dgn7kvp0rby0dkrn85275"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83337,14 +83385,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-gloss_0_2_1" = callPackage + "essence-of-live-coding-gloss_0_2_2" = callPackage ({ mkDerivation, base, essence-of-live-coding, foreign-store, gloss , syb, transformers }: mkDerivation { pname = "essence-of-live-coding-gloss"; - version = "0.2.1"; - sha256 = "0pgkzfy7w8lylx0bb3vs1d8a2hgaavn2m9rj0v1f6hl193hnimz7"; + version = "0.2.2"; + sha256 = "19kxrjyhikgb49qdb7rlap8bbjsvkyi2ni6a1m1hjyxjziypsw0y"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store gloss syb transformers ]; @@ -83359,8 +83407,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-gloss-example"; - version = "0.2.1"; - sha256 = "0rfpl2y6dga86qpq3sfc1kvwsb55d3aw0ckkfn8yflfnad6k884l"; + version = "0.2.2"; + sha256 = "07kgmbwm9swdavsypxnqf64fh9b2c2h9rmkm38hcl6lahdb2rb44"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83386,14 +83434,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-pulse_0_2_1" = callPackage + "essence-of-live-coding-pulse_0_2_2" = callPackage ({ mkDerivation, base, essence-of-live-coding, foreign-store , pulse-simple, transformers }: mkDerivation { pname = "essence-of-live-coding-pulse"; - version = "0.2.1"; - sha256 = "02my8bprwij9rxl0x0yb8q9zr137alzl77j5lvd1gl5r5sbvm8pj"; + version = "0.2.2"; + sha256 = "15v4bzkx4j6mvprk1d215ywamjjvmf6g13cppd109aj4h40zcxbi"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store pulse-simple transformers ]; @@ -83408,8 +83456,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-pulse-example"; - version = "0.2.1"; - sha256 = "118xlqx67lgyrqi9r581ad2xsqs5x5d19afbfh6200bi618sr8af"; + version = "0.2.2"; + sha256 = "1476wxny2yhq2f2cn2bqrcm4dri39mql509pf9yq2kyd76lkrcgx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83436,14 +83484,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-quickcheck_0_2_1" = callPackage + "essence-of-live-coding-quickcheck_0_2_2" = callPackage ({ mkDerivation, base, boltzmann-samplers, essence-of-live-coding , QuickCheck, syb, transformers }: mkDerivation { pname = "essence-of-live-coding-quickcheck"; - version = "0.2.1"; - sha256 = "144840ck2a0wk8pd62c6l9iw6jlvva3yif30mba9m8r1zylaanyj"; + version = "0.2.2"; + sha256 = "1v7ijzs64bqn8nyp1msrrvk6kfkzx5a87ib74fmcasiww1y4lwgl"; libraryHaskellDepends = [ base boltzmann-samplers essence-of-live-coding QuickCheck syb transformers @@ -83459,8 +83507,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-warp"; - version = "0.2.1"; - sha256 = "12vcfif5iazdf13vgpnf5rlhni62iv9dmpnl25bb5l80lmjffwls"; + version = "0.2.2"; + sha256 = "14ygm62ak6gprx0r545xmv5nk544p0gsip3017p7ziy3k01mwhgh"; libraryHaskellDepends = [ base essence-of-live-coding http-types wai warp ]; @@ -84011,6 +84059,17 @@ self: { broken = true; }) {}; + "eveff" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "eveff"; + version = "0.1.0.0"; + sha256 = "1d0bxg1dg66g1yv291cp4jh3xv3caxrddqrwb0g6g1929dl019fa"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + description = "Efficient effect handlers based on evidence translation"; + license = stdenv.lib.licenses.mit; + }) {}; + "event" = callPackage ({ mkDerivation, base, containers, semigroups, transformers }: mkDerivation { @@ -86888,8 +86947,8 @@ self: { }: mkDerivation { pname = "fastparser"; - version = "0.4.0"; - sha256 = "1pb97h5hpn3fn4r9qz3rx2kb3xrbvbja9yvakbacd03rn3my1pz3"; + version = "0.5.0"; + sha256 = "0pxd2f6f0a6kckqmkkafh9zx11x75x1zx1z90snzj3j8s4jcfg4y"; libraryHaskellDepends = [ base bytestring bytestring-lexing containers kan-extensions microlens thyme transformers vector-space @@ -186661,14 +186720,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optics-th_0_3_0_1" = callPackage + "optics-th_0_3_0_2" = callPackage ({ mkDerivation, base, containers, mtl, optics-core, tagged , template-haskell, th-abstraction, transformers }: mkDerivation { pname = "optics-th"; - version = "0.3.0.1"; - sha256 = "1bn9yhl1v4xkagasgiq4v572v4vvbk40wwlx9wjdw0gqcisy4b3j"; + version = "0.3.0.2"; + sha256 = "1mxi4bwgpl02g7clbs4m5p16i64s5lp13811yhg66i50rnqwpw40"; libraryHaskellDepends = [ base containers mtl optics-core template-haskell th-abstraction transformers @@ -228182,14 +228241,17 @@ self: { }) {}; "shake-dhall" = callPackage - ({ mkDerivation, base, containers, dhall, filepath, shake, text }: + ({ mkDerivation, base, containers, dhall, directory, filepath + , shake, tasty, tasty-hunit, text + }: mkDerivation { pname = "shake-dhall"; - version = "0.1.1.0"; - sha256 = "1nqcgcxcm6p0w99zvm5g4g7yda1k9sfwxf1jq2jk8rfbkk49sz7g"; + version = "0.1.1.2"; + sha256 = "0jlbq9d6sjrbywd0afgsqqw1ffjlh5k4mr5v2bn45js29hipkivk"; libraryHaskellDepends = [ - base containers dhall filepath shake text + base containers dhall directory filepath shake text ]; + testHaskellDepends = [ base tasty tasty-hunit ]; description = "Dhall dependencies"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -231801,35 +231863,45 @@ self: { }) {}; "skylighting" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , skylighting-core + ({ mkDerivation, base, binary, blaze-html, bytestring, containers + , directory, filepath, pretty-show, skylighting-core, text }: mkDerivation { pname = "skylighting"; version = "0.8.5"; sha256 = "1b8m0spspp060p5hkl2qxarh3cwji0shq5kdwz2w93kiyl8hk8sv"; + configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring containers skylighting-core ]; + executableHaskellDepends = [ + base blaze-html bytestring containers directory filepath + pretty-show text + ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; }) {}; "skylighting_0_9" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , skylighting-core + ({ mkDerivation, base, binary, blaze-html, bytestring, containers + , directory, filepath, pretty-show, skylighting-core, text }: mkDerivation { pname = "skylighting"; version = "0.9"; sha256 = "1855k1xjh38r389zvlzga7dkc3scj65ip9frvvkagxa2ls1irfp1"; + configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring containers skylighting-core ]; + executableHaskellDepends = [ + base blaze-html bytestring containers directory filepath + pretty-show text + ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -232414,19 +232486,19 @@ self: { "slynx" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix - , monad-logger, mwc-random, optparse-applicative, text + , monad-logger, mwc-random, optparse-applicative, statistics, text , transformers, vector }: mkDerivation { pname = "slynx"; - version = "0.3.3"; - sha256 = "0rwiw27zyfbycsp51sxg3w7143c2gj1g5wm0hlkkx4m296k1hvkr"; + version = "0.3.4"; + sha256 = "1qyi231wvi62cgjanqy7n4ypddf1xr59914cghvglgjwrpz9fljp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-markov elynx-seq elynx-tools elynx-tree hmatrix monad-logger mwc-random - optparse-applicative text transformers vector + optparse-applicative statistics text transformers vector ]; executableHaskellDepends = [ base ]; description = "Handle molecular sequences"; @@ -239047,10 +239119,8 @@ self: { }: mkDerivation { pname = "stateWriter"; - version = "0.2.10"; - sha256 = "0g1r7zn1ahky9wmqbimjryca3hkylx15xpqwhc42gkyf7h7kq2b8"; - revision = "1"; - editedCabalFile = "19zp7wy2k6f5dqw0wfj9wzarjgfr20nvw5rmqiv79h66qssjl9i6"; + version = "0.3.0"; + sha256 = "0l8x758ywgz3c6fhyw1ajaqnq98l2ra39cj4yl2873z89q2cxdlp"; libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base free hspec mtl QuickCheck ]; benchmarkHaskellDepends = [ @@ -254534,8 +254604,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.3.3"; - sha256 = "1ik9mcfm5w0q6mdcawaw54nkcfyb4aac9njlp3q03rglxxy6j1r5"; + version = "0.3.4"; + sha256 = "10nn1043z5gzm0zrw5z0fxalwrh48wvxlwq65nanjajwb612w1p4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 195258a9e1cdb5698da62945d34be5d1802f4d65 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 21 Aug 2020 14:18:08 -0400 Subject: [PATCH 398/520] buildbot: fix build Backport upstream patch to fix incompatibility with lastest SQLAlchemy. --- pkgs/development/python-modules/buildbot/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index c5a12c997d9..9a49be777b0 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -73,6 +73,13 @@ let # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch + + # fix compatibility with the latest SQLAlchemy + (fetchpatch { + url = "https://github.com/buildbot/buildbot/commit/96f3cd1c5f5c82b733baecb133576366ecf544fc.patch"; + sha256 = "0n1jm13h08j7ksbs8ixayn3wziq5hzyp3kscz9fpgxd8gl885y5n"; + stripLen = 1; + }) ]; postPatch = '' From 3ff786a091d846c0d0332fa3e0919cf98556966f Mon Sep 17 00:00:00 2001 From: pblkt Date: Fri, 21 Aug 2020 21:26:45 +0300 Subject: [PATCH 399/520] maintainers: add pblkt --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2aeb55d4f9b..cc2aa5a7efc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6365,6 +6365,12 @@ githubId = 157610; name = "Piotr Bogdan"; }; + pblkt = { + email = "pebblekite@gmail.com"; + github = "pblkt"; + githubId = 6498458; + name = "pebble kite"; + }; pcarrier = { email = "pc@rrier.ca"; github = "pcarrier"; From a2780ce65a64eb4477b1df15868416c4c12a9267 Mon Sep 17 00:00:00 2001 From: pblkt Date: Fri, 21 Aug 2020 21:27:12 +0300 Subject: [PATCH 400/520] rargs: init at 0.3.0 --- pkgs/tools/misc/rargs/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/rargs/default.nix diff --git a/pkgs/tools/misc/rargs/default.nix b/pkgs/tools/misc/rargs/default.nix new file mode 100644 index 00000000000..6ebbeb39c6e --- /dev/null +++ b/pkgs/tools/misc/rargs/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "rargs"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "lotabout"; + repo = pname; + rev = "v${version}"; + sha256 = "188gj05rbivci1z4z29vwdwxlj2w01v5i4avwrxjnj1dd6mmlbxd"; + }; + + cargoSha256 = "0qzkhx0n28f5wy4fral3adn499q3f10q71cd544s4ghqwqn4khc9"; + + doCheck=false; # `rargs`'s test depends on the deprecated `assert_cli` crate, which in turn is not in Nixpkgs + + meta = with stdenv.lib; { + description = "xargs + awk with pattern matching support"; + homepage = "https://github.com/lolabout/rargs"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ pblkt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc5686a8731..072143bb3cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26823,6 +26823,8 @@ in py-wmi-client = callPackage ../tools/networking/py-wmi-client { }; + rargs = callPackage ../tools/misc/rargs { }; + redprl = callPackage ../applications/science/logic/redprl { }; renderizer = pkgs.callPackage ../development/tools/renderizer {}; From d33a625b5fb5ca42c19321f70ddfa1d6aee12667 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 20 Aug 2020 04:20:00 -0500 Subject: [PATCH 401/520] shadowsocks-rust: 1.8.14 -> 1.8.16 --- pkgs/tools/networking/shadowsocks-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index bbc054f874b..3fb34697da1 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.8.14"; + version = "1.8.16"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "0fcpmdshl52lg44b94h7pbikq91ppvmkdgd8993hgvzjyl0pchs5"; + sha256 = "09wncvy1cn8038xf8srz8y955xw9h59zh7avrh060wm50azrhlg5"; }; - cargoSha256 = "1vvcsadp2kycqjsmgy48szxzqg6s1jpdlzppfgffm8r71dcppyjj"; + cargoSha256 = "0n03dg1rrhlryap0dqqmmzhp49lxvhh3478z123x23fm04ygln44"; SODIUM_USE_PKG_CONFIG = 1; From 0843aa75de59002392a963d834001373b355dccb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Aug 2020 21:16:25 +0200 Subject: [PATCH 402/520] hackage2nix: update list of broken builds to fix evaluation errors on Hydra --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 0c93b0754fd..a9b0b88eaef 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3747,6 +3747,7 @@ broken-packages: - cgen - cgi-utils - cgrep + - chainweb-mining-client - chalkboard - chalkboard-viewer - charade From 8f6e1f240880990853aa1f16c9d516df1e30c61a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 21 Aug 2020 20:47:08 +0200 Subject: [PATCH 403/520] iputils: 20190709 -> 20200821 --- pkgs/os-specific/linux/iputils/default.nix | 27 +++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 12784638348..e12c44888a0 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns -, libcap, nettle, libidn2, systemd +, libcap, systemd, libidn2 }: with stdenv.lib; let - version = "20190709"; + version = "20200821"; sunAsIsLicense = { fullName = "AS-IS, SUN MICROSYSTEMS license"; url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c"; @@ -19,26 +19,27 @@ in stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "s${version}"; - sha256 = "04bp4af15adp79ipxmiakfp0ij6hx5qam266flzbr94pr8z8l693"; + sha256 = "1jhbcz75a4ij1myyyi110ma1d8d5hpm3scz9pyw7js6qym50xvh4"; }; - mesonFlags = - [ "-DUSE_CRYPTO=nettle" - "-DBUILD_RARPD=true" - "-DBUILD_TRACEROUTE6=true" - "-DNO_SETCAP_OR_SUID=true" - "-Dsystemdunitdir=etc/systemd/system" - ] + mesonFlags = [ + "-DBUILD_RARPD=true" + "-DBUILD_TRACEROUTE6=true" + "-DBUILD_TFTPD=true" + "-DNO_SETCAP_OR_SUID=true" + "-Dsystemdunitdir=etc/systemd/system" + ] # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ]; - buildInputs = [ libcap nettle systemd ] + buildInputs = [ libcap systemd ] ++ optional (!stdenv.hostPlatform.isMusl) libidn2; meta = { - homepage = "https://github.com/iputils/iputils"; description = "A set of small useful utilities for Linux networking"; + inherit (src.meta) homepage; + changelog = "https://github.com/iputils/iputils/releases/tag/s${version}"; license = with licenses; [ gpl2Plus bsd3 sunAsIsLicense ]; platforms = platforms.linux; maintainers = with maintainers; [ primeos lheckemann ]; From 826bc9aeb9186d7d05eaebc5e70272a8b2dda7bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Aug 2020 21:17:21 +0200 Subject: [PATCH 404/520] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/45e25ffd142c902097679e24cb95e235eb8ddc8b. --- pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 26c79d1f409..f2d83c8d9fe 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -52122,6 +52122,8 @@ self: { ]; description = "Mining Client for Kadena Chainweb"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chalk" = callPackage From b667dc48d161c3028c9c58c0bc0a01ca007b0fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 21 Aug 2020 19:26:25 +0200 Subject: [PATCH 405/520] amdvlk: 2020.Q3.3 -> 2020.Q3.4 Changelog: https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-2020.Q3.4 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index d4a717e384b..73983dba050 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2020.Q3.3"; + version = "2020.Q3.4"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "0s5a294gzcz438gmafirk3czrjcahv3imsg41k3vk83x4dbdlhxv"; + sha256 = "13yy1v43wyw2dbanl39sk1798344smmycgvl3gla61ipqls0qfgd"; }; buildInputs = [ From faa23a0f321c784aff662cb21691689b82dba255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 21 Aug 2020 14:48:40 +0200 Subject: [PATCH 406/520] clpeak: init at 1.1.0 A tool which profiles OpenCL devices to find their peak capacities. --- pkgs/tools/misc/clpeak/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/clpeak/default.nix diff --git a/pkgs/tools/misc/clpeak/default.nix b/pkgs/tools/misc/clpeak/default.nix new file mode 100644 index 00000000000..46284f9a4da --- /dev/null +++ b/pkgs/tools/misc/clpeak/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, ocl-icd, opencl-clhpp }: + +stdenv.mkDerivation rec { + pname = "clpeak"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "krrishnarraj"; + repo = "clpeak"; + rev = version; + fetchSubmodules = true; + sha256 = "1wkjpvn4r89c3y06rv7gfpwpqw6ljmqwz0w0mljl9y5hn1r4pkx2"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ ocl-icd opencl-clhpp ]; + + meta = with stdenv.lib; { + description = "A tool which profiles OpenCL devices to find their peak capacities"; + homepage = "https://github.com/krrishnarraj/clpeak/"; + license = licenses.unlicense; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb7c75bae57..d9eb70096fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26205,6 +26205,8 @@ in clinfo = callPackage ../tools/system/clinfo { }; + clpeak = callPackage ../tools/misc/clpeak { }; + cups = callPackage ../misc/cups { }; cups-filters = callPackage ../misc/cups/filters.nix { }; From 2b6f959c3b86ee61e1966192549f795198aae7d1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 21 Aug 2020 17:21:42 +0200 Subject: [PATCH 407/520] gitAndTools.diff-so-fancy: Fix shebang patching and clean up perl is a runtime dependency so it needs to be in buildInputs, otherwise patchShebangs hook will not see it. --- .../git-and-tools/diff-so-fancy/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index c073edaee7d..ffdb788745a 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -11,12 +11,19 @@ stdenv.mkDerivation rec { sha256 = "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl"; }; - # Perl is needed here for patchShebangs - nativeBuildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; - buildPhase = null; + buildInputs = [ + perl # needed for patchShebangs + ]; + + dontBuild = true; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/lib/diff-so-fancy # diff-so-fancy executable searches for it's library relative to @@ -32,6 +39,8 @@ stdenv.mkDerivation rec { --prefix PATH : "${git}/bin" \ --prefix PATH : "${coreutils}/bin" \ --prefix PATH : "${ncurses.out}/bin" + + runHook postInstall ''; meta = with stdenv.lib; { From 07bfff3c1c9bfedab486db865e31f3ca3de3b8c9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 21 Aug 2020 15:25:31 -0400 Subject: [PATCH 408/520] linux: 4.14.193 -> 4.14.194 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 12e55cab2bc..4807ff7dba4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.193"; + version = "4.14.194"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00wziff12xphafyspb02rnjim5a15zywnhdk70ks9q9h8hfv83qb"; + sha256 = "1q7ssi2790bqjn8s8ra5ihma70hmxykahink7iq5h78738id191y"; }; } // (args.argsOverride or {})) From cf39f96ab0a433af5ca3b48a1d41b44ea5b5c118 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 21 Aug 2020 15:26:22 -0400 Subject: [PATCH 409/520] linux: 4.19.140 -> 4.19.141 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 6b9629edca7..e0c9c69061a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.140"; + version = "4.19.141"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1a4fy48jb16qdx165n48qch6nikfvmxqwys7mw8fynq0pykzj3ya"; + sha256 = "0511vb9rfpy5l6cz69v0v97rw2rk2pscc4hkz2pfmgikagm1shm4"; }; } // (args.argsOverride or {})) From 81f8d8e88148ddcee86d4248498e91d89098e529 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 21 Aug 2020 15:26:48 -0400 Subject: [PATCH 410/520] linux: 4.4.232 -> 4.4.233 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index ba03af8696a..033599900ff 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.232"; + version = "4.4.233"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0d7x30sy9c27n9bqf5f5mf64c6j5iljnw1gm7g8z00xgvrjqibjf"; + sha256 = "1z77dikgkvkp9ggwxp07hl8vxsf9kq57rhfdpbvhny1x13fqkrlp"; }; } // (args.argsOverride or {})) From bcd17284ec4a4d1168db8751eab266d79b71a8be Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 21 Aug 2020 15:28:23 -0400 Subject: [PATCH 411/520] linux: 4.9.232 -> 4.9.233 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 38353cc3323..c1da330e4ae 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.232"; + version = "4.9.233"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0q2gpkazfw93r79aq21kv1y3hwxawl0swyvd3nd73p254gl75x2q"; + sha256 = "19dcwylhy5iqq3dmppqf7s9wy9d16m103djn1n183c9acnqclv9a"; }; } // (args.argsOverride or {})) From febd84497561bd3d9ad362e908f02d9a535fbe05 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 21 Aug 2020 15:28:50 -0400 Subject: [PATCH 412/520] linux: 5.4.59 -> 5.4.60 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index d1fe6b47890..1c903902b61 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.59"; + version = "5.4.60"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1zdjqkm6sniy718dgqzbc1w1sgwpy2x64n1p91cjwps3wjr9vjwv"; + sha256 = "08x2a78n23371k7l5p677mihnl58dpjh7r7bvyiwj3y4hlisplmd"; }; } // (args.argsOverride or {})) From 3c99c3105fcd40344e4eeda6979b8b71cc7e2ba8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 21 Aug 2020 15:31:01 -0400 Subject: [PATCH 413/520] linux: 5.7.16 -> 5.7.17 --- pkgs/os-specific/linux/kernel/linux-5.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix index 927940df9a0..8583b3b1628 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7.16"; + version = "5.7.17"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0lypik2wvkl3z60zi1x4dxrh646jn0c4x0cg5z9yp33504q4x1ip"; + sha256 = "09ajavdyvr0025rwvwfp9yv2z8q779nan1i6dck2kkdxr48kd36c"; }; } // (args.argsOverride or {})) From 78cde427e8a0a0bc278241ce0e63ef29805b39e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 21 Aug 2020 20:58:34 +0100 Subject: [PATCH 414/520] storebrowse: remove (#95919) I don't even bother to add it as deprecated to aliases.nix. It was marked as broken in 2016. --- pkgs/tools/system/storebrowse/default.nix | 44 ----------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 46 deletions(-) delete mode 100644 pkgs/tools/system/storebrowse/default.nix diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix deleted file mode 100644 index 4324fba87e7..00000000000 --- a/pkgs/tools/system/storebrowse/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, fetchhg, go, sqlite}: - -stdenv.mkDerivation rec { - name = "storebrowse-20130318212204"; - - src = fetchurl { - url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-775928f68e53.tar.gz?uuid=775928f68e53"; - name = "${name}.tar.gz"; - sha256 = "1yb8qbw95d9561s10k12a6lwv3my8h52arsbfcpizx74dwfsv7in"; - }; - - # This source has license BSD - srcGoSqlite = fetchhg { - url = "https://code.google.com/p/gosqlite/"; - rev = "5baefb109e18"; - sha256 = "0mqfnx06jj15cs8pq9msny2z18x99hgk6mchnaxpg343nzdiz4zk"; - }; - - buildPhase = '' - PATH=${go}/bin:$PATH - mkdir $TMPDIR/go - export GOPATH=$TMPDIR/go - - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "export GOARM=5"} - - GOSQLITE=$GOPATH/src/code.google.com/p/gosqlite - mkdir -p $GOSQLITE - cp -R $srcGoSqlite/* $GOSQLITE/ - export CGO_CFLAGS=-I${sqlite.dev}/include - export CGO_LDFLAGS=-L${sqlite.out}/lib - go build -ldflags "-r ${sqlite.out}/lib" -o storebrowse - ''; - - installPhase = '' - mkdir -p $out/bin - cp storebrowse $out/bin - ''; - - meta = { - homepage = "http://viric.name/cgi-bin/storebrowse"; - license = stdenv.lib.licenses.agpl3Plus; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9eb70096fb..53d78398a6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6968,8 +6968,6 @@ in stm32loader = with python3Packages; toPythonApplication stm32loader; - storebrowse = callPackage ../tools/system/storebrowse { }; - stubby = callPackage ../tools/networking/stubby { }; syntex = callPackage ../tools/graphics/syntex {}; From 6f4141507bb72fad0ea9221be1a1ed68e017f5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 21 Aug 2020 21:00:40 +0100 Subject: [PATCH 415/520] meguca: remove (#95920) --- nixos/modules/misc/ids.nix | 4 +- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + nixos/modules/services/web-servers/meguca.nix | 174 -------- .../node-packages/node-packages.json | 1 - pkgs/servers/meguca/default.nix | 50 --- pkgs/servers/meguca/server_deps.nix | 390 ------------------ 7 files changed, 3 insertions(+), 618 deletions(-) delete mode 100644 nixos/modules/services/web-servers/meguca.nix delete mode 100644 pkgs/servers/meguca/default.nix delete mode 100644 pkgs/servers/meguca/server_deps.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index bdb7fa3b12c..394da9a3889 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -321,7 +321,7 @@ in monetdb = 290; restic = 291; openvpn = 292; - meguca = 293; + # meguca = 293; # removed 2020-08-21 yarn = 294; hdfs = 295; mapred = 296; @@ -622,7 +622,7 @@ in monetdb = 290; restic = 291; openvpn = 292; - meguca = 293; + # meguca = 293; # removed 2020-08-21 yarn = 294; hdfs = 295; mapred = 296; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 522a7992919..aee1fdb368d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -886,7 +886,6 @@ ./services/web-servers/lighttpd/collectd.nix ./services/web-servers/lighttpd/default.nix ./services/web-servers/lighttpd/gitweb.nix - ./services/web-servers/meguca.nix ./services/web-servers/mighttpd2.nix ./services/web-servers/minio.nix ./services/web-servers/molly-brown.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 86cd3bf8dcf..1fe00e9142b 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -48,6 +48,7 @@ with lib; instead, or any other display manager in NixOS as they all support auto-login. '') (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") + (mkRemovedOptionModule [ "services" "meguca" ] "Use meguca has been removed from nixpkgs") (mkRemovedOptionModule ["hardware" "brightnessctl" ] '' The brightnessctl module was removed because newer versions of brightnessctl don't require the udev rules anymore (they can use the diff --git a/nixos/modules/services/web-servers/meguca.nix b/nixos/modules/services/web-servers/meguca.nix deleted file mode 100644 index 5a00070dc94..00000000000 --- a/nixos/modules/services/web-servers/meguca.nix +++ /dev/null @@ -1,174 +0,0 @@ -{ 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."; - }; - - videoPaths = mkOption { - type = types.listOf types.path; - default = []; - example = [ "/home/okina/Videos/tehe_pero.webm" ]; - description = "Videos that will be symlinked into www/videos."; - }; - }; - - config = mkIf cfg.enable { - security.sudo.enable = cfg.enable; - services.postgresql.enable = cfg.enable; - services.postgresql.package = pkgs.postgresql_11; - 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}/www - rm -rf ${escapeShellArg cfg.dataDir}/www/videos - ln -sf ${pkgs.meguca}/share/meguca/www/* ${escapeShellArg cfg.dataDir}/www - unlink ${escapeShellArg cfg.dataDir}/www/videos - mkdir -p ${escapeShellArg cfg.dataDir}/www/videos - - for vid in ${escapeShellArg cfg.videoPaths}; do - ln -sf $vid ${escapeShellArg cfg.dataDir}/www/videos - done - - 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/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 8b6a53ebe27..babc8fbb1c8 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -118,7 +118,6 @@ , "mastodon-bot" , "mathjax" , "meat" -, "meguca" , "mirakurun" , "mocha" , "multi-file-swagger" diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix deleted file mode 100644 index d3853fc9de1..00000000000 --- a/pkgs/servers/meguca/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full -, ghostscript, graphicsmagick, quicktemplate, go-bindata, easyjson -, nodePackages, emscripten, opencv, statik }: - -buildGoPackage { - pname = "meguca-unstable"; - version = "2019-03-12"; - goPackagePath = "github.com/bakape/meguca"; - goDeps = ./server_deps.nix; - - src = fetchFromGitHub { - owner = "bakape"; - repo = "meguca"; - rev = "21b08de09b38918061c5cd0bbd0dc9bcc1280525"; - sha256 = "1nb3bf1bscbdma83sp9fbgvmxxlxh21j9h80wakfn85sndcrws5i"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ pkgconfig cmake go-bindata ]; - - buildInputs = [ - ffmpeg-full graphicsmagick ghostscript quicktemplate - easyjson emscripten opencv statik - ]; - - buildPhase = '' - export HOME=`pwd` - cd go/src/github.com/bakape/meguca - ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules - sed -i "/npm install --progress false --depth 0/d" Makefile - make -j $NIX_BUILD_CORES generate all - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - make -j $NIX_BUILD_CORES wasm - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/meguca - cp meguca $out/bin - cp -r www $out/share/meguca - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/bakape/meguca"; - description = "High performance anonymous realtime imageboard"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ chiiruno ]; - broken = true; # Broken on Hydra since 2019-04-18: - # https://hydra.nixos.org/build/98885902 - }; -} diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix deleted file mode 100644 index bff9d5624e8..00000000000 --- a/pkgs/servers/meguca/server_deps.nix +++ /dev/null @@ -1,390 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/ErikDubbelboer/gspt"; - fetch = { - type = "git"; - url = "https://github.com/ErikDubbelboer/gspt"; - rev = "e68493906b8382891943ddc9960cb9c6ecd1a1f0"; - sha256 = "17xjyg6zw02yzly30hs92pwgn0w85naixr4kb2c0mgp5zavl1ffz"; - }; - } - { - goPackagePath = "github.com/Masterminds/squirrel"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/squirrel"; - rev = "d67d6a236213ef67cff454e09ea1bf742d943f6c"; - sha256 = "0gzvnws0a29c663hjk379bybvxfmkiic3spkc985hdvn5gkbrwkq"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/goquery"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/goquery"; - rev = "3dcf72e6c17f694381a21592651ca1464ded0e10"; - sha256 = "0fpsf6b54z33a7zl28x860jbaj3g5722g8kpqs6rdpaqv99yyvnn"; - }; - } - { - goPackagePath = "github.com/andybalholm/cascadia"; - fetch = { - type = "git"; - url = "https://github.com/andybalholm/cascadia"; - rev = "680b6a57bda4f657485ad44bdea42342ead737bc"; - sha256 = "0v95plagirbjlc4p00y9brhpvv4nm8q0gr63gcfs3shyh1a8xwbm"; - }; - } - { - goPackagePath = "github.com/aquilax/tripcode"; - fetch = { - type = "git"; - url = "https://github.com/aquilax/tripcode"; - rev = "1a14b0a5e89f7fdb8a821562569338ad59ab2da5"; - sha256 = "1ishrg37gkkx04gbchhsk7jp01mmfvln2i2zrncbj4qxs2amnn2l"; - }; - } - { - goPackagePath = "github.com/badoux/goscraper"; - fetch = { - type = "git"; - url = "https://github.com/badoux/goscraper"; - rev = "9b4686c4b62c22b0489d53dddf5421605caba33e"; - sha256 = "1f1wc4s2b6g1ndpihb0gn7cxmwyi4wfqi5slvsk6i6p9q4kxrkvx"; - }; - } - { - goPackagePath = "github.com/bakape/boorufetch"; - fetch = { - type = "git"; - url = "https://github.com/bakape/boorufetch"; - rev = "90aee10269a138a08ce49cd91635500336657a82"; - sha256 = "0zaa2b3bl2hnl4lipghl6mbvpv9sq9r7skykp26c29qy77xy99nk"; - }; - } - { - goPackagePath = "github.com/bakape/captchouli"; - fetch = { - type = "git"; - url = "https://github.com/bakape/captchouli"; - rev = "b57177c8d2f239547e9545354e2f55fbc851ab47"; - sha256 = "1fi24322bbicc2bpfla37nhy2w89cf67345dbybcavgcny5rs65a"; - }; - } - { - goPackagePath = "github.com/bakape/mnemonics"; - fetch = { - type = "git"; - url = "https://github.com/bakape/mnemonics"; - rev = "056d8d3259923b93bb0449a45b0c56ac20c77f1b"; - sha256 = "137dl4bkpszj7pm4dyj222xdvy9lmwsgmm0l6bxni0msc3jdrqkl"; - }; - } - { - goPackagePath = "github.com/bakape/thumbnailer"; - fetch = { - type = "git"; - url = "https://github.com/bakape/thumbnailer"; - rev = "3d9565548e572a385b5a1ecf3bb9840c9ccd9949"; - sha256 = "0zriks4j694y65ryf9xkiz0sc932hskjigmk83bj1069hkgzx9dk"; - }; - } - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5"; - sha256 = "12f5swiwzcamk87r9j73nn7rmyyday7jkgzfh7x5wdg9blzhrir2"; - }; - } - { - goPackagePath = "github.com/chai2010/webp"; - fetch = { - type = "git"; - url = "https://github.com/chai2010/webp"; - rev = "76ae9d0b5d6d590fcc9772bf9cf0526128ee6fab"; - sha256 = "0sanh0c2bvignxnrj9vlzr2sw1bd3cgw2lg0vkn63xxjj3bqmsbh"; - }; - } - { - goPackagePath = "github.com/dimfeld/httptreemux"; - fetch = { - type = "git"; - url = "https://github.com/dimfeld/httptreemux"; - rev = "a454a10de4a11f751681a0914461ab9e98c2a3ff"; - sha256 = "0qx94lij9ldzd1xl36rl8blbgzjz9b4rkpydi44d9lik7qkdi5gp"; - }; - } - { - goPackagePath = "github.com/dsnet/compress"; - fetch = { - type = "git"; - url = "https://github.com/dsnet/compress"; - rev = "da652975a8eea9fa0735aba8056747a751db0bd3"; - sha256 = "1wwjaymzb1xxq3ybch3nwn72xhi2s40cvz0cl986yad3w1xwzj91"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "11844c0959f6fff69ba325d097fce35bd85a8e93"; - sha256 = "0driasljawka9r914530mr9df2i5cwldcgj2v94qkhzlkb48ljwc"; - }; - } - { - goPackagePath = "github.com/go-playground/ansi"; - fetch = { - type = "git"; - url = "https://github.com/go-playground/ansi"; - rev = "777788a9be1a7296979a999c86b251fc777077a9"; - sha256 = "1y2pqx04lc7cqg50scfivzw0n8f0dliflnih14f5jf4svff8s561"; - }; - } - { - goPackagePath = "github.com/go-playground/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-playground/errors"; - rev = "4050dd2e2e3b2052ef736048661d1d23a4a4e55d"; - sha256 = "0b3bhf2c9fpv095db3ajyb1fz7nxjn7rfg9rjb83hqfm492wjy86"; - }; - } - { - goPackagePath = "github.com/go-playground/log"; - fetch = { - type = "git"; - url = "https://github.com/go-playground/log"; - rev = "fdcdf507e3bf20900bc1a44b0cbd73fee5bcbe19"; - sha256 = "0mbzawm09n2kggrkmj0khrhipmdi191z01mw120ahbmmjdjls749"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "2a8bb927dd31d8daada140a5d09578521ce5c36a"; - sha256 = "0gp3kkzlm3wh37kgkhbqxq3zx07iqbgis5w9mf4d64h6vjq760is"; - }; - } - { - goPackagePath = "github.com/gorilla/handlers"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/handlers"; - rev = "ac6d24f88de4584385a0cb3a88f953d08a2f7a05"; - sha256 = "166p7yw2sy6lbxgyk722phkskmxzv3v21vf0l145zicrn30m9zli"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "0ec3d1bd7fe50c503d6df98ee649d81f4857c564"; - sha256 = "0mdq489izwy20bpjg31k8qnfgvh5r7mm5yq709q6xyzmzdd5nasx"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "26a05976f9bf5c3aa992cc20e8588c359418ee58"; - sha256 = "0bmvrgg373fxwqsr6nri01bmi9qdj6knxkmnbw70h9rmi2d9c585"; - }; - } - { - goPackagePath = "github.com/lann/builder"; - fetch = { - type = "git"; - url = "https://github.com/lann/builder"; - rev = "47ae307949d02aa1f1069fdafc00ca08e1dbabac"; - sha256 = "1kg9jy1rciznj627hafpq2mi7hr5d3ssgqcpwrm3bnlk9sqnydil"; - }; - } - { - goPackagePath = "github.com/lann/ps"; - fetch = { - type = "git"; - url = "https://github.com/lann/ps"; - rev = "62de8c46ede02a7675c4c79c84883eb164cb71e3"; - sha256 = "10yhcyymypvdiiipchsp80jbglk8c4r7lq7h54v9f4mxmvz6xgf7"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "9eb73efc1fcc404148b56765b0d3f61d9a5ef8ee"; - sha256 = "17wkjdz265iqf92gj3ljslvjcqvkfblw11jdq2scc3kp1hcsfr10"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "ad30583d8387ce8118f8605eaeb3b4f7b4ae0ee1"; - sha256 = "024h09n4g41x4awzim5l0vxpj1nfwc9isf8bryrdnichpqpa6siz"; - }; - } - { - goPackagePath = "github.com/nwaples/rardecode"; - fetch = { - type = "git"; - url = "https://github.com/nwaples/rardecode"; - rev = "197ef08ef68c4454ae5970a9c2692d6056ceb8d7"; - sha256 = "0vvijw7va283dbdvnf4bgkn7bjngxqzk1rzdpy8sl343r62bmh4g"; - }; - } - { - goPackagePath = "github.com/oschwald/maxminddb-golang"; - fetch = { - type = "git"; - url = "https://github.com/oschwald/maxminddb-golang"; - rev = "fc04c43d3c694a35570a7e4358b0f4d4ac3fea32"; - sha256 = "16bz3g8mkg2xhb4pxcpk6scxrmn48485jgky7wvi4gzpizlhsxxq"; - }; - } - { - goPackagePath = "github.com/otium/ytdl"; - fetch = { - type = "git"; - url = "https://github.com/otium/ytdl"; - rev = "5c8ee71b4175be285baaff66147458254884f748"; - sha256 = "1w22cfc6nr7z5fc3hmcymmx2xfcb66ylhfs89vn4i19ksxbkkcjk"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "062282ea0dcff40c9fb8525789eef9644b1fbd6e"; - sha256 = "04lzigxv2f4yv9gr1dybsjkcnmv1lj0mx9ls2ry1pzy2l9z6i6cp"; - }; - } - { - goPackagePath = "github.com/rakyll/statik"; - fetch = { - type = "git"; - url = "https://github.com/rakyll/statik"; - rev = "79258177a57a85a8ab2eca7ce0936aad80307f4e"; - sha256 = "14wqh38a7dhm2jgr1lsl2wdvjmkgdapzl2z4a1vl7ncv3x43gkg5"; - }; - } - { - goPackagePath = "github.com/sevlyar/go-daemon"; - fetch = { - type = "git"; - url = "https://github.com/sevlyar/go-daemon"; - rev = "fedf95d0cd0be92511436dbc84c290ff1c104f61"; - sha256 = "1ffjgx75wvpharzq60aqbpl78z1jwx13b21ifcadm1f976vdjq1q"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "dae0fa8d5b0c810a8ab733fbd5510c7cae84eca4"; - sha256 = "1y1qjcg19z7q9sy32rhc148kdql2aw7xkcm9d6r1blrl0mdgpx0w"; - }; - } - { - goPackagePath = "github.com/ulikunitz/xz"; - fetch = { - type = "git"; - url = "https://github.com/ulikunitz/xz"; - rev = "6f934d456d51e742b4eeab20d925a827ef22320a"; - sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831"; - }; - } - { - goPackagePath = "github.com/valyala/bytebufferpool"; - fetch = { - type = "git"; - url = "https://github.com/valyala/bytebufferpool"; - rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf"; - sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag"; - }; - } - { - goPackagePath = "github.com/valyala/quicktemplate"; - fetch = { - type = "git"; - url = "https://github.com/valyala/quicktemplate"; - rev = "d08324ac14fa81325830fae7eb30188ec68427f8"; - sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx"; - }; - } - { - goPackagePath = "gitlab.com/nyarla/go-crypt"; - fetch = { - type = "git"; - url = "https://gitlab.com/nyarla/go-crypt.git"; - rev = "d9a5dc2b789bc330075d4b805d9b7c971f2865a1"; - sha256 = "0249hbwvhy0xywi9b5k8964km27pvfkr3jvliy3azri6vnyvkkx1"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2bc60bb26ad24e09734fdc2d9ec58"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d8887717615a059821345a5c23649351b52a1c0b"; - sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fead79001313d15903fb4605b4a1b781532cd93e"; - sha256 = "12vwl6sv6w7q0dyvynjhbp67242rhh77d6nlsb22ajr8rf17c63i"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "5d731a35f4867878fc89f7744f7b6debb3beded6"; - sha256 = "1ipmjki0i0dvpal1g0vgr8qc77kkvw3ka6yxlm0qzjk9j3579bsq"; - }; - } - { - goPackagePath = "gopkg.in/gomail.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/gomail.v2"; - rev = "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1"; - sha256 = "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc"; - }; - } - { - goPackagePath = "gopkg.in/mholt/archiver.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/mholt/archiver.v2"; - rev = "de0d89e255e17c8d75a40122055763e743ab0593"; - sha256 = "02fsc0za0yi3dg0r5caa8vpxz6kqxjxxlmwzzj5899dlmdvqk57g"; - }; - } -] From d23b407be4a0bac48fad74d02acc1688b3c5d684 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Fri, 21 Aug 2020 22:02:27 +0200 Subject: [PATCH 416/520] vscode, vscodium: 1.48.0 -> 1.48.1 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 25d9eaabef4..0bf0435d2fc 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0rrs2v97xhlxyjvipss5dmk88j7b03kyszwyhy46755954nzm85j"; - x86_64-darwin = "1vmr78wf6cpib6j0f5gxs8683n27jk96lm4mwg6ji1np6b00m8nx"; + x86_64-linux = "1yar8j6h39gpnq4givxh5cvi336p56sgc8pg32j6sasqk6mxv02c"; + x86_64-darwin = "1d68xkqkd49z7v4y3230l2v77aw34d7jkdbgj0wnc04kv6n8wx88"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.0"; + version = "1.48.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index aa63bce7b53..edb55264354 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1zf2z6rbm18cib4crnn8r6ggx3cc2irwqjhbka2zmq38z7l3qv6c"; - x86_64-darwin = "1rgbr1q35q0q64kzap6g72nyvcp5wjmyzi8701536az7mxjfvjz4"; + x86_64-linux = "0f8p25963i7bbm2zxb4ra935maxk3sxims6j873wqwqnzn701diq"; + x86_64-darwin = "0k8ylcbiqvb0cnvbz3059rbyjqxmvig8zf7bfqgln1w591i411c4"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.0"; + version = "1.48.1"; pname = "vscodium"; executableName = "codium"; From 7ff5fd2e91f9f4e4034e197f8734024d283795a2 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 21 Aug 2020 22:30:27 +0200 Subject: [PATCH 417/520] fzf: Make sure that perl path is valid --- pkgs/tools/misc/fzf/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 2278e113395..d9fe6ac819b 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses }: +{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl }: buildGoModule rec { pname = "fzf"; @@ -27,6 +27,13 @@ buildGoModule rec { echo "Failed to replace vim base_dir path with $out" exit 1 fi + + # Has a sneaky dependency on perl + # Include first args to make sure we're patching the right thing + substituteInPlace shell/key-bindings.zsh \ + --replace " perl -ne " " ${perl}/bin/perl -ne " + substituteInPlace shell/key-bindings.bash \ + --replace " perl -n " " ${perl}/bin/perl -n " ''; preInstall = '' From 0447711c07e5a55400aaacc03b39e7a1eeaf8dd7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 22 Aug 2020 07:00:56 +1000 Subject: [PATCH 418/520] meguca: remove top-level attribute 6f4141507bb72fad0ea9221be1a1ed68e017f5af --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53d78398a6c..b81ee80fdc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16271,8 +16271,6 @@ in mediatomb = callPackage ../servers/mediatomb { }; - meguca = callPackage ../servers/meguca { }; - memcached = callPackage ../servers/memcached {}; meteor = callPackage ../servers/meteor { }; @@ -21299,7 +21297,7 @@ in ledger-autosync = callPackage ../applications/office/ledger-autosync { }; ledger-web = callPackage ../applications/office/ledger-web { }; - + lightburn = libsForQt5.callPackage ../applications/graphics/lightburn { }; lighthouse = callPackage ../applications/misc/lighthouse { }; From 00f08005af7d0c5140777d28bb6e3f8b41792d1e Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 19 Aug 2020 12:36:54 -0400 Subject: [PATCH 419/520] nixos/logrotate: switch `paths` option type from listOf to attrsOf --- nixos/modules/services/logging/logrotate.nix | 146 +++++++++++++------ 1 file changed, 105 insertions(+), 41 deletions(-) diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 565618b27a8..25dc8a32819 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -5,54 +5,93 @@ with lib; let cfg = config.services.logrotate; - pathOptions = { + pathOpts = { options = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable log rotation for this path. This can be used to explicitly disable + logging that has been configured by NixOS. + ''; + }; + path = mkOption { type = types.str; - description = "The path to log files to be rotated"; + description = '' + The path to log files to be rotated. + ''; }; + user = mkOption { - type = types.str; - description = "The user account to use for rotation"; + type = with types; nullOr str; + default = null; + description = '' + The user account to use for rotation. + ''; }; + group = mkOption { - type = types.str; - description = "The group to use for rotation"; + type = with types; nullOr str; + default = null; + description = '' + The group to use for rotation. + ''; }; + frequency = mkOption { - type = types.enum [ - "daily" "weekly" "monthly" "yearly" - ]; + type = types.enum [ "daily" "weekly" "monthly" "yearly" ]; default = "daily"; - description = "How often to rotate the logs"; + description = '' + How often to rotate the logs. + ''; }; + keep = mkOption { type = types.int; default = 20; - description = "How many rotations to keep"; + description = '' + How many rotations to keep. + ''; }; + extraConfig = mkOption { type = types.lines; default = ""; - description = "Extra logrotate config options for this path"; + description = '' + Extra logrotate config options for this path. Refer to + for details. + ''; + }; + + priority = mkOption { + type = types.int; + default = 1000; + description = '' + Order of this logrotate block in relation to the others. The semantics are + the same as with `lib.mkOrder`. Smaller values have a greater priority. + ''; }; }; - }; - pathConfig = options: '' - "${options.path}" { - su ${options.user} ${options.group} - ${options.frequency} + config.extraConfig = '' missingok notifempty - rotate ${toString options.keep} - ${options.extraConfig} + ''; + }; + + mkConf = pathOpts: '' + # generated by NixOS using the `services.logrotate.paths.${pathOpts.name}` attribute set + "${pathOpts.path}" { + ${optionalString (pathOpts.user != null || pathOpts.group != null) "su ${pathOpts.user} ${pathOpts.group}"} + ${pathOpts.frequency} + rotate ${toString pathOpts.keep} + ${pathOpts.extraConfig} } ''; - configFile = pkgs.writeText "logrotate.conf" ( - (concatStringsSep "\n" ((map pathConfig cfg.paths) ++ [cfg.extraConfig])) - ); + paths = sortProperties (mapAttrsToList (name: pathOpts: pathOpts // { name = name; }) (filterAttrs (_: pathOpts: pathOpts.enable) cfg.paths)); + configFile = pkgs.writeText "logrotate.conf" (concatStringsSep "\n" ((map mkConf paths) ++ [ cfg.extraConfig ])); in { @@ -65,41 +104,66 @@ in enable = mkEnableOption "the logrotate systemd service"; paths = mkOption { - type = types.listOf (types.submodule pathOptions); - default = []; - description = "List of attribute sets with paths to rotate"; - example = { - "/var/log/myapp/*.log" = { - user = "myuser"; - group = "mygroup"; - rotate = "weekly"; - keep = 5; - }; - }; + type = with types; attrsOf (submodule pathOpts); + default = {}; + description = '' + Attribute set of paths to rotate. The order each block appears in the generated configuration file + can be controlled by the priority option + using the same semantics as `lib.mkOrder`. Smaller values have a greater priority. + ''; + example = literalExample '' + { + httpd = { + path = "/var/log/httpd/*.log"; + user = config.services.httpd.user; + group = config.services.httpd.group; + keep = 7; + }; + + myapp = { + path = "/var/log/myapp/*.log"; + user = "myuser"; + group = "mygroup"; + frequency = "weekly"; + keep = 5; + priority = 1; + }; + } + ''; }; extraConfig = mkOption { default = ""; type = types.lines; description = '' - Extra contents to add to the logrotate config file. - See https://linux.die.net/man/8/logrotate + Extra contents to append to the logrotate configuration file. Refer to + for details. ''; }; }; }; config = mkIf cfg.enable { - systemd.services.logrotate = { - description = "Logrotate Service"; - wantedBy = [ "multi-user.target" ]; - startAt = "*-*-* *:05:00"; + assertions = mapAttrsToList (name: pathOpts: + { assertion = (pathOpts.user != null) == (pathOpts.group != null); + message = '' + If either of `services.logrotate.paths.${name}.user` or `services.logrotate.paths.${name}.group` are specified then *both* must be specified. + ''; + } + ) cfg.paths; - serviceConfig.Restart = "no"; - serviceConfig.User = "root"; + systemd.services.logrotate = { + description = "Logrotate Service"; + wantedBy = [ "multi-user.target" ]; + startAt = "*-*-* *:05:00"; script = '' exec ${pkgs.logrotate}/sbin/logrotate ${configFile} ''; + + serviceConfig = { + Restart = "no"; + User = "root"; + }; }; }; } From 06d17caf9251136b6e795c8729e70286efe1cd70 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 19 Aug 2020 12:38:20 -0400 Subject: [PATCH 420/520] nixos/httpd: configure log rotation --- .../web-servers/apache-httpd/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index e1d1217943b..0b5d57055ed 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -655,6 +655,25 @@ in # required for "apachectl configtest" environment.etc."httpd/httpd.conf".source = httpdConf; + services.logrotate = optionalAttrs (cfg.logFormat != "none") { + enable = mkDefault true; + paths.httpd = { + path = "${cfg.logDir}/*.log"; + user = cfg.user; + group = cfg.group; + frequency = "daily"; + keep = 28; + extraConfig = '' + sharedscripts + compress + delaycompress + postrotate + systemctl reload httpd.service > /dev/null 2>/dev/null || true + endscript + ''; + }; + }; + services.httpd.phpOptions = '' ; Needed for PHP's mail() function. From 3fbad3ec7a0c5c18cb188ee7c104ffa89031b240 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 21 Aug 2020 22:15:54 +0100 Subject: [PATCH 421/520] deno: 1.3.0 -> 1.3.1 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 7749249695d..3a0583628f0 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "163qvxggdv4mr1r1nab4s5n2b74bji0iil4r4nmp6n2ghssyf01h"; + sha256 = "1j5ajasng380p5a7nkk9ag5zp9ybwfz7b2z42lyk1wfg0pcd6j0r"; fetchSubmodules = true; }; - cargoSha256 = "11i00a92i2d6y2vj04wa6qbpsd351qcdy6a9ansq6n3928m9f2pk"; + cargoSha256 = "0ba7afk4n7k170cqwy0gjc53vz6bjc176s9w1wln6yfhh55fyw6x"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From d400dcaa48858c729d2b46249d09eae056e4a23f Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 21 Aug 2020 23:06:48 +0200 Subject: [PATCH 422/520] release-notes: Mention freeform modules As introduced by https://github.com/NixOS/nixpkgs/pull/82743 --- nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 4695175638d..908fc3b1a1d 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -190,6 +190,11 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; + + + The NixOS module system now supports freeform modules as a mix between types.attrsOf and types.submodule. These allow you to explicitly declare a subset of options while still permitting definitions without an associated option. See for how to use them. + +
From b6d657adbef938aab89ca7df3a1a7f60fef59828 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 21 Aug 2020 23:07:27 +0200 Subject: [PATCH 423/520] release-notes: Mention stricter option evaluation As caused by https://github.com/NixOS/nixpkgs/pull/82743 --- nixos/doc/manual/release-notes/rl-2009.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 908fc3b1a1d..d65217610e7 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -736,6 +736,13 @@ CREATE ROLE postgres LOGIN SUPERUSER; The USBGuard module now removes options and instead hardcodes values for IPCAccessControlFiles, ruleFiles, and auditFilePath. Audit logs can be found in the journal. + + + The NixOS module system now evaluates option definitions more strictly, allowing it to detect a larger set of problems. + As a result, what previously evaluated may not do so anymore. + See the PR that changed this for more info. + + From 19d2c0cb55ccb875c70e1454565cbc871887031d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 21 Aug 2020 14:41:03 -0700 Subject: [PATCH 424/520] nixos/release-notes: minor fixes --- nixos/doc/manual/release-notes/rl-2009.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index d65217610e7..f13be77f2c7 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -137,7 +137,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; - services.postfix.sslCACert was replaced by services.postfix.tlsTrustedAuthorities which now defaults to system certifcate authorities. + services.postfix.sslCACert was replaced by services.postfix.tlsTrustedAuthorities which now defaults to system certificate authorities. @@ -238,7 +238,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; in the source tree for downloaded modules instead of using go's module proxy protocol. This storage format is simpler and therefore less - likekly to break with future versions of go. As a result + likely to break with future versions of go. As a result buildGoModule switched from modSha256 to the vendorSha256 attribute to pin fetched version data. @@ -250,7 +250,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; deprecated in Grafana and the phantomjs project is currently unmaintained. - It can still be enabled by providing phantomJsSupport = true to the package instanciation: + It can still be enabled by providing phantomJsSupport = true to the package instantiation: { services.grafana.package = pkgs.grafana.overrideAttrs (oldAttrs: rec { phantomJsSupport = false; @@ -262,7 +262,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; The supybot module now uses /var/lib/supybot as its default stateDir path if stateVersion - is 20.09 or higher. It also enables number of + is 20.09 or higher. It also enables a number of systemd sandboxing options which may possibly interfere with some plugins. If this is the case you can disable the options through attributes in . From 5db4a6538498b55ad1fc9c13ba33fee242c1453d Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 21 Aug 2020 13:54:25 -0700 Subject: [PATCH 425/520] dfhack: 0.47.04-alpha0 -> 0.47.04-r2 As of https://github.com/DFHack/dfhack/commit/56e43a0dde023c5a4595a22b29d800153b31e3c4, dfhack gets its goodies from the directory above the Dwarf_Fortress executable, which leads to stock Dwarf Fortress and not the built environment where all the dfhack resources are symlinked to (typically ~/.local/share/df_linux). This causes errors like `tweak is not a recognized command` to be reported and dfhack to lose some of its functionality. --- pkgs/games/dwarf-fortress/dfhack/default.nix | 21 +++++++++++++++---- .../wrapper/dwarf-fortress-init.in | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index bd37f6180b1..03ce8a285ab 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -53,10 +53,10 @@ let prerelease = true; }; "0.47.04" = { - dfHackRelease = "0.47.04-alpha0"; - sha256 = "07056k6717mqim9skwjprqplj8jmmli6g4p2c72c8000jwnn2hjy"; - xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd50aa"; - prerelease = true; + dfHackRelease = "0.47.04-r2"; + sha256 = "18ppn1dqaxi6ahjzsvb9kw70rvca106a1hibhzc4rxmraypnqb89"; + xmlRev = "036b662a1bbc96b4911f3cbe74dfa1243b6459bc"; + prerelease = false; }; }; @@ -109,6 +109,19 @@ let }; patches = [ ./fix-stonesense.patch ]; + + # As of + # https://github.com/DFHack/dfhack/commit/56e43a0dde023c5a4595a22b29d800153b31e3c4, + # dfhack gets its goodies from the directory above the Dwarf_Fortress + # executable, which leads to stock Dwarf Fortress and not the built + # environment where all the dfhack resources are symlinked to (typically + # ~/.local/share/df_linux). This causes errors like `tweak is not a + # recognized command` to be reported and dfhack to lose some of its + # functionality. + postPatch = '' + sed -i 's@cached_path = path_string.*@cached_path = getenv("DF_DIR");@' library/Process-linux.cpp + ''; + nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # We don't use system libraries because dfhack needs old C++ ABI. buildInputs = [ zlib SDL ] diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in index 054935af012..b041067d89e 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in +++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in @@ -1,6 +1,6 @@ shopt -s extglob -[ -z "$DF_DIR" ] && DF_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/df_linux" +[ -z "$DF_DIR" ] && export DF_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/df_linux" env_dir="@env@" exe="$env_dir/@exe@" From 50bf68669a9a362422660288c4357a1d4af60119 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 21 Aug 2020 13:57:25 -0700 Subject: [PATCH 426/520] dfhack: fix ruby plugin dfhack expects an unversioned libruby.so to be present in the hack subdirectory for ruby plugins to function. The glob is necessary, because the ruby package's library names are formatted as ruby-${version}.so for whatever reason. The glob makes it possible for ruby to update without manual intervention being needed here. --- pkgs/games/dwarf-fortress/dfhack/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 03ce8a285ab..11c21b82c29 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,5 +1,5 @@ { stdenv, buildEnv, lib, fetchFromGitHub, cmake, writeScriptBin -, perl, XMLLibXML, XMLLibXSLT, zlib +, perl, XMLLibXML, XMLLibXSLT, zlib, ruby , enableStoneSense ? false, allegro5, libGLU, libGL , enableTWBT ? true, twbt , SDL @@ -140,6 +140,12 @@ let cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ] ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; + # dfhack expects an unversioned libruby.so to be present in the hack + # subdirectory for ruby plugins to function. + postInstall = '' + ln -s ${ruby}/lib/libruby-*.so $out/hack/libruby.so + ''; + enableParallelBuilding = true; }; in From e2b09f42ba613215763873c76ec1c71a5ea7da14 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 21 Aug 2020 14:00:48 -0700 Subject: [PATCH 427/520] dwarf-fortress: TWBT: use fork for dfhack 0.47.04 support The original mifki TWBT hasn't been updated since April 2019, while thurin's fork has added support for dfhack 0.47.04-r2. Thus, switch to thurin's fork when Dwarf Fortress 0.47.04 is used (and ever-so-slightly special case the url attribute). --- pkgs/games/dwarf-fortress/twbt/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index b5bff0e9b7a..a0990e04f93 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -42,9 +42,10 @@ let prerelease = false; }; "0.47.04" = { - twbtRelease = "6.61"; - sha256 = "07bqy9rkd64h033sxdpigp5zq4xrr0xd36wdr1b21g649mv8j6yw"; - prerelease = false; + twbtRelease = "6.xx"; + dfhackRelease = "0.47.04-r2"; + sha256 = "092dgp8fh1j4nqr9wbzn89ib1nhscclr8m91lfxsvg0mgn7j8xlv"; + prerelease = true; }; }; @@ -58,7 +59,11 @@ stdenvNoCC.mkDerivation rec { version = release.twbtRelease; src = fetchurl { - url = "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip"; + url = + if version == "6.xx" then + "https://github.com/thurin/df-twbt/releases/download/${release.dfhackRelease}/twbt-${version}-linux64-${release.dfhackRelease}.zip" + else + "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip"; sha256 = release.sha256; }; From 3a09fbb2777872f33bafa14496d4192105c26321 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Fri, 21 Aug 2020 17:56:16 -0400 Subject: [PATCH 428/520] keepassxc: 2.6.0 -> 2.6.1 --- pkgs/applications/misc/keepassx/community.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 86ea1d6d504..f0131712b23 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -40,13 +40,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "0yi6kxnsrqirjn6hxhwym2krzf86qxf3kc6bfpkmiaggnd2kqpkp"; + sha256 = "0wgn0glmcxaa670bpxh7n7abjlxcx4h1rl1169cmah0ddxnxnxpq"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ From 2da8587c010649ebd65813b64eedca0cbfbf911f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 22 Aug 2020 07:59:13 +1000 Subject: [PATCH 429/520] deepin.dde-api: mark as broken --- pkgs/desktops/deepin/dde-api/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index 011be982df5..95e38a86416 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -123,5 +123,6 @@ buildGoPackage rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; + broken = true; # 2020-08-22 https://hydra.nixos.org/build/125354866/nixlog/2 }; } From 01c32e49a94db858d3c4bc0b23d311df202fb329 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 21 Aug 2020 23:08:15 +0100 Subject: [PATCH 430/520] deno: avoid nix-prefetch error nix-prefetch is failing with an error containing 'allow-unsafe-native-code-during-evaluation'. This change avoids and handles this error so the update still used. This isn't intended as a permanent fix but it works for now. --- pkgs/development/web/deno/update/common.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/deno/update/common.ts b/pkgs/development/web/deno/update/common.ts index 71e4d638f8d..d8956b21d16 100644 --- a/pkgs/development/web/deno/update/common.ts +++ b/pkgs/development/web/deno/update/common.ts @@ -8,7 +8,20 @@ const run = async (command: string, args: string[]) => { { cmd: [command, ...args], stdout: "piped", stderr: "piped" }, ); if (!(await cmd.status()).success) { - throw await cmd.stderrOutput().then((b) => decode(b)); + const error = await cmd.stderrOutput().then((b) => decode(b).trimEnd()); + // Known error we can ignore + if (error.includes("'allow-unsafe-native-code-during-evaluation'")) { + // Extract the target sha256 out of the error + const target = " got: sha256:"; + const match = error + .split("\n") + .find((l) => l.includes(target)) + ?.split(target)[1]; + if (typeof match !== "undefined") { + return match; + } + } + throw new Error(error); } return cmd.output().then((b) => decode(b).trimEnd()); }; From 0466ae30ea68617641a2cb0d0a35bb2b3f5f7921 Mon Sep 17 00:00:00 2001 From: Matthias Totschnig Date: Thu, 14 May 2020 17:55:10 +0200 Subject: [PATCH 431/520] python2.pkgs.rethinkdb: fix Add missing dependency on `setuptools`, reflect changed license. --- pkgs/development/python-modules/rethinkdb/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix index 64de384dcb1..616cabc29a0 100644 --- a/pkgs/development/python-modules/rethinkdb/default.nix +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , six +, setuptools }: buildPythonPackage rec { @@ -13,7 +14,7 @@ buildPythonPackage rec { sha256 = "945b5efdc10f468fc056bd53a4e4224ec4c2fe1a7e83ae47443bbb6e7c7a1f7d"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six setuptools ]; doCheck = false; pythonImportsCheck = [ "rethinkdb" ]; @@ -21,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python driver library for the RethinkDB database server"; homepage = "https://pypi.python.org/pypi/rethinkdb"; - license = licenses.agpl3; + license = licenses.asl20; }; } From 8025e4ffe445d97eb9377e4d66441cebcca65ca0 Mon Sep 17 00:00:00 2001 From: Matthias Totschnig Date: Thu, 14 May 2020 17:55:41 +0200 Subject: [PATCH 432/520] rethinkdb: 2.3.6 -> 2.4.1, fix Update patch that prevents making V8 snapshots, as those segfault. Fix build by building only the database server. Other make targets fetch dependencies at build time and this behaviour cannot be overriden. Therefore, the clients and web interface are no longer built. See rethinkdb/rethinkdb#6867. --- pkgs/servers/nosql/rethinkdb/default.nix | 19 +++++++--------- .../nosql/rethinkdb/v8-no-snapshot.patch | 22 +++++++++++++++++++ 2 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 pkgs/servers/nosql/rethinkdb/v8-no-snapshot.patch diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 46a23ed2529..80d287699ac 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -5,19 +5,15 @@ stdenv.mkDerivation rec { pname = "rethinkdb"; - version = "2.3.6"; + version = "2.4.1"; src = fetchurl { - url = "https://download.rethinkdb.com/dist/${pname}-${version}.tgz"; - sha256 = "0a6wlgqa2flf87jrp4fq4y9aihwyhgwclmss56z03b8hd5k5j8f4"; + url = "https://download.rethinkdb.com/repository/raw/dist/${pname}-${version}.tgz"; + sha256 = "5f1786c94797a0f8973597796e22545849dc214805cf1962ef76969e0b7d495b"; }; - patches = [ - (fetchurl { - url = "https://github.com/rethinkdb/rethinkdb/commit/871bd3705a1f29c4ab07a096d562a4b06231a97c.patch"; - sha256 = "05nagixlwnq3x7441fhll5vs70pxppbsciw8qjqp660bdb5m4jm1"; - }) - ]; + # Don't make V8 snapshots, as those segfault. + patches = [ ./v8-no-snapshot.patch ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py @@ -36,6 +32,8 @@ stdenv.mkDerivation rec { "--lib-path=${jemalloc}/lib" ]; + makeFlags = [ "rethinkdb" ]; + buildInputs = [ protobuf boost zlib curl openssl icu makeWrapper ] ++ stdenv.lib.optional (!stdenv.isDarwin) jemalloc ++ stdenv.lib.optional stdenv.isDarwin libtool; @@ -58,9 +56,8 @@ stdenv.mkDerivation rec { joins and group by, and is easy to setup and learn. ''; homepage = "http://www.rethinkdb.com"; - license = stdenv.lib.licenses.agpl3; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice bluescreen303 ]; - broken = true; # broken with openssl 1.1 }; } diff --git a/pkgs/servers/nosql/rethinkdb/v8-no-snapshot.patch b/pkgs/servers/nosql/rethinkdb/v8-no-snapshot.patch new file mode 100644 index 00000000000..e9ef5438d6b --- /dev/null +++ b/pkgs/servers/nosql/rethinkdb/v8-no-snapshot.patch @@ -0,0 +1,22 @@ +diff --git a/mk/support/pkg/v8.sh b/mk/support/pkg/v8.sh +index a1810cc..da2b645 100644 +--- a/mk/support/pkg/v8.sh ++++ b/mk/support/pkg/v8.sh +@@ -155,7 +155,7 @@ pkg_install () { + if [[ "$arch" = "ppc64" ]]; then + arch_gypflags="$arch_gypflags -Duse_system_icu=1" + fi +- pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= $arch_gypflags" V=1 ++ pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= -Dv8_use_snapshot=false $arch_gypflags" V=1 + for lib in `find "$build_dir/out/$arch.$mode" -maxdepth 1 -name \*.a` `find "$build_dir/out/$arch.$mode/obj.target" -name \*.a`; do + name=`basename $lib` + cp $lib "$install_dir/lib/${name/.$arch/}" +@@ -168,7 +168,7 @@ pkg_link-flags () { + # These are the necessary libraries recommended by the docs: + # https://developers.google.com/v8/get_started#hello + if [[ "$ARCH" != "ppc64le" ]]; then +- for lib in libv8_{base,libbase,snapshot,libplatform}; do ++ for lib in libv8_{base,libbase,nosnapshot,libplatform}; do + echo "$install_dir/lib/$lib.a" + done + for lib in libicu{i18n,uc,data}; do From 9b2769b0611645e25046eb996896ae65f360c4f6 Mon Sep 17 00:00:00 2001 From: Matthias Totschnig Date: Fri, 29 May 2020 12:00:37 +0200 Subject: [PATCH 433/520] rethinkdb: use clangStdenv And remove patch working around a GCC bug. --- pkgs/servers/nosql/rethinkdb/default.nix | 3 --- .../nosql/rethinkdb/v8-no-snapshot.patch | 22 ------------------- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 pkgs/servers/nosql/rethinkdb/v8-no-snapshot.patch diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 80d287699ac..40ffddd4f10 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -12,9 +12,6 @@ stdenv.mkDerivation rec { sha256 = "5f1786c94797a0f8973597796e22545849dc214805cf1962ef76969e0b7d495b"; }; - # Don't make V8 snapshots, as those segfault. - patches = [ ./v8-no-snapshot.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py diff --git a/pkgs/servers/nosql/rethinkdb/v8-no-snapshot.patch b/pkgs/servers/nosql/rethinkdb/v8-no-snapshot.patch deleted file mode 100644 index e9ef5438d6b..00000000000 --- a/pkgs/servers/nosql/rethinkdb/v8-no-snapshot.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/mk/support/pkg/v8.sh b/mk/support/pkg/v8.sh -index a1810cc..da2b645 100644 ---- a/mk/support/pkg/v8.sh -+++ b/mk/support/pkg/v8.sh -@@ -155,7 +155,7 @@ pkg_install () { - if [[ "$arch" = "ppc64" ]]; then - arch_gypflags="$arch_gypflags -Duse_system_icu=1" - fi -- pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= $arch_gypflags" V=1 -+ pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= -Dv8_use_snapshot=false $arch_gypflags" V=1 - for lib in `find "$build_dir/out/$arch.$mode" -maxdepth 1 -name \*.a` `find "$build_dir/out/$arch.$mode/obj.target" -name \*.a`; do - name=`basename $lib` - cp $lib "$install_dir/lib/${name/.$arch/}" -@@ -168,7 +168,7 @@ pkg_link-flags () { - # These are the necessary libraries recommended by the docs: - # https://developers.google.com/v8/get_started#hello - if [[ "$ARCH" != "ppc64le" ]]; then -- for lib in libv8_{base,libbase,snapshot,libplatform}; do -+ for lib in libv8_{base,libbase,nosnapshot,libplatform}; do - echo "$install_dir/lib/$lib.a" - done - for lib in libicu{i18n,uc,data}; do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afd3cb6c50b..173118bad89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16732,6 +16732,7 @@ in restya-board = callPackage ../servers/web-apps/restya-board { }; rethinkdb = callPackage ../servers/nosql/rethinkdb { + stdenv = clangStdenv; libtool = darwin.cctools; }; From 56535ba53006411188369dd7a73ef757a15f6508 Mon Sep 17 00:00:00 2001 From: Sybrand Aarnoutse Date: Fri, 21 Aug 2020 23:02:46 +0200 Subject: [PATCH 434/520] pipes: fix dependencies Fixes: https://github.com/NixOS/nixpkgs/issues/95902 --- pkgs/misc/screensavers/pipes/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 211b7614f3b..94d6299d383 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs }: +{ stdenv, fetchurl, makeWrapper, coreutils, ncurses }: stdenv.mkDerivation rec { pname = "pipes"; @@ -9,11 +9,14 @@ stdenv.mkDerivation rec { sha256 = "09m4alb3clp3rhnqga5v6070p7n1gmnwp2ssqhq87nf2ipfpcaak"; }; - buildInputs = with pkgs; [ bash ]; + buildInputs = [ makeWrapper ]; installPhase = '' mkdir $out -p make PREFIX=$out/ install + + wrapProgram $out/bin/pipes.sh \ + --set PATH "${stdenv.lib.makeBinPath [ coreutils ncurses ]}" ''; meta = with stdenv.lib; { From 1b8a94db6744dc6bea9bd9dfad8e6628a95e27fd Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 22 Aug 2020 01:38:38 +0200 Subject: [PATCH 435/520] nixos/logrotate: Fix option reference Fixes the manual build --- nixos/modules/services/logging/logrotate.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 25dc8a32819..7d6102b8255 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -108,7 +108,7 @@ in default = {}; description = '' Attribute set of paths to rotate. The order each block appears in the generated configuration file - can be controlled by the priority option + can be controlled by the priority option using the same semantics as `lib.mkOrder`. Smaller values have a greater priority. ''; example = literalExample '' From 573125efef7c0912a598f649d07ed687622b7913 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 00:21:38 +0000 Subject: [PATCH 436/520] atlantis: 0.14.0 -> 0.15.0 --- pkgs/applications/networking/cluster/atlantis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 86d1b80d061..d3e18ce691f 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "atlantis"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "1g1bh1v3yd3dz80ckjrhspmsf78nw8hc907hh9jzbq62psqg4459"; + sha256 = "0nb0dm4yn6f5pw7clgb2d1khcwcxiidqyc0sdh38wwqg0zyil0cz"; }; vendorSha256 = null; From a4672f78d55a07630c4f5b3f8445664726509fe8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 23:13:50 -0700 Subject: [PATCH 437/520] python3Packages.pyfxa: fix deps and tests --- pkgs/development/python-modules/pyfxa/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index 5cc83466262..eb5403c2b96 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , requests, cryptography, pybrowserid, hawkauthlib, six -, grequests, mock, responses, pytest }: +, grequests, mock, responses, pytest, pyjwt }: buildPythonPackage rec { pname = "PyFxA"; @@ -17,15 +17,16 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - requests cryptography pybrowserid hawkauthlib six + pyjwt requests cryptography pybrowserid hawkauthlib six ]; checkInputs = [ grequests mock responses pytest ]; + # test_oath is mostly network calls checkPhase = '' - pytest + pytest --ignore=fxa/tests/test_oauth.py ''; meta = with lib; { From 43fc3a03a2dd8905c89e59ef4f5876b83d238173 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 23:15:11 -0700 Subject: [PATCH 438/520] eolie: 0.9.63 -> 0.9.99, fix build --- .../networking/browsers/eolie/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index ca868a08077..94cd619ca20 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script -, python3, gtk3, libsecret, gst_all_1, webkitgtk +, python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils -, gobject-introspection, wrapGAppsHook }: +, gobject-introspection, wrapGAppsHook, gnome3 }: python3.pkgs.buildPythonApplication rec { pname = "eolie"; - version = "0.9.63"; + version = "0.9.99"; format = "other"; doCheck = false; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/eolie"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0z8gcfg7i842rr5p8r3vqa31kf7nnj1yv3afax3jzf4zbnhb8wm0"; + sha256 = "077jww5mqg6bbqbj0j1gss2j3dxlfr2xw8bc43k8vg52drqg6g8w"; }; nativeBuildInputs = [ @@ -33,18 +33,23 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gst-plugins-ugly gstreamer + gnome3.gnome-settings-daemon gtk3 gtkspell3 hunspell libsecret webkitgtk + glib ]; propagatedBuildInputs = with python3.pkgs; [ + pyfxa beautifulsoup4 + cryptography pycairo pygobject3 python-dateutil + pycrypto ]; postPatch = '' @@ -52,9 +57,11 @@ python3.pkgs.buildPythonApplication rec { patchShebangs meson_post_install.py ''; + dontWrapGApps = true; preFixup = '' buildPythonPath "$out $propagatedBuildInputs" patchPythonScript "$out/libexec/eolie-sp" + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; passthru = { @@ -63,6 +70,7 @@ python3.pkgs.buildPythonApplication rec { }; }; + strictDeps = false; meta = with stdenv.lib; { description = "A new GNOME web browser"; From b9592aa9ae9c4e53c1a1ac605c88b7bfa8bf1336 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 23:23:30 -0700 Subject: [PATCH 439/520] webkitgtk: add enableGLES switch --- pkgs/development/libraries/webkitgtk/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 72e78be9778..d60e56763a1 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -43,6 +43,7 @@ , sqlite , enableGtk2Plugins ? false , gtk2 ? null +, enableGLES ? true , gst-plugins-base , gst-plugins-bad , woff2 @@ -167,7 +168,7 @@ stdenv.mkDerivation rec { "-DUSE_ACCELERATE=0" "-DUSE_SYSTEM_MALLOC=ON" ] ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" - ++ optional stdenv.isLinux "-DENABLE_GLES2=ON"; + ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; postPatch = '' patchShebangs . From bd44ed5ab084fe23104aa71159d727e72b49e08e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Aug 2020 23:25:23 -0700 Subject: [PATCH 440/520] eolie: use webkitgtk without GLES enabled --- pkgs/applications/networking/browsers/eolie/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 94cd619ca20..a16beb65208 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { gtkspell3 hunspell libsecret - webkitgtk + (webkitgtk.override {enableGLES = false;}) glib ]; From 53f1e6b05bcda13c472df57e6b907f6b3598cb03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 01:03:28 +0000 Subject: [PATCH 441/520] azure-storage-azcopy: 10.5.1 -> 10.6.0 --- pkgs/development/tools/azcopy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index c08ca1429ce..3d0fe8513c8 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.5.1"; + version = "10.6.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "0bygbg1k6926ri3988wbz0b1vv6wamk799mn5nkjf0xa6gjfqqsr"; + sha256 = "0izjnbldgf0597j4rh2ir9jsc2nzp9vwxcgllvkm5lh1xqf6i0nf"; }; subPackages = [ "." ]; - vendorSha256 = "10bpzf8f7ibx1wzd0nzh5q1ynwfjr4n1gjygq4zqqxg51ganqj82"; + vendorSha256 = "10sxkb2dh1il4ps15dlvq0xsry8hax27imb5qg3khdmjhb4yaj7k"; doCheck = false; From 1f512d7804b51578502345cc2ef2c1fed2634ac1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 21 Aug 2020 11:29:15 -0500 Subject: [PATCH 442/520] z3: 4.8.7 -> 4.8.8 --- pkgs/applications/science/logic/z3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 53dfb84760e..9351d3c0756 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "z3"; - version = "4.8.7"; + version = "4.8.8"; src = fetchFromGitHub { owner = "Z3Prover"; repo = pname; rev = "z3-${version}"; - sha256 = "0hprcdwhhyjigmhhk6514m71bnmvqci9r8gglrqilgx424r6ff7q"; + sha256 = "1rn538ghqwxq0v8i6578j8mflk6fyv0cp4hjfqynzvinjbps56da"; }; buildInputs = [ python fixDarwinDylibNames ] ++ optional javaBindings jdk; From 616dd214d1be3fb1c8d5c7a5aec31a317e9eca12 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 21 Aug 2020 11:29:26 -0500 Subject: [PATCH 443/520] z3: add ttuegel to maintainers --- pkgs/applications/science/logic/z3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 9351d3c0756..350a4f99af8 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Z3Prover/z3"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.x86_64; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ttuegel ]; }; } From 457790b49e1ccc3e82d3e065dcb1417136caede7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 02:57:38 +0000 Subject: [PATCH 444/520] bazelisk: 1.6.0 -> 1.6.1 --- pkgs/development/tools/bazelisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 131b76f7826..e639c7ab314 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.6.0"; + version = "1.6.1"; patches = [ ./gomod.patch ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "0l1032c0nqbdyasq6f8yf0vph06w6v81w044fs70rgzsa91m038r"; + sha256 = "0g5zwdk7p1snqcbm4w3hsi3fm7sbsijrfj4ajxg7mifywqpmzm2l"; }; vendorSha256 = "1jgm6j04glvk7ib5yd0h04p9qxzl1ca100cv909kngx52jp61yxp"; From 923e1b0d2ffa073395e13d94725c3d0c80749e3d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 03:16:39 +0000 Subject: [PATCH 445/520] bitcoin-abc: 0.21.12 -> 0.21.13 --- pkgs/applications/blockchains/bitcoin-abc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 420e267aa82..1596ed2d357 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.21.12"; + version = "0.21.13"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1mad3aqfwrxi06135nf8hv13d67nilmxpx4dw5vjcy1zi3lljj1j"; + sha256 = "1x8xcdi1vcskggk9bqkwr3ah4vi9b7sj2h8hf7spac6dvz8lmzav"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; From a359d95c7389e42fcbdbfa7a35b8fb9feae08c34 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Sun, 16 Aug 2020 14:21:53 +1200 Subject: [PATCH 446/520] maintainers: add JJJollyjim --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cc2aa5a7efc..9a6fa5e6f39 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3835,6 +3835,12 @@ githubId = 51518420; name = "jitwit"; }; + jjjollyjim = { + email = "jamie@kwiius.com"; + github = "JJJollyjim"; + githubId = 691552; + name = "Jamie McClymont"; + }; jk = { email = "hello+nixpkgs@j-k.io"; github = "06kellyjac"; From b52196dca52d362cfdbb0529fce95278ad4074b3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Aug 2020 04:03:32 +0000 Subject: [PATCH 447/520] pmd: 6.25.0 -> 6.26.0 --- pkgs/development/tools/analysis/pmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index f80483e0e12..f91cdbead82 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.25.0"; + version = "6.26.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0ykg0wylyfiwjlhkbfjqfam34174paihrw7x1dwfq9anyn5bjf0k"; + sha256 = "1vlqwrbqk2cbp8kgxkm61c4blai81ib35yjf6wms16w0hvbqf2b4"; }; nativeBuildInputs = [ unzip makeWrapper ]; From 028853c3ef777ac41349275668f8e787d0b9ad37 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Aug 2020 09:25:45 +0000 Subject: [PATCH 448/520] innoextract: 1.8 -> 1.9 --- pkgs/tools/archivers/innoextract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 5dab1950145..da26639fcb5 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -3,11 +3,11 @@ , withGog ? false, unar ? null }: stdenv.mkDerivation rec { - name = "innoextract-1.8"; + name = "innoextract-1.9"; src = fetchurl { url = "https://constexpr.org/innoextract/files/${name}.tar.gz"; - sha256 = "0saj50n8ds85shygy4mq1h6s99510r9wgjjdll4dmvhra4lzcy2y"; + sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33"; }; buildInputs = [ python lzma boost ]; From 575490962ffffe7993502f2a684d95c5a153f037 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 00:08:38 +0000 Subject: [PATCH 449/520] arc-theme: 20200513 -> 20200819 --- pkgs/data/themes/arc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index ff20efd816b..1e36eb2f99a 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20200513"; + version = "20200819"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "1xiaf31v3j040hflhf09kpznc93a5fqs92m5jf79y46w3dgpia0p"; + sha256 = "1l5sc4r5jp3526r4p32fszny0cw6pkb45cp424hq0s0k344z9px6"; }; nativeBuildInputs = [ From ec257bea6523d147b55aa9a1f252453da1ca9f2e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 21 Aug 2020 19:54:49 -0500 Subject: [PATCH 450/520] recursive: 1.054 -> 1.057 https://github.com/arrowtype/recursive/releases/tag/1.057 --- pkgs/data/fonts/recursive/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 93f5698e555..7f3b9562e89 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,21 +1,21 @@ { lib, fetchzip }: let - version = "1.054"; + version = "1.057"; in fetchzip { name = "recursive-${version}"; - url = "https://github.com/arrowtype/recursive/releases/download/${version}/ArrowType-Recursive-${version}.zip"; + url = "https://github.com/arrowtype/recursive/releases/download/${version}/Recursive-${version}.zip"; postFetch = '' mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -x __MACOSX/\* -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -x __MACOSX/\* -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.woff2 -x __MACOSX/\* -d $out/share/fonts/woff2 + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "12ld0w7x5lyvymrnqzfj74a3m6knv7i1795bvnpyljmxxkacscnl"; + sha256 = "0qsqldnhgl93h1izminjajjymvyxsw91ngdbxlhgbqvadg77325y"; meta = with lib; { homepage = "https://recursive.design/"; From 60a133f5d19f3cc5d5cfb7f47fff564e748bd702 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 21 Aug 2020 05:06:22 +0000 Subject: [PATCH 451/520] adms: 2.3.6 -> 2.3.7 --- pkgs/applications/science/electronics/adms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix index f55dd2f0528..0fcf4d25e2d 100644 --- a/pkgs/applications/science/electronics/adms/default.nix +++ b/pkgs/applications/science/electronics/adms/default.nix @@ -2,14 +2,14 @@ libxml2, perl, perlPackages, gd }: stdenv.mkDerivation rec { - version = "2.3.6"; + version = "2.3.7"; pname = "adms"; src = fetchFromGitHub { owner = "Qucs"; repo = "adms"; rev = "release-${version}"; - sha256 = "1pcwq5khzdq4x33lid9hq967gv78dr5i4f2sk8m8rwkfqb9vdzrg"; + sha256 = "0i37c9k6q1iglmzp9736rrgsnx7sw8xn3djqbbjw29zsyl3pf62c"; }; nativeBuildInputs = [ autoreconfHook ]; From 70b4ba1d6845bcfcc6bd982754db2cf55c457371 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 04:23:42 +0000 Subject: [PATCH 452/520] clash: 1.0.0 -> 1.1.0 --- pkgs/tools/networking/clash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index c26af7743c4..4447ab0f048 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "0qyfv6h6m86m5bwayj0s1pjldnbagy63zc2ygzpnicihmd58khny"; + sha256 = "0cbbih035h40hhl7ykmyh9q9nzdqq1p8hmvzd4358cigz1gjc3j2"; }; - vendorSha256 = "0ap6wsx23s4q730s6d5cgc4ginh8zj5sd32k0za49fh50v8k8zbh"; + vendorSha256 = "0s7mhbjfpfmzqf48d7k0d416m39x6fh5ds4q3xnvhcfx5kmdymq6"; doCheck = false; From fae5c65e08836c720a1ef5e1c8f15d2c00006cc6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 04:36:09 +0000 Subject: [PATCH 453/520] clojure-lsp: 20200806T150857 -> 20200819T134828 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index d632c756c59..09313cd780f 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200806T150857"; + version = "20200819T134828"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "132w60p10ffr3vcykgw8rzxs54i6ynmw13p9nd59pqbn5adblrsp"; + sha256 = "0nfi6wf78z0xm0mgsz83pn1v4mr76h2d5rva3xan4hn8gpd1s57s"; }; dontUnpack = true; From 68c7262cfa97d881c68d2bc4952c1b028a049cbe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 05:10:00 +0000 Subject: [PATCH 454/520] croc: 8.0.12 -> 8.0.13 --- pkgs/tools/networking/croc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 9658fd5e46b..ed4f7a5f704 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "croc"; - version = "8.0.12"; + version = "8.0.13"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0j0cdxblh0h68a55jvljzahj851yba354xv2w5gg9hjzjd38769x"; + sha256 = "0vinccakinp996kqzry8irk7sf4djajxdfmpy982dl5y45491l4a"; }; vendorSha256 = "1d6gg7c0rb45zy9rilacn2xyr3kcb7acsh389hk6lppipmhpzr5a"; From a2978e5864a2d5056e76be0394e4ebcff166795e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 05:41:01 +0000 Subject: [PATCH 455/520] dnsproxy: 0.29.0 -> 0.31.0 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 52c7161f8e0..8f231935ee3 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.29.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "164l97x1g20a61jkb2dwwmf63md3np9x2m59dri3qf22k4rl4l0d"; + sha256 = "1jyik1022iv8nqjfrv3lkvcpr8zsaxfx8hi7yagklbs6vzlg80jg"; }; vendorSha256 = null; From d75d3ebf5e587bb795d72b8d21f4e7549edf9648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 22 Aug 2020 07:43:00 +0200 Subject: [PATCH 456/520] rocm-smi: 3.5.0 -> 3.7.0 --- pkgs/tools/system/rocm-smi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 159b41fd1ce..8cbc56e0468 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "rocm-smi"; - version = "3.5.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROC-smi"; rev = "rocm-${version}"; - sha256 = "189mpvmcv46nfwshyc1wla6k71kbraldik5an20g4v9s13ycrpx9"; + sha256 = "00g9cbni73x9da05lx7hiffp303mdkj1wpxiavfylr4q4z84yhrz"; }; format = "other"; From 6c5ded0652171d297013ee79a38042a52a7bdc37 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 05:50:45 +0000 Subject: [PATCH 457/520] doppler: 3.9.1 -> 3.10.1 --- pkgs/tools/security/doppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index f3d4c3d9f86..b637eacd3da 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.9.1"; + version = "3.10.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "1hfl70k4xz3kxylffybixgklv04sl47knbyd96h8rnmnhscniwzl"; + sha256 = "0wzs480dg6q6j8jzhk5lkf5hs53jf7ljmnyw3i9xwqm9sxq7dsfx"; }; vendorSha256 = "0wqbwk72k4r30a3vnf0gnx3k97y8xgnr2iavk5bc8f8vkjv0bsv6"; From 241b65c5967ee217301d98ff19f77ea901acb5e1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 15 Aug 2020 10:06:05 +0200 Subject: [PATCH 458/520] =?UTF-8?q?ocamlPackages.ocamlnet:=204.1.7=20?= =?UTF-8?q?=E2=86=92=204.1.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ocamlnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 7d9a0573db7..5b6e0dde8b7 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -8,11 +8,11 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocamlnet-${version}"; - version = "4.1.7"; + version = "4.1.8"; src = fetchurl { url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; - sha256 = "0r9gl0lsgxk2achixxqzm8bm5l9jwc4vwihf0rvxxa9v9q9vfdhi"; + sha256 = "1x703mjqsv9nvffnkj5i36ij2s5zfvxxll2z1qj6a7p428b2yfnm"; }; nativeBuildInputs = [ pkgconfig ]; From 4315835d63aa258615eb8ec977d52ff9cf7d5144 Mon Sep 17 00:00:00 2001 From: Steven Shaw Date: Thu, 20 Aug 2020 23:29:37 +1000 Subject: [PATCH 459/520] rescuetime: 2.16.2.1 -> 2.16.3.1 --- pkgs/applications/misc/rescuetime/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 837e30ee8f2..6b28b52dcf0 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -1,19 +1,21 @@ { stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver }: let + version = "2.16.3.1"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; - url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "157yg4n5ppgnrd5wrz06qfx391vggp3wifla39rvcaaysvvisl8v"; + url = "https://www.rescuetime.com/installers/rescuetime_${version}_i386.deb"; + sha256 = "1374nmj6g6w24cv604kzac0v57gcl1pwpw0nxpr7kv2786x1aqg2"; } else fetchurl { name = "rescuetime-installer.deb"; - url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "17gjiwf0qbh1zbrxxsilnpg0qxy5kdpqxlnl28namp671rv0aic8"; + url = "https://www.rescuetime.com/installers/rescuetime_${version}_amd64.deb"; + sha256 = "05qs6wbc3705z8w9c3n83m4j8xfmzm673lyh5j95x1ak5czkrphk"; }; in mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.16.2.1"; + inherit version; + pname = "rescuetime"; inherit src; nativeBuildInputs = [ dpkg ]; # avoid https://github.com/NixOS/patchelf/issues/99 From 8c61660aee33723f80eb8a010135b88b8dc31df2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 06:29:33 +0000 Subject: [PATCH 460/520] ergo: 3.3.0 -> 3.3.1 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index cfd72db7f46..83a6cfaf05b 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "1lja4ba6bm1jk0lh2ra5v8i5g3f1gy7mk2b3yrx1w7x02ll9gr06"; + sha256 = "1qr1vfb6mhm2hxl2ksydkhadm7phadn93lwm3f9zni01plk56bb5"; }; nativeBuildInputs = [ makeWrapper ]; From ae1898a70d666821a9d7b94cb7adc28ea69ca503 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 21 Aug 2020 23:39:46 -0700 Subject: [PATCH 461/520] cryptol: remove (#95948) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniël de Kok Co-authored-by: Jörg Thalheim --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c884b40ef2a..d697ecb55e1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -87,6 +87,7 @@ mapAliases ({ coprthr = throw "coprthr has been removed."; # added 2019-12-08 corebird = throw "deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement."; coredumper = throw "coredumper has been removed: Abandoned by upstream."; # added 2019-11-16 + cryptol = throw "cryptol was remove for prolonged broken build"; # added 2020-08-21 cpp-gsl = microsoft_gsl; # added 2019-05-24 cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4121e74536d..5209974ec1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8431,8 +8431,6 @@ in ''; }; - cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; - inherit (callPackages ../development/compilers/crystal { inherit (llvmPackages_10) stdenv clang llvm; }) From bbdb3248dba33b8efb4521501318100886550474 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 06:49:52 +0000 Subject: [PATCH 462/520] exoscale-cli: 1.16.0 -> 1.16.1 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 442df887955..bdde2b8f24c 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "0w0lgc3db9r1knd7hp98ycxfbfxbpfrb0vf4vxcqxlvlkjcrvg1z"; + sha256 = "0616nvqrcvn2xdmnkr5sjf1r5qg30b24ry87hhiqi4kz9a92qdx5"; }; goPackagePath = "github.com/exoscale/cli"; From 6e4dc306a5d8f77cce2df6de69ab52ef9e022c8e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 21 Aug 2020 08:26:06 +1000 Subject: [PATCH 463/520] go, buildGoModule, buildGoPackage: default to go 1.15 --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5209974ec1f..563fca23ff4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8965,7 +8965,7 @@ in buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; }); - go = go_1_14; + go = go_1_15; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -15850,7 +15850,7 @@ in go = buildPackages.go_1_15; }; - buildGoPackage = buildGo114Package; + buildGoPackage = buildGo115Package; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; @@ -15859,7 +15859,7 @@ in go = buildPackages.go_1_15; }; - buildGoModule = buildGo114Module; + buildGoModule = buildGo115Module; go2nix = callPackage ../development/tools/go2nix { }; From f4ed70f7282897033376eaf7c2e9aac727aa7496 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 21 Aug 2020 21:28:40 +1000 Subject: [PATCH 464/520] gvisor: pin to go 1.14 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 563fca23ff4..f8386e213df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20629,7 +20629,9 @@ in gv = callPackage ../applications/misc/gv { }; - gvisor = callPackage ../applications/virtualization/gvisor { }; + gvisor = callPackage ../applications/virtualization/gvisor { + go = go_1_14; + }; gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { }; From 286713b52c272cef6958cc0d1fd40ccd8a01f164 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 21 Aug 2020 21:28:41 +1000 Subject: [PATCH 465/520] ncdns: pin to go 1.14 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8386e213df..0df921c3411 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16334,7 +16334,9 @@ in unit = callPackage ../servers/http/unit { }; - ncdns = callPackage ../servers/dns/ncdns { }; + ncdns = callPackage ../servers/dns/ncdns { + buildGoPackage = buildGo114Package; + }; nginx = nginxStable; From 57e2f4fe4a350f3eb28c1c12a2d8164ea6b77f7b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 21 Aug 2020 21:28:41 +1000 Subject: [PATCH 466/520] grafana: pin to go 1.14 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0df921c3411..011f1ce4a38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16175,7 +16175,9 @@ in gofish = callPackage ../servers/gopher/gofish { }; - grafana = callPackage ../servers/monitoring/grafana { }; + grafana = callPackage ../servers/monitoring/grafana { + buildGoModule = buildGo114Module; + }; grafana-loki = callPackage ../servers/monitoring/loki { }; From 0aa4a50ec1bbcd620c9e7f3967186c9a2f53d3e4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 21 Aug 2020 21:28:41 +1000 Subject: [PATCH 467/520] grafana-loki: pin to go 1.14 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 011f1ce4a38..f90c90e10f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16179,7 +16179,9 @@ in buildGoModule = buildGo114Module; }; - grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana-loki = callPackage ../servers/monitoring/loki { + buildGoPackage = buildGo114Package; + }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; From ba17782524508c5e4f8af646bfeb7553185d4a6e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 21 Aug 2020 21:28:41 +1000 Subject: [PATCH 468/520] prometheus: pin to go 1.14 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f90c90e10f0..3d631c42653 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16644,7 +16644,10 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { }; + prometheus = callPackage ../servers/monitoring/prometheus { + buildGoPackage = buildGo114Package; + go = go_1_14; + }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; From 161a33289c2784cfbcba6ecd60da781a157481ec Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 21 Aug 2020 21:28:41 +1000 Subject: [PATCH 469/520] grobi: pin to go 1.14 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d631c42653..9a7b46726fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2022,7 +2022,9 @@ in gringo = callPackage ../tools/misc/gringo { }; - grobi = callPackage ../tools/X11/grobi { }; + grobi = callPackage ../tools/X11/grobi { + buildGoModule = buildGo114Module; + }; gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; From f8a135660996c9e27e5f5c9eeaa929610226df3a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 22 Aug 2020 15:50:07 +1000 Subject: [PATCH 470/520] kpt: 0.32.0 -> 0.33.0 --- pkgs/applications/networking/cluster/kpt/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index 634fa22fe77..c370d122703 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,22 +2,18 @@ buildGoModule rec { pname = "kpt"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "1pgv15zgv30dpv148bn6x0anv9q6x78y6ldmzarb9fbjpk6j0wxl"; + sha256 = "1lvfbpxxddm1pk4mb4sm0chw15dalsfyhgy86npz94xjf1jssyh8"; }; - vendorSha256 = "0l8xdnv2m6byd5dwvs3zgcj1lsci7ax4xvx178a8a78sgkqalvmq"; + vendorSha256 = "1xkjgzy9z7v5z4kl1769dgrrr0ljr0fdxfdj7xbic9hl6nm94kif"; - doCheck = false; - - postInstall = '' - rm $out/bin/{mdtogo,formula} - ''; + subPackages = [ "." ]; meta = with lib; { description = "A toolkit to help you manage, manipulate, customize, and apply Kubernetes Resource configuration data files"; From be904cd5669e785315042068dd9bdd24a02da31f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 07:26:44 +0000 Subject: [PATCH 471/520] fluxctl: 1.20.1 -> 1.20.2 --- pkgs/applications/networking/cluster/fluxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 865a892efb7..44e21de0a03 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "1l514rf7rg05prq9548ygj6z284sy85ddzrwiiqr74vz4kilg3vb"; + sha256 = "1a44lmrvi5f9jr04rblhcsg3zvqzvdp9wyw4m4h4scsqp5g7dfb7"; }; - vendorSha256 = "00qm45vfz4afj8f9hikrlk96w0rdzxqq2azhzrnzfymyiwc6jk5c"; + vendorSha256 = "1yzh6iglrzd43yqs1b6qh1i62b6qaz3232lgxyg3gmc81p0i5kr0"; nativeBuildInputs = [ installShellFiles ]; From 624fd1fe19e95127f427fa5939f4bfcaefc9fd28 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 07:48:19 +0000 Subject: [PATCH 472/520] ft2-clone: 1.26 -> 1.28 --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 60040119d64..1db5644fc32 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.26"; + version = "1.28"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0fqb4415qy2nwjz7ahi43nk795ifswb2b37sc7p5n9m4yc8h53wv"; + sha256 = "1hbcl89cpx9bsafxrjyfx6vrbs4h3lnzmqm12smcvdg8ksfgzj0d"; }; nativeBuildInputs = [ cmake ]; From be5c6c4425d4faf33b890b93ca3279651d92849b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 21 Aug 2020 21:14:49 +0200 Subject: [PATCH 473/520] libunibreak: 1.1 -> 4.3 --- .../libraries/libunibreak/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index 5b549176889..8c6650df3cb 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libunibreak"; - version = "1.1"; + version = "4.3"; - src = fetchurl { - url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${pname}-${version}.tar.gz"; - sha256 = "02657l426bk5d8h42b9ixxy1clc50mx4bzwg02nkdhs09wqw32wn"; + src = let + rev_version = stdenv.lib.replaceStrings ["-"] ["_"] version; + in fetchFromGitHub { + owner = "adah1972"; + repo = pname; + rev = "libunibreak_${rev_version}"; + sha256 = "19g3ixs1ycisfdnzd8v7j5r49h0x0hshchk9qwlz4i0mjv825plx"; }; + nativeBuildInputs = [ autoreconfHook ]; + meta = with stdenv.lib; { - homepage = "http://vimgadgets.sourceforge.net/libunibreak/"; - description = "A library implementing a line breaking algorithm as described in Unicode 6.0.0 Standard"; + homepage = "https://github.com/adah1972/libunibreak"; + description = "Implementation of line breaking and word breaking algorithms as in the Unicode standard"; license = licenses.zlib; platforms = platforms.unix; maintainers = [ maintainers.coroa ]; From 785df3a85a5f5caa7ad45653f1559d7bdd88238b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 21 Aug 2020 21:16:14 +0200 Subject: [PATCH 474/520] coolreader: init at 3.2.45 --- pkgs/applications/misc/coolreader/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/misc/coolreader/default.nix diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix new file mode 100644 index 00000000000..c3efed72cb0 --- /dev/null +++ b/pkgs/applications/misc/coolreader/default.nix @@ -0,0 +1,26 @@ +{ mkDerivation, fetchFromGitHub, cmake, pkg-config, lib, + qttools, fribidi, libunibreak }: + +mkDerivation rec { + pname = "coolreader"; + version = "3.2.45"; + + src = fetchFromGitHub { + owner = "buggins"; + repo = pname; + rev = "cr${version}"; + sha256 = "0nkk4d0j04yjwanjszq8h8hvx87rnwax2k6akm4bpjxwpcs4icws"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ qttools fribidi libunibreak ]; + + meta = with lib; { + homepage = "https://github.com/buggins/coolreader"; + description = "Cross platform open source e-book reader"; + license = licenses.gpl2Plus; # see https://github.com/buggins/coolreader/issues/80 + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9e6234e92f..ade139723c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -935,6 +935,8 @@ in codespell = with python3Packages; toPythonApplication codespell; + coolreader = libsForQt5.callPackage ../applications/misc/coolreader {}; + cozy = callPackage ../applications/audio/cozy-audiobooks { }; ctrtool = callPackage ../tools/archivers/ctrtool { }; From b05eefc014041e7f1ce418c5bf3a5758c6ebda94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 08:32:53 +0000 Subject: [PATCH 475/520] grafana-loki: 1.5.0 -> 1.6.0 --- pkgs/servers/monitoring/loki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 668695aa8df..e6ecf5681f5 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: buildGoPackage rec { - version = "1.5.0"; + version = "1.6.0"; pname = "grafana-loki"; goPackagePath = "github.com/grafana/loki"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "137lnd69p8qfg2z8l32dr1mrk2lhrxjx392xfij11sy5i9blfc3n"; + sha256 = "0i1m9aaqbq5p99fysrnhl1vxj97cq59gbdkcwkq4hkylqxlaxkyk"; }; postPatch = '' From e6f0a1e7ebceac4e25150384008f5b051aa8be03 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 22 Feb 2020 12:43:06 +0100 Subject: [PATCH 476/520] undervolt: apply undervolt on boot and resume The undervolt did not persist reboots or sleep/hibernation. With this change you should no longer have to apply the undervolt on a timer --- nixos/modules/services/hardware/undervolt.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index 828032dc573..1f1a6d67478 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -114,6 +114,11 @@ in path = [ pkgs.undervolt ]; description = "Intel Undervolting Service"; + + # Apply undervolt on boot, nixos generation switch and resume + wantedBy = [ "multi-user.target" "post-resume.target" ]; + after = [ "post-resume.target" ]; # Not sure why but it won't work without this + serviceConfig = { Type = "oneshot"; Restart = "no"; From ed83bac1d98aa3818331685d968444dbda66dc28 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 22 Feb 2020 12:45:47 +0100 Subject: [PATCH 477/520] undervolt: make timer opt-in It should no longer be needed but is worth keeping around in case it is --- nixos/modules/services/hardware/undervolt.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index 1f1a6d67478..054ffa35050 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -103,6 +103,17 @@ in The temperature target on battery power in Celsius degrees. ''; }; + + useTimer = mkOption { + type = types.bool; + default = false; + description = '' + Whether to set a timer that applies the undervolt settings every 30s. + This will cause spam in the journal but might be required for some + hardware under specific conditions. + Enable this if your undervolt settings don't hold. + ''; + }; }; config = mkIf cfg.enable { @@ -126,7 +137,7 @@ in }; }; - systemd.timers.undervolt = { + systemd.timers.undervolt = mkIf cfg.useTimer { description = "Undervolt timer to ensure voltage settings are always applied"; partOf = [ "undervolt.service" ]; wantedBy = [ "multi-user.target" ]; From f5856db1b83671bae5dc9886f23c3612498a1246 Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 13 May 2020 10:47:16 +0200 Subject: [PATCH 478/520] rl-2009: add note on undervolt timer changes --- nixos/doc/manual/release-notes/rl-2009.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 59a4d78c27e..592aa3dcaf4 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -910,6 +910,13 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; The packages perl, rsync and strace were removed from . If you need them, install them again with = with pkgs; [ perl rsync strace ]; in your configuration.nix. + + + The undervolt option no longer needs to apply its + settings every 30s. If they still become undone, open an issue and restore + the previous behaviour using undervolt.useTimer. + + From 02d852fd40a47363e7df73d17c435d43f8268507 Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 12 Aug 2020 20:59:25 +0200 Subject: [PATCH 479/520] mlterm: wrap as GTK app Mlterm would throw GLib-GIO-ERROR `No GSettings schemas are installed on the system` when the color picker was opened in mlconfig --- pkgs/applications/misc/mlterm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 89f78ee8e99..7c7906fc841 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -4,6 +4,7 @@ , fribidi, m17n_lib #bidi and encoding , openssl, libssh2 #build-in ssh , fcitx, ibus, uim #IME +, wrapGAppsHook #color picker in mlconfig }: stdenv.mkDerivation rec { @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "17h6j4nmbyvsx2shm8mqm7smzq9i7mbqxjw19c2m0rhf5yzqhr3k"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ]; buildInputs = [ libX11 gdk-pixbuf.dev cairo libXft gtk3 vte harfbuzz fribidi m17n_lib openssl libssh2 From 6b8e30c2dc8be55848492841c7e5a7b693f0ec8d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 22 Aug 2020 04:20:00 -0500 Subject: [PATCH 480/520] mcfly: 0.4.1 -> 0.5.0 --- pkgs/tools/misc/mcfly/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 1e5a68d9e7b..39f9b47f465 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,21 +2,25 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "0fgnhm0b1sd6n12fa2cwlb5b8q4jjm9lqik4lx3l2hv5pkp3dcmb"; + sha256 = "155x745jakfcpr6kmp24cy8xwdhv81jdfjjhd149bnw5ilg0z037"; }; - preInstall = '' + postInstall = '' + substituteInPlace mcfly.bash --replace '$(which mcfly)' $out/bin/mcfly + substituteInPlace mcfly.zsh --replace '$(which mcfly)' $out/bin/mcfly + substituteInPlace mcfly.fish --replace '(which mcfly)' $out/bin/mcfly install -Dm644 -t $out/share/mcfly mcfly.bash install -Dm644 -t $out/share/mcfly mcfly.zsh + install -Dm644 -t $out/share/mcfly mcfly.fish ''; - cargoSha256 = "11vc4r3cx5amkrmh4hhc174bca02a87i7hfjb33adjvipphfm83f"; + cargoSha256 = "0y6sjbzg5qqqip9sc9ajyd5ra3n2wwvarj6nhpzjhh05kqz3qja4"; meta = with stdenv.lib; { homepage = "https://github.com/cantino/mcfly"; From 55d5e762d0720b572352f510e06e8843b3619306 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 09:25:47 +0000 Subject: [PATCH 481/520] hyp2mat: 0.0.17 -> 0.0.18 --- pkgs/applications/science/electronics/hyp2mat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/electronics/hyp2mat/default.nix b/pkgs/applications/science/electronics/hyp2mat/default.nix index 1fa2c23b569..154b68dd5aa 100644 --- a/pkgs/applications/science/electronics/hyp2mat/default.nix +++ b/pkgs/applications/science/electronics/hyp2mat/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "hyp2mat"; - version = "0.0.17"; + version = "0.0.18"; src = fetchFromGitHub { owner = "koendv"; repo = "hyp2mat"; rev = "v${version}"; - sha256 = "04bd2vrn8y1izir7pwl34a60cg2v05baqcrmpfdx5fvf33bbflaj"; + sha256 = "03ibk51swxfl7pfrhcrfiffdi4mnf8kla0g1xj1lsrvrjwapfx03"; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Import Hyperlynx Boardsim files to openEMS, an open source 3D full-wave electromagnetic field solver"; - homepage = https://github.com/koendv/hyp2mat; + homepage = "https://github.com/koendv/hyp2mat"; license = licenses.gpl3Plus; maintainers = with maintainers; [ matthuszagh ]; platforms = platforms.linux; From ba7eeb94f654e824a8e49735fd5ae7fdd5c3e3af Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Aug 2020 10:33:58 +0000 Subject: [PATCH 482/520] kube3d: 3.0.0 -> 3.0.1 --- pkgs/applications/networking/cluster/kube3d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index decbdbd1fbc..0c1f452ea5b 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "3.0.0"; + version = "3.0.1"; k3sVersion = "1.18.6-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "1p4rqzi67cr8vf1ih7zqxkpssqq0vy4pb5crvkxbbf5ad5mwrjri"; + sha256 = "1l6mh0dpf2bw9sxpn14iivv3pr8mj4favzx2hhn8k1j71cm1w4rj"; }; buildFlagsArray = '' From f1d60c64a5d463f8a6d0973431f0843be5a24816 Mon Sep 17 00:00:00 2001 From: tcbravo Date: Fri, 29 May 2020 22:10:29 +0200 Subject: [PATCH 483/520] maintainers: add tcbravo --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cc2aa5a7efc..7c9551519ca 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8133,6 +8133,12 @@ githubId = 863327; name = "Tyler Benster"; }; + tcbravo = { + email = "tomas.bravo@protonmail.ch"; + github = "tcbravo"; + githubId = 66133083; + name = "Tomas Bravo"; + }; tckmn = { email = "andy@tck.mn"; github = "tckmn"; From a778e66ebb08e12d78b088a0a81c406bb7e362fb Mon Sep 17 00:00:00 2001 From: Mrinal Date: Sat, 22 Aug 2020 11:42:15 +0000 Subject: [PATCH 484/520] google-cloud-sdk: 301.0.0 -> 306.0.0 (#95921) --- pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 60ba024fd5b..5a51ace3b98 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1b9pm0k298w7scsi493a2xlikiqqbb8vwcy9j71421kyvlj4g7yr"; + sha256 = "1l2r9pgyzih7xgrr2ygm0mcl97kyp1wfvybwhbn1i0kbb72nagk1"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1f6kkcwxg419kw58521n4ms68hspx7mj87syj4xzxdwgkwg92ws7"; + sha256 = "1qbkdfa7dzysp7crv9ph476hbabl3qiszs067f20dadqssqs1v4r"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "301.0.0"; + version = "306.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); From 559a45c128b631f0a1404c27df4e66689f373f43 Mon Sep 17 00:00:00 2001 From: tcbravo Date: Fri, 29 May 2020 22:41:27 +0200 Subject: [PATCH 485/520] ashuffle: init at version 3.4.0 --- pkgs/applications/audio/ashuffle/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/audio/ashuffle/default.nix diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix new file mode 100644 index 00000000000..6bb21b5edaa --- /dev/null +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, meson, ninja }: + +stdenv.mkDerivation rec { + pname = "ashuffle"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "joshkunz"; + repo = "ashuffle"; + rev = "v${version}"; + sha256 = "09q6lwgc1dc8bg1mb9js9qz3xcsxph3548nxzvyb4v8111gixrp7"; + fetchSubmodules = true; + }; + + dontUseCmakeConfigure = true; + nativeBuildInputs = [ cmake pkg-config meson ninja ]; + buildInputs = [ mpd_clientlib ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/joshkunz/ashuffle"; + description = "Automatic library-wide shuffle for mpd"; + maintainers = [ maintainers.tcbravo ]; + platforms = platforms.unix; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53610bb26cf..6256906436d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -763,6 +763,8 @@ in asciiquarium = callPackage ../applications/misc/asciiquarium {}; + ashuffle = callPackage ../applications/audio/ashuffle {}; + asls = callPackage ../development/tools/misc/asls { }; asymptote = callPackage ../tools/graphics/asymptote { From 9b742a6a1bcecd51332fecd56bb4757f74f34793 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 22 Aug 2020 13:41:01 +0200 Subject: [PATCH 486/520] wofi: do not follow symlinks in PATH --- pkgs/applications/misc/wofi/default.nix | 5 +++ .../misc/wofi/do_not_follow_symlinks.patch | 39 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/misc/wofi/do_not_follow_symlinks.patch diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 69ec8fffaa1..4aeff6c9ec8 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; buildInputs = [ wayland gtk3 ]; + patches = [ + # https://todo.sr.ht/~scoopta/wofi/121 + ./do_not_follow_symlinks.patch + ]; + postInstall = '' installManPage man/wofi* ''; diff --git a/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch b/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch new file mode 100644 index 00000000000..f917c4c1685 --- /dev/null +++ b/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch @@ -0,0 +1,39 @@ +diff -r 3414ab984249 modes/run.c +--- a/modes/run.c Tue Aug 11 19:07:49 2020 -0700 ++++ b/modes/run.c Sat Aug 22 13:39:52 2020 +0200 +@@ -91,23 +91,10 @@ + + char* path = strdup(getenv("PATH")); + +- struct map* paths = map_init(); +- + char* save_ptr; + char* str = strtok_r(path, ":", &save_ptr); + do { + +- str = realpath(str, NULL); +- if(str == NULL) { +- continue; +- } +- if(map_contains(paths, str)) { +- free(str); +- continue; +- } +- +- map_put(paths, str, "true"); +- + DIR* dir = opendir(str); + if(dir == NULL) { + continue; +@@ -132,11 +119,9 @@ + } + free(full_path); + } +- free(str); + closedir(dir); + } while((str = strtok_r(NULL, ":", &save_ptr)) != NULL); + free(path); +- map_free(paths); + map_free(cached); + map_free(entries); + } From dcaa2d2c7414028963fbaf1fefac87bb7aa80b11 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Sat, 22 Aug 2020 14:47:10 +0200 Subject: [PATCH 487/520] nixos/services.imwheel: sleep 3s before restarting --- nixos/modules/services/x11/imwheel.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/imwheel.nix b/nixos/modules/services/x11/imwheel.nix index 3923df498e7..51f72dadbd4 100644 --- a/nixos/modules/services/x11/imwheel.nix +++ b/nixos/modules/services/x11/imwheel.nix @@ -61,7 +61,8 @@ in "--kill" ] ++ cfg.extraOptions); ExecStop = "${pkgs.procps}/bin/pkill imwheel"; - Restart = "on-failure"; + RestartSec = 3; + Restart = "always"; }; }; }; From 32c27ddf5c621193edaa7873221cb1d62e21d8cb Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Thu, 13 Aug 2020 21:23:35 +0200 Subject: [PATCH 488/520] replacement: init at 0.4.4 Signed-off-by: Sirio Balmelli Co-Authored-By: Doron Behar --- .../tools/misc/replacement/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/tools/misc/replacement/default.nix diff --git a/pkgs/development/tools/misc/replacement/default.nix b/pkgs/development/tools/misc/replacement/default.nix new file mode 100644 index 00000000000..3d0218ffab2 --- /dev/null +++ b/pkgs/development/tools/misc/replacement/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchFromGitHub +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "replacement"; + version = "0.4.4"; + + disabled = python3Packages.isPy27; + + src = fetchFromGitHub { + owner = "siriobalmelli"; + repo = "replacement"; + rev = "v${version}"; + sha256 = "0j4lvn3rx1kqvxcsd8nhc2lgk48jyyl7qffhlkvakhy60f9lymj3"; + }; + + propagatedBuildInputs = with python3Packages; [ + ruamel_yaml + ]; + + checkInputs = with python3Packages; [ + pytestCheckHook + sh + ]; + + meta = with lib; { + homepage = "https://github.com/siriobalmelli/replacement"; + description = "A tool to execute yaml templates and output text"; + longDescription = '' + Replacement is a python utility + that parses a yaml template and outputs text. + + A 'template' is a YAML file containing a 'replacement' object. + + A 'replacement' object contains a list of blocks, + each of which is executed in sequence. + + This tool is useful in generating configuration files, + static websites and the like. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ siriobalmelli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05361c78e9a..e89c9e50b9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11256,6 +11256,8 @@ in remake = callPackage ../development/tools/build-managers/remake { }; + replacement = callPackage ../development/tools/misc/replacement { }; + retdec = callPackage ../development/tools/analysis/retdec { stdenv = gcc8Stdenv; }; From 362a5bfcc2b695b00cede7c80b8116b7ca4cb79e Mon Sep 17 00:00:00 2001 From: Aldwin Vlasblom Date: Sat, 22 Aug 2020 15:58:57 +0200 Subject: [PATCH 489/520] minecraft-server: 1.16.1 -> 1.16.2 --- pkgs/games/minecraft-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 5ba4b4de2f6..3c2ab9b3fcd 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.16.1"; + version = "1.16.2"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar"; + url = "https://launcher.mojang.com/v1/objects/c5f6fb23c3876461d46ec380421e42b289789530/server.jar"; # sha1 because that comes from mojang via api - sha1 = "a412fd69db1f81db3f511c1463fd304675244077"; + sha1 = "c5f6fb23c3876461d46ec380421e42b289789530"; }; preferLocalBuild = true; From fcbf367090f90653f6da783603137288504c0a05 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 22 Aug 2020 09:43:25 +0200 Subject: [PATCH 490/520] unifiStable: 5.13.32 -> 5.14.22 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 29975ef5ba8..61f07f01bf2 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -49,7 +49,7 @@ in { }; unifiStable = generic { - version = "5.13.32"; - sha256 = "0r1lz73hn4pl5jygmmfngr8sr0iybirsqlkcdkq31a36vcr567i8"; + version = "5.14.22"; + sha256 = "115i0gjk7higy07j3d95r21kcgmm6kb9jsvcsycdinrcn7kz2x6r"; }; } From 58ff57004ff99f61b54a3e854ba5753dc23da490 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 22 Aug 2020 16:32:39 +0200 Subject: [PATCH 491/520] wstunnel: unstable-2019-01-28 -> unstable-2020-07-12 --- pkgs/tools/networking/wstunnel/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/wstunnel/default.nix b/pkgs/tools/networking/wstunnel/default.nix index 2488d874e6d..161b08a7d39 100644 --- a/pkgs/tools/networking/wstunnel/default.nix +++ b/pkgs/tools/networking/wstunnel/default.nix @@ -2,28 +2,21 @@ , classy-prelude, cmdargs, connection, hslogger, mtl, network , network-conduit-tls, stdenv, streaming-commons, text , unordered-containers, websockets +, hspec, iproute , lib, fetchFromGitHub, fetchpatch }: mkDerivation rec { pname = "wstunnel"; - version = "unstable-2019-01-28"; + version = "unstable-2020-07-12"; src = fetchFromGitHub { owner = "erebe"; repo = pname; - rev = "78cc5a5f1aa4dbcb25fa9b0efc9cfef3640672e4"; - sha256 = "17y3yn7qg1h7jx9xs041sw63g51vyns236f60d2m2mghi49lm9i2"; + rev = "093a01fa3a34eee5efd8f827900e64eab9d16c05"; + sha256 = "17p9kq0ssz05qzl6fyi5a5fjbpn4bxkkwibb9si3fhzrxc508b59"; }; - patches = [ - # Support GHC 8.6 https://github.com/erebe/wstunnel/pull/18 - (fetchpatch { - url = "https://github.com/erebe/wstunnel/commit/8f348fea4dbf75874d5d930334377843763335ab.patch"; - sha256 = "0a66jx7k97j3iyr7j5npbyq1lkhzz74r81mkas4nig7z3hny1gn9"; - }) - ]; - isLibrary = false; isExecutable = true; @@ -31,13 +24,14 @@ mkDerivation rec { async base base64-bytestring binary bytestring classy-prelude connection hslogger mtl network network-conduit-tls streaming-commons text unordered-containers websockets + iproute ]; executableHaskellDepends = [ base bytestring classy-prelude cmdargs hslogger text ]; - testHaskellDepends = [ base text ]; + testHaskellDepends = [ base text hspec ]; homepage = "https://github.com/erebe/wstunnel"; description = "UDP and TCP tunnelling over WebSocket"; From 8d8129aec1220ba2a6b21b030a2792c5a0807aee Mon Sep 17 00:00:00 2001 From: YI Date: Thu, 4 Jun 2020 22:47:20 +0800 Subject: [PATCH 492/520] linuxPackages.rtl8821cu: init at 2020-05-16 --- pkgs/os-specific/linux/rtl8821cu/default.nix | 37 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/os-specific/linux/rtl8821cu/default.nix diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix new file mode 100644 index 00000000000..62ea8aaaab5 --- /dev/null +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, kernel, bc }: +stdenv.mkDerivation rec { + name = "rtl8821cu-${kernel.version}-${version}"; + version = "unstable-2020-05-16"; + + src = fetchFromGitHub { + owner = "brektrou"; + repo = "rtl8821cu"; + rev = "5c510c9f14352fed4906a10921040b9e46b58346"; + sha256 = "1n74h1m3l2dj35caswaghzcjwcv5qlv3gj6j1rqdddbyg5khl4ag"; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = [ bc ]; + buildInputs = kernel.moduleBuildDependencies; + + prePatch = '' + substituteInPlace ./Makefile \ + --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /sbin/depmod \# \ + --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + meta = with stdenv.lib; { + description = "Realtek rtl8821cu driver"; + homepage = "https://github.com/brektrou/rtl8821CU"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.contrun ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a269885606..adcbaf812fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17607,6 +17607,8 @@ in rtl88x2bu = callPackage ../os-specific/linux/rtl88x2bu { }; + rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { }; + rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; openafs = callPackage ../servers/openafs/1.6/module.nix { }; From 64e7ca4eebccc2b965810a63518c7a8a8d2d95b9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 22 Aug 2020 17:09:52 +0200 Subject: [PATCH 493/520] libqalculate: 3.8.0 -> 3.12.1 --- pkgs/development/libraries/libqalculate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 8acfcb4b751..5c520e1c9dd 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.8.0"; + version = "3.12.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1vbaza9c7159xf2ym90l0xkyj2mp6c3hbghhsqn29yvz08fda9df"; + sha256 = "0g3ipl6ynhclmwny54zgdh721v0fs9dzj6j7r8dz91s86jva3chb"; }; outputs = [ "out" "dev" "doc" ]; From 214d7626e10b983b32e873069a6ce202f5cf5daa Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 22 Aug 2020 17:12:30 +0200 Subject: [PATCH 494/520] calculix: 2.15 -> 2.17 --- .../science/math/calculix/calculix.patch | 27 +++++++------------ .../science/math/calculix/default.nix | 4 +-- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/pkgs/applications/science/math/calculix/calculix.patch index 5b8f492a8e7..2334d54711e 100644 --- a/pkgs/applications/science/math/calculix/calculix.patch +++ b/pkgs/applications/science/math/calculix/calculix.patch @@ -1,16 +1,7 @@ -diff --git a/ccx_2.15/src/Makefile b/ccx_2.15/src/Makefile -index 9cab2fc..6e977b8 100755 ---- a/ccx_2.15/src/Makefile -+++ b/ccx_2.15/src/Makefile -@@ -1,6 +1,6 @@ - - CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT --FFLAGS = -Wall -O3 -+FFLAGS = -Wall -O3 - - CC=cc - FC=gfortran -@@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o) +diff -Naur a/ccx_2.17/src/Makefile b/ccx_2.17/src/Makefile +--- a/ccx_2.17/src/Makefile 2020-07-23 21:41:38.507761972 +0200 ++++ b/ccx_2.17/src/Makefile 2020-08-22 16:53:50.004938281 +0200 +@@ -18,15 +18,10 @@ OCCXC = $(SCCXC:.c=.o) OCCXMAIN = $(SCCXMAIN:.c=.o) @@ -22,10 +13,10 @@ index 9cab2fc..6e977b8 100755 - ../../../ARPACK/libarpack_INTEL.a \ - -lpthread -lm -lc - --ccx_2.15: $(OCCXMAIN) ccx_2.15.a $(LIBS) -- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS) -+ccx_2.15: $(OCCXMAIN) ccx_2.15.a -+ $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS) +-ccx_2.17: $(OCCXMAIN) ccx_2.17.a $(LIBS) +- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS) ++ccx_2.17: $(OCCXMAIN) ccx_2.17.a ++ $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS) - ccx_2.15.a: $(OCCXF) $(OCCXC) + ccx_2.17.a: $(OCCXF) $(OCCXC) ar vr $@ $? diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index 44882594550..e37e9d0910c 100644 --- a/pkgs/applications/science/math/calculix/default.nix +++ b/pkgs/applications/science/math/calculix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "calculix"; - version = "2.15"; + version = "2.17"; src = fetchurl { url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2"; - sha256 = "0d4axfxgm3ag4p2vx9rjcky7c122k99a2nhv1jv53brm35rblzdw"; + sha256 = "0l3fizxfdj2mpdp62wnk9v47q2yc3cy39fpsm629z7bjmba8lw6a"; }; nativeBuildInputs = [ gfortran ]; From 1566bd75204d700af2330b987c6b29e0cef3cab6 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Fri, 5 Jun 2020 01:24:53 +0300 Subject: [PATCH 495/520] maintainers: add yusdacra --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7c9551519ca..7a24db3bc20 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9138,6 +9138,16 @@ fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C"; }]; }; + yusdacra = { + email = "y.bera003.06@protonmail.com"; + github = "yusdacra"; + githubId = 19897088; + name = "Yusuf Bera Ertan"; + keys = [{ + longkeyid = "rsa2048/0x61807181F60EFCB2"; + fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2"; + }]; + }; yvesf = { email = "yvesf+nix@xapek.org"; github = "yvesf"; From 294cd72be3023f4da3d0f6b8f482a060926d8e1e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 22 Aug 2020 17:10:03 +0200 Subject: [PATCH 496/520] qalculate-gtk: 3.8.0a -> 3.12.1 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 213530b60a9..c3976d5601a 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,17 +2,18 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.8.0a"; + version = "3.12.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "0bjd61bbc5b2i09kz3ss01c0xmxrhmiv5wpbhhplkp3yhw2qrf3m"; + sha256 = "0ylsxj9rn3dc1grn9w6jisci3ak0hxgbwzqp54azs3aj5cmvkfgg"; }; patchPhase = '' - substituteInPlace src/main.cc --replace 'getPackageDataDir().c_str()' \"$out/share\" + # https://github.com/Qalculate/qalculate-gtk/pull/178 + substituteInPlace configure.ac --replace 'libxml-2.0' 'libxml-2.0 gio-unix-2.0' ''; hardeningDisable = [ "format" ]; From 637434fa712abc0891e09480e39d2a335fba31fa Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 22 Aug 2020 17:51:00 +0200 Subject: [PATCH 497/520] fcitx-engines.mozc: wrap mozc_tool --- pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 2e812d9b7b3..1261888a220 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -23,7 +23,7 @@ in clangStdenv.mkDerivation rec { sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx"; }; - nativeBuildInputs = [ gyp which ninja python pkgconfig ]; + nativeBuildInputs = [ gyp which ninja python pkgconfig qt5.wrapQtAppsHook ]; buildInputs = [ protobuf gtk2 zinnia qt5.qtbase libxcb fcitx gettext ]; postUnpack = '' @@ -79,6 +79,8 @@ in clangStdenv.mkDerivation rec { install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server install -m 755 out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool + wrapQtApp $out/lib/mozc/mozc_tool + install -D -m 755 out_linux/Release/fcitx-mozc.so $out/lib/fcitx/fcitx-mozc.so install -D -m 644 unix/fcitx/fcitx-mozc.conf $out/share/fcitx/addon/fcitx-mozc.conf install -D -m 644 unix/fcitx/mozc.conf $out/share/fcitx/inputmethod/mozc.conf From 8309faafc3899b98d01dc627cb87ecba1dfa7243 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 22 Aug 2020 17:55:16 +0200 Subject: [PATCH 498/520] ibus-engines.mozc: wrap mozc_tool --- pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index bd34f2c49a5..ee038f822e4 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -21,7 +21,7 @@ in clangStdenv.mkDerivation rec { maintainers = with maintainers; [ gebner ericsagnes ]; }; - nativeBuildInputs = [ which ninja python gyp pkgconfig ]; + nativeBuildInputs = [ which ninja python gyp pkgconfig qt5.wrapQtAppsHook ]; buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ]; src = fetchFromGitHub { @@ -70,6 +70,7 @@ in clangStdenv.mkDerivation rec { install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server install -m 755 out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool + wrapQtApp $out/lib/mozc/mozc_tool install -d $out/share/doc/mozc install -m 644 data/installer/*.html $out/share/doc/mozc/ From b360e99095a15759e7ac42852a924cc3cad25a6e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 22 Aug 2020 18:08:54 +0200 Subject: [PATCH 499/520] fcitx-engines.mozc: enable handwriting recognition --- pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 1261888a220..69ff9c1fe53 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -1,5 +1,5 @@ { clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, gyp, which, ninja, - python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, + python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, fcitx, gettext }: let japanese_usage_dictionary = fetchFromGitHub { @@ -57,7 +57,7 @@ in clangStdenv.mkDerivation rec { ''; configurePhase = '' - export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 use_fcitx5=0" + export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 use_fcitx5=0 zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model" cd src && python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc ''; From 92470eba197efc2024582da6787f39f2f72008e2 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Sat, 22 Aug 2020 18:39:26 +0300 Subject: [PATCH 500/520] godot-headless: init at 3.2.2 --- pkgs/development/tools/godot/headless.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/tools/godot/headless.nix diff --git a/pkgs/development/tools/godot/headless.nix b/pkgs/development/tools/godot/headless.nix new file mode 100644 index 00000000000..0ae28b774fb --- /dev/null +++ b/pkgs/development/tools/godot/headless.nix @@ -0,0 +1,18 @@ +{ godot, stdenv }: +godot.overrideAttrs (oldAttrs: rec { + pname = "godot-headless"; + sconsFlags = "target=release_debug platform=server tools=yes"; + installPhase = '' + mkdir -p "$out/bin" + cp bin/godot_server.* $out/bin/godot-headless + + mkdir "$dev" + cp -r modules/gdnative/include $dev + + mkdir -p "$man/share/man/man6" + cp misc/dist/linux/godot.6 "$man/share/man/man6/" + ''; + meta.description = + "Free and Open Source 2D and 3D game engine (headless build)"; + meta.maintainers = with stdenv.lib.maintainers; [ twey yusdacra ]; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a269885606..be6c06d440a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3969,6 +3969,8 @@ in gocryptfs = callPackage ../tools/filesystems/gocryptfs { }; godot = callPackage ../development/tools/godot {}; + + godot-headless = callPackage ../development/tools/godot/headless.nix { }; goklp = callPackage ../tools/networking/goklp {}; From 98767e9e45198f406d01de329ede16b6fd18e4aa Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Sat, 22 Aug 2020 18:41:27 +0300 Subject: [PATCH 501/520] godot-server: init at 3.2.2 --- pkgs/development/tools/godot/server.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/tools/godot/server.nix diff --git a/pkgs/development/tools/godot/server.nix b/pkgs/development/tools/godot/server.nix new file mode 100644 index 00000000000..48f21b796c3 --- /dev/null +++ b/pkgs/development/tools/godot/server.nix @@ -0,0 +1,18 @@ +{ godot, stdenv }: +godot.overrideAttrs (oldAttrs: rec { + pname = "godot-server"; + sconsFlags = "target=release platform=server tools=no"; + installPhase = '' + mkdir -p "$out/bin" + cp bin/godot_server.* $out/bin/godot-server + + mkdir "$dev" + cp -r modules/gdnative/include $dev + + mkdir -p "$man/share/man/man6" + cp misc/dist/linux/godot.6 "$man/share/man/man6/" + ''; + meta.description = + "Free and Open Source 2D and 3D game engine (server build)"; + meta.maintainers = with stdenv.lib.maintainers; [ twey yusdacra ]; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be6c06d440a..22fe195d729 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3972,6 +3972,8 @@ in godot-headless = callPackage ../development/tools/godot/headless.nix { }; + godot-server = callPackage ../development/tools/godot/server.nix { }; + goklp = callPackage ../tools/networking/goklp {}; go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; From 502695997ad2d476480a7868f37b779d204af79c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 22 Aug 2020 15:50:14 +0200 Subject: [PATCH 502/520] monero: 0.16.0.1 -> 0.16.0.3 --- pkgs/applications/blockchains/monero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 569a9b17045..f1186564119 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -10,13 +10,13 @@ assert stdenv.isDarwin -> IOKit != null; stdenv.mkDerivation rec { pname = "monero"; - version = "0.16.0.1"; + version = "0.16.0.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0n2cviqm8radpynx70fc0819k1xknjc58cvb4whlc49ilyvh8ky6"; + sha256 = "1r9x3712vhb24dxxirfiwj5f9x0h4m7x0ngiiavf5983dfdlgz33"; fetchSubmodules = true; }; From 812d64b0133db4d7df73c195a554130c21ac698a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 22 Aug 2020 18:16:04 +0200 Subject: [PATCH 503/520] ibus-engines.mozc: enable handwriting recognition --- pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index ee038f822e4..41a04d01835 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,5 +1,5 @@ { clangStdenv, fetchFromGitHub, fetchpatch, which, ninja, python, gyp, pkgconfig -, protobuf, ibus, gtk2, zinnia, qt5, libxcb }: +, protobuf, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese }: let japanese_usage_dictionary = fetchFromGitHub { @@ -50,7 +50,7 @@ in clangStdenv.mkDerivation rec { ''; configurePhase = '' - export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc" + export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model" cd src && python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc ''; From d11492a77173add6c023e93e940a4ad637ea955b Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 7 Aug 2020 11:08:40 +0200 Subject: [PATCH 504/520] runwayml: 0.10.20 -> 0.14.3 --- pkgs/applications/graphics/runwayml/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix index eb8ecc34b8f..9366276ebf8 100644 --- a/pkgs/applications/graphics/runwayml/default.nix +++ b/pkgs/applications/graphics/runwayml/default.nix @@ -6,20 +6,19 @@ let pname = "runwayml"; - version = "0.10.20"; + version = "0.14.3"; name = "${pname}-${version}"; src = fetchurl { - url = "https://runway-releases.s3.amazonaws.com/Runway%20${version}.AppImage"; - sha256 = "1wi94xi8nrwfc4v2j1crlmwr0nxg95ffp5h4hxd84crvya8ibxgz"; - name="${pname}-${version}.AppImage"; + url = "https://runway-releases.s3.amazonaws.com/Runway-${version}.AppImage"; + sha256 = "1bx8j39wd2z6f32hdvmk9z77bivnizzdhn296kin2nnqgq6v6y93"; }; binary = appimageTools.wrapType2 { name = pname; inherit src; }; - # we only use this to extract the icon + # we only use this to extract the icon and desktop file appimage-contents = appimageTools.extractType2 { inherit name src; }; From 38aadfbbad493465323cf9295b87dc6084c973ad Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Mon, 4 May 2020 10:40:35 -0700 Subject: [PATCH 505/520] vhd2vl: init at unstable-2018-09-01 --- .../science/electronics/vhd2vl/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/science/electronics/vhd2vl/default.nix diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix new file mode 100644 index 00000000000..43dfdcabd02 --- /dev/null +++ b/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, bison +, flex +, verilog +}: + +stdenv.mkDerivation rec { + pname = "vhd2vl"; + version = "unstable-2018-09-01"; + + src = fetchFromGitHub { + owner = "ldoolitt"; + repo = pname; + rev = "37e3143395ce4e7d2f2e301e12a538caf52b983c"; + sha256 = "17va2pil4938j8c93anhy45zzgnvq3k71a7glj02synfrsv6fs8n"; + }; + + nativeBuildInputs = [ + bison + flex + ]; + + buildInputs = [ + verilog + ]; + + installPhase = '' + mkdir -p $out/bin + cp src/vhd2vl $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "VHDL to Verilog converter"; + homepage = "https://github.com/ldoolitt/vhd2vl"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfea73736d6..6bf66bad11b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7242,6 +7242,8 @@ in verilog = callPackage ../applications/science/electronics/verilog {}; + vhd2vl = callPackage ../applications/science/electronics/vhd2vl { }; + video2midi = callPackage ../tools/audio/video2midi { pythonPackages = python3Packages; }; From a3ce3f59319c35f13cb966547bd76b3fa85e0014 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 22 Aug 2020 19:06:43 +0200 Subject: [PATCH 506/520] qalculate-gtk: fix parallel build --- pkgs/applications/science/math/qalculate-gtk/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index c3976d5601a..d1ab05d4cde 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { patchPhase = '' # https://github.com/Qalculate/qalculate-gtk/pull/178 substituteInPlace configure.ac --replace 'libxml-2.0' 'libxml-2.0 gio-unix-2.0' + + # https://github.com/Qalculate/qalculate-gtk/pull/179 + echo searchprovider.o: gnome-search-provider2.c >>src/Makefile.am ''; hardeningDisable = [ "format" ]; From cea0d8953118c82d8b65328afeadbcd4bc8cb9b6 Mon Sep 17 00:00:00 2001 From: George Shammas Date: Sat, 22 Aug 2020 13:07:30 -0400 Subject: [PATCH 507/520] ipfs: pin to go 1.14 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74bc0377eaf..cd11f8e3028 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4507,7 +4507,9 @@ in iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { }; + ipfs = callPackage ../applications/networking/ipfs { + buildGoModule = buildGo114Module; + }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; From 26a6db266cc915830ef2a4196fb423f6fcdb864f Mon Sep 17 00:00:00 2001 From: George Shammas Date: Sat, 22 Aug 2020 13:09:22 -0400 Subject: [PATCH 508/520] ipfs: Enable doCheck --- pkgs/applications/networking/ipfs/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 8928cafa74e..dbc6dc97ef2 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -26,8 +26,6 @@ buildGoModule rec { vendorSha256 = null; - doCheck = false; - postInstall = '' install -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service install -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket From 76dc375bb44e42c8ad73a1e6586a4b1bd96401b6 Mon Sep 17 00:00:00 2001 From: Jacek Generowicz Date: Tue, 16 Jun 2020 17:38:20 +0200 Subject: [PATCH 509/520] virtual-ans: init at 3.0.2c --- .../audio/virtual-ans/default.nix | 89 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 91 insertions(+) create mode 100644 pkgs/applications/audio/virtual-ans/default.nix diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix new file mode 100644 index 00000000000..24e112aff2b --- /dev/null +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, fetchzip +, libX11 +, libXi +, libGL +, alsaLib +, SDL2 +, autoPatchelfHook +}: + +stdenv.mkDerivation rec { + pname = "virtual-ans"; + version = "3.0.2c"; + + src = fetchzip { + url = "https://warmplace.ru/soft/ans/virtual_ans-${version}.zip"; + sha256 = "03r1v3l7rd59dakr7ndvgsqchv00ppkvi6sslgf1ng07r3rsvb1n"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + stdenv.cc.cc.lib + libX11 + libXi + libGL + alsaLib + SDL2 + ]; + + installPhase = '' + mkdir -p $out + cp -R ./* $out/ + + # Remove all executables except for current architecture + ls -1d $out/START* | grep -v ${startScript} | xargs rm -rf + ls -1d $out/bin/pixilang_linux* | grep -v ${linuxExecutable} | xargs rm -rf + + # Start script performs relative search for resources, so it cannot be moved + # to bin directory + ln -s $out/${startScript} $out/bin/virtual-ans + ''; + + startScript = if stdenv.isx86_32 then "START_LINUX_X86" + else if stdenv.isx86_64 then "START_LINUX_X86_64" + #else if stdenv.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin + else abort "Unsupported platform: ${stdenv.platform.kernelArch}."; + + linuxExecutable = if stdenv.isx86_32 then "pixilang_linux_x86" + else if stdenv.isx86_64 then "pixilang_linux_x86_64" + else ""; + + meta = with stdenv.lib; { + description = "Photoelectronic microtonal/spectral musical instrument"; + longDescription = '' + Virtual ANS is a software simulator of the unique Russian synthesizer ANS + - photoelectronic musical instrument created by Evgeny Murzin from 1938 to + 1958. The ANS made it possible to draw music in the form of a spectrogram + (sonogram), without live instruments and performers. It was used by + Stanislav Kreichi, Alfred Schnittke, Edward Artemiev and other Soviet + composers in their experimental works. You can also hear the sound of the + ANS in Andrei Tarkovsky's movies Solaris, The Mirror, Stalker. + + The simulator extends the capabilities of the original instrument. Now + it's a full-featured graphics editor where you can convert sound into an + image, load and play pictures, draw microtonal/spectral music and create + some unusual deep atmospheric sounds. This app is for everyone who loves + experiments and is looking for something new. + + Key features: + + + unlimited number of pure tone generators; + + powerful sonogram editor - you can draw the spectrum and play it at the same time; + + any sound (from a WAV file or a Microphone/Line-in) can be converted to image (sonogram) and vice versa; + + support for MIDI devices; + + polyphonic synth mode with MIDI mapping; + + supported file formats: WAV, AIFF, PNG, JPEG, GIF; + + supported sound systems: ASIO, DirectSound, MME, ALSA, OSS, JACK, Audiobus, IAA. + ''; + homepage = "https://warmplace.ru/soft/ans/"; + license = licenses.free; + # I cannot test the Darwin version, so I'll leave it disabled + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ jacg ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74bc0377eaf..ce4f9b766c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23377,6 +23377,8 @@ in virtscreen = callPackage ../tools/admin/virtscreen {}; + virtual-ans = callPackage ../applications/audio/virtual-ans {}; + virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; From c62fe0bea57f69cdff5213fed055ea831f588856 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 22 Aug 2020 15:08:37 -0400 Subject: [PATCH 510/520] nixos/manual: fix typo in man-nixos-enter.xml --- nixos/doc/manual/man-nixos-enter.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml index c32e1c7f8ca..f533d66099d 100644 --- a/nixos/doc/manual/man-nixos-enter.xml +++ b/nixos/doc/manual/man-nixos-enter.xml @@ -136,7 +136,7 @@ /mnt: -# nixos-enter /mnt +# nixos-enter --root /mnt Run a shell command: From f5f2d89fb7996c989cec0d7de63b1129aa32a14a Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Sat, 6 Jun 2020 22:55:50 +1200 Subject: [PATCH 511/520] nixos/bitwarden_rs: add test --- nixos/tests/all-tests.nix | 1 + nixos/tests/bitwarden.nix | 188 +++++++++++++++++++ pkgs/tools/security/bitwarden_rs/default.nix | 4 +- pkgs/tools/security/bitwarden_rs/vault.nix | 4 +- 4 files changed, 195 insertions(+), 2 deletions(-) create mode 100644 nixos/tests/bitwarden.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a4a62d85a59..0ce5f89b27c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -34,6 +34,7 @@ in bind = handleTest ./bind.nix {}; bitcoind = handleTest ./bitcoind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; + bitwarden = handleTest ./bitwarden.nix {}; blockbook-frontend = handleTest ./blockbook-frontend.nix {}; buildkite-agents = handleTest ./buildkite-agents.nix {}; boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64 diff --git a/nixos/tests/bitwarden.nix b/nixos/tests/bitwarden.nix new file mode 100644 index 00000000000..a47c77cec21 --- /dev/null +++ b/nixos/tests/bitwarden.nix @@ -0,0 +1,188 @@ +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../.. { inherit system config; } +}: + +# These tests will: +# * Set up a bitwarden-rs server +# * Have Firefox use the web vault to create an account, log in, and save a password to the valut +# * Have the bw cli log in and read that password from the vault +# +# Note that Firefox must be on the same machine as the server for WebCrypto APIs to be available (or HTTPS must be configured) +# +# The same tests should work without modification on the official bitwarden server, if we ever package that. + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; +let + backends = [ "sqlite" "mysql" "postgresql" ]; + + dbPassword = "please_dont_hack"; + + userEmail = "meow@example.com"; + userPassword = "also_super_secret_ZJWpBKZi668QGt"; # Must be complex to avoid interstitial warning on the signup page + + storedPassword = "seeeecret"; + + makeBitwardenTest = backend: makeTest { + name = "bitwarden_rs-${backend}"; + meta = { + maintainers = with pkgs.stdenv.lib.maintainers; [ jjjollyjim ]; + }; + + nodes = { + server = { pkgs, ... }: + let backendConfig = { + mysql = { + services.mysql = { + enable = true; + initialScript = pkgs.writeText "mysql-init.sql" '' + CREATE DATABASE bitwarden; + CREATE USER 'bitwardenuser'@'localhost' IDENTIFIED BY '${dbPassword}'; + GRANT ALL ON `bitwarden`.* TO 'bitwardenuser'@'localhost'; + FLUSH PRIVILEGES; + ''; + package = pkgs.mysql; + }; + + services.bitwarden_rs.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden"; + + systemd.services.bitwarden_rs.after = [ "mysql.service" ]; + }; + + postgresql = { + services.postgresql = { + enable = true; + initialScript = pkgs.writeText "postgresql-init.sql" '' + CREATE DATABASE bitwarden; + CREATE USER bitwardenuser WITH PASSWORD '${dbPassword}'; + GRANT ALL PRIVILEGES ON DATABASE bitwarden TO bitwardenuser; + ''; + }; + + services.bitwarden_rs.config.databaseUrl = "postgresql://bitwardenuser:${dbPassword}@localhost/bitwarden"; + + systemd.services.bitwarden_rs.after = [ "postgresql.service" ]; + }; + + sqlite = { }; + }; + in + mkMerge [ + backendConfig.${backend} + { + services.bitwarden_rs = { + enable = true; + dbBackend = backend; + config.rocketPort = 80; + }; + + networking.firewall.allowedTCPPorts = [ 80 ]; + + environment.systemPackages = + let + testRunner = pkgs.writers.writePython3Bin "test-runner" + { + libraries = [ pkgs.python3Packages.selenium ]; + } '' + from selenium.webdriver import Firefox + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + from selenium.webdriver.support import expected_conditions as EC + + options = Options() + options.add_argument('--headless') + driver = Firefox(options=options) + + driver.implicitly_wait(20) + driver.get('http://localhost/#/register') + + wait = WebDriverWait(driver, 10) + + wait.until(EC.title_contains("Create Account")) + + driver.find_element_by_css_selector('input#email').send_keys( + '${userEmail}' + ) + driver.find_element_by_css_selector('input#name').send_keys( + 'A Cat' + ) + driver.find_element_by_css_selector('input#masterPassword').send_keys( + '${userPassword}' + ) + driver.find_element_by_css_selector('input#masterPasswordRetype').send_keys( + '${userPassword}' + ) + + driver.find_element_by_xpath("//button[contains(., 'Submit')]").click() + + wait.until_not(EC.title_contains("Create Account")) + + driver.find_element_by_css_selector('input#masterPassword').send_keys( + '${userPassword}' + ) + driver.find_element_by_xpath("//button[contains(., 'Log In')]").click() + + wait.until(EC.title_contains("My Vault")) + + driver.find_element_by_xpath("//button[contains(., 'Add Item')]").click() + + driver.find_element_by_css_selector('input#name').send_keys( + 'secrets' + ) + driver.find_element_by_css_selector('input#loginPassword').send_keys( + '${storedPassword}' + ) + + driver.find_element_by_xpath("//button[contains(., 'Save')]").click() + ''; + in + [ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ]; + + virtualisation.memorySize = 768; + } + ]; + + client = { pkgs, ... }: + { + environment.systemPackages = [ pkgs.bitwarden-cli ]; + }; + }; + + testScript = '' + start_all() + server.wait_for_unit("bitwarden_rs.service") + server.wait_for_open_port(80) + + with subtest("configure the cli"): + client.succeed("bw --nointeraction config server http://server") + + with subtest("can't login to nonexistant account"): + client.fail( + "bw --nointeraction --raw login ${userEmail} ${userPassword}" + ) + + with subtest("use the web interface to sign up, log in, and save a password"): + server.succeed("PYTHONUNBUFFERED=1 test-runner | systemd-cat -t test-runner") + + with subtest("log in with the cli"): + key = client.succeed( + "bw --nointeraction --raw login ${userEmail} ${userPassword}" + ).strip() + + with subtest("sync with the cli"): + client.succeed(f"bw --nointeraction --raw --session {key} sync -f") + + with subtest("get the password with the cli"): + password = client.succeed( + f"bw --nointeraction --raw --session {key} list items | ${pkgs.jq}/bin/jq -r .[].login.password" + ) + assert password.strip() == "${storedPassword}" + ''; + }; +in +builtins.listToAttrs ( + map + (backend: { name = backend; value = makeBitwardenTest backend; }) + backends +) diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index ebf65b07234..c2bb8324186 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub +{ stdenv, rustPlatform, fetchFromGitHub, nixosTests , pkgconfig, openssl , Security, CoreServices , dbBackend ? "sqlite", libmysqlclient, postgresql }: @@ -35,6 +35,8 @@ in rustPlatform.buildRustPackage rec { runHook postCheck ''; + passthru.tests = nixosTests.bitwarden; + meta = with stdenv.lib; { description = "Unofficial Bitwarden compatible server written in Rust"; homepage = "https://github.com/dani-garcia/bitwarden_rs"; diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 7c71506c888..2ac50912c05 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, nixosTests }: stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { mv web-vault vault ''; + passthru.tests = nixosTests.bitwarden; + meta = with stdenv.lib; { description = "Integrates the web vault into bitwarden_rs"; homepage = "https://github.com/dani-garcia/bw_web_builds"; From 790f286b94d8a9c6d2a1ff2e4db4bf8667613fb2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 22 Aug 2020 22:22:15 +0200 Subject: [PATCH 512/520] cargo-make: 0.32.0 -> 0.32.2 https://github.com/sagiegurari/cargo-make/releases/tag/0.32.1 https://github.com/sagiegurari/cargo-make/releases/tag/0.32.2 --- .../tools/rust/cargo-make/Cargo.lock | 178 +++++++----------- .../tools/rust/cargo-make/default.nix | 6 +- 2 files changed, 72 insertions(+), 112 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index 191e96f021f..3be32ff068e 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -2,9 +2,9 @@ # It is not intended for manual editing. [[package]] name = "adler" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc9a9dd069569f212bc4330af9f17c4afb5e8ce185e83dbb14f1349dda18b10" +checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" [[package]] name = "aho-corasick" @@ -72,9 +72,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "base64" @@ -107,16 +107,13 @@ dependencies = [ [[package]] name = "bytes" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "118cf036fbb97d0816e3c34b2d7a1e8cfc60f68fcf63d550ddbe9bd5f59c213b" -dependencies = [ - "loom", -] +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "cargo-make" -version = "0.32.0" +version = "0.32.2" dependencies = [ "ci_info", "clap", @@ -135,7 +132,7 @@ dependencies = [ "run_script", "rust_info", "rusty-hook", - "semver 0.10.0", + "semver", "serde", "serde_derive", "serde_json", @@ -145,15 +142,15 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.57" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fde55d2a2bfaa4c9668bbc63f531fbdeee3ffe188f4662511ce2c22b3eedebe" +checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" [[package]] name = "cfg-if" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "chrono" @@ -176,9 +173,9 @@ dependencies = [ [[package]] name = "clap" -version = "2.33.1" +version = "2.33.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term", "atty", @@ -191,9 +188,9 @@ dependencies = [ [[package]] name = "colored" -version = "1.9.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" dependencies = [ "atty", "lazy_static 1.4.0", @@ -244,11 +241,10 @@ dependencies = [ [[package]] name = "dirs" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fddc3610d8f9552384e06ebc87f714e1d0b2b64a99194d2faf36d7ae5f48549" +checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff" dependencies = [ - "cfg-if", "dirs-sys", ] @@ -274,9 +270,9 @@ dependencies = [ [[package]] name = "duckscriptsdk" -version = "0.6.0" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0033c9c694e0a358f42316e3517442ca9039de8b3838d8320fb129da5dbec28b" +checksum = "15dee0b26565d497303de383d0e20dbb5f6e95cdcba902aee109dc55fe62b8af" dependencies = [ "attohttpc", "base64 0.12.3", @@ -291,6 +287,7 @@ dependencies = [ "meval", "num_cpus", "rand", + "serde_json", "uname", "walkdir", "which", @@ -363,9 +360,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "envmnt" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dad160daebf530422640d9496277681d6a2caa3172ec8fd2a315a122829319b" +checksum = "a2d328fc287c61314c4a61af7cfdcbd7e678e39778488c7cb13ec133ce0f4059" dependencies = [ "fsio", "indexmap", @@ -382,9 +379,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e" +checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94" dependencies = [ "cfg-if", "crc32fast", @@ -421,9 +418,9 @@ checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" [[package]] name = "fsio" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2131cb03096f67334dfba2f0bc46afc5564b08a919d042c6e217e2665741fc54" +checksum = "c1fd087255f739f4f1aeea69f11b72f8080e9c2e7645cd06955dad4a178a49e3" dependencies = [ "rand", "users", @@ -440,19 +437,6 @@ dependencies = [ "regex 0.1.80", ] -[[package]] -name = "generator" -version = "0.6.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add72f17bb81521258fcc8a7a3245b1e184e916bfbe34f0ea89558f440df5c68" -dependencies = [ - "cc", - "libc", - "log", - "rustc_version", - "winapi 0.3.9", -] - [[package]] name = "getopts" version = "0.2.21" @@ -486,10 +470,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] -name = "hermit-abi" -version = "0.1.14" +name = "hashbrown" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" +checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" +dependencies = [ + "autocfg", +] + +[[package]] +name = "hermit-abi" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" dependencies = [ "libc", ] @@ -527,11 +520,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe" +checksum = "86b45e59b16c76b11bf9738fd5d38879d3bd28ad292d7b313608becb17ae2df9" dependencies = [ "autocfg", + "hashbrown", "serde", ] @@ -575,30 +569,19 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.71" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" +checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3" [[package]] name = "log" -version = "0.4.8" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ "cfg-if", ] -[[package]] -name = "loom" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ecc775857611e1df29abba5c41355cdf540e7e9d4acfdf0f355eefee82330b7" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", -] - [[package]] name = "matches" version = "0.1.8" @@ -761,21 +744,21 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pkg-config" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" +checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" [[package]] name = "ppv-lite86" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" +checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" [[package]] name = "proc-macro2" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" +checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" dependencies = [ "unicode-xid", ] @@ -832,9 +815,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_users" @@ -920,15 +903,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02b506bd796703b88d74a3edb529acde6c71d81bb078c392eecd60a745cb1d2f" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rusty-hook" version = "0.11.2" @@ -966,12 +940,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "scoped-tls" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" - [[package]] name = "security-framework" version = "0.4.4" @@ -995,15 +963,6 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - [[package]] name = "semver" version = "0.10.0" @@ -1021,15 +980,15 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" [[package]] name = "serde_derive" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" +checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48" dependencies = [ "proc-macro2", "quote", @@ -1038,9 +997,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" +checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" dependencies = [ "itoa", "ryu", @@ -1064,9 +1023,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.33" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" +checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4" dependencies = [ "proc-macro2", "quote", @@ -1156,9 +1115,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" +checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" [[package]] name = "toml" @@ -1221,11 +1180,12 @@ dependencies = [ [[package]] name = "users" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf" +checksum = "aa4227e95324a443c9fcb06e03d4d85e91aabe9a5a02aa818688b6918b6af486" dependencies = [ "libc", + "log", ] [[package]] @@ -1265,9 +1225,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "which" -version = "4.0.1" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5fe1a9cb33fe7cf77d431070d0223e544b1e4e7f7764bad0a3e691a6678a131" +checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef" dependencies = [ "libc", "thiserror", diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 2e502251a6b..f02ee5e5107 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -4,7 +4,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.0"; + version = "0.32.2"; src = let @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "1bkc3z1w9gbjymmr5lk322kn0rd6b57v92a32jf7nckllxf43807"; + sha256 = "0l0pislc7pgx1m68kirvadraq88c86mm1k46wbz3a47ph2d4g912"; }; in runCommand "source" {} '' @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "0l7krag7n4kjvh3d4zhkk1jdswsrkag5z664fm1zwvf6rw6sfdmi"; + cargoSha256 = "16ygkh8sbb37nfc41shxg9nh2mbszyschbqrrr1gr7xzf1z36ipp"; # Some tests fail because they need network access. # However, Travis ensures a proper build. From 8f3a2d3e5cc2e0b1384e361c48192a02ab2472f4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 22 Aug 2020 22:25:31 +0200 Subject: [PATCH 513/520] neomutt: 20200814 -> 20200821 https://github.com/neomutt/neomutt/releases/tag/20200821 --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index f15e4b5fbbf..84c81ecff64 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20200814"; + version = "20200821"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "00i2xbadw7rq2b30yjla54m0df4jbh22g6phby41albw2wc2hn72"; + sha256 = "0l66xf6qp2fdhm5h2v58bbc73pwj72c80mriqac9pfyjh5padir5"; }; buildInputs = [ From 05a4dc3ce99b46e9a8bf72aebdc19e94d8f38b46 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 22 Aug 2020 22:35:22 +0200 Subject: [PATCH 514/520] wireguard-tools: 1.0.20200513 -> 1.0.20200820 https://lists.zx2c4.com/pipermail/wireguard/2020-August/005780.html --- pkgs/tools/networking/wireguard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 6cd3682c3f2..c3e4c637109 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20200513"; + version = "1.0.20200820"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "1rvnr4hk17xa2sp48icbhdnd3l69fiwwlxnn3587p1slrlms808l"; + sha256 = "138pf23x39xm68pa4ks3g76axphl8pz5jw4fyi54wi7rvxclybc7"; }; outputs = [ "out" "man" ]; From cf1a51ceefd0cca3809052304983d039daf25efa Mon Sep 17 00:00:00 2001 From: Riley Inman Date: Sun, 26 Apr 2020 08:56:27 -0400 Subject: [PATCH 515/520] streamlink-twitch-gui-bin: init at 1.10.0 --- .../video/streamlink-twitch-gui/bin.nix | 100 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 101 insertions(+) create mode 100644 pkgs/applications/video/streamlink-twitch-gui/bin.nix diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix new file mode 100644 index 00000000000..251f495b7e1 --- /dev/null +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -0,0 +1,100 @@ +{ autoPatchelfHook, fetchurl, lib, makeDesktopItem, makeWrapper, stdenv, wrapGAppsHook +, at-spi2-core, atk, alsaLib, cairo, cups, dbus, expat, gcc-unwrapped +, gdk-pixbuf, glib, gnome2, gtk3-x11, libudev0-shim, libuuid, nss, nspr, xorg +, streamlink }: + +let + basename = "streamlink-twitch-gui"; + runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; + arch = + if stdenv.hostPlatform.system == "x86_64-linux" + then + "linux64" + else + "linux32"; + +in +stdenv.mkDerivation rec { + pname = "${basename}-bin"; + version = "1.10.0"; + + src = fetchurl { + url = "https://github.com/streamlink/${basename}/releases/download/v${version}/${basename}-v${version}-${arch}.tar.gz"; + sha256 = + if arch == "linux64" + then + "17s9zbzj4pgz9mxxwjbp3788afkddc9s3p7xp28y5084z9wwzph2" + else + "1pww05hr48m6v0g1sz48g1c7p615lig3s12l21xgyz4gkjzmjy22"; + }; + + nativeBuildInputs = with xorg; [ + at-spi2-core + atk + alsaLib + autoPatchelfHook + cairo + cups.lib + dbus.daemon.lib + expat + gcc-unwrapped + gdk-pixbuf + glib + gnome2.pango + gtk3-x11 + nss + nspr + libuuid + libX11 + libxcb + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXScrnSaver + libXtst + makeWrapper + wrapGAppsHook + ]; + + buildInputs = [ streamlink ]; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + mkdir -p $out/{bin,opt/${basename},share} + + # Install all files, remove unnecessary ones + cp -a . $out/opt/${basename}/ + rm -r $out/opt/${basename}/{{add,remove}-menuitem.sh,credits.html,icons/} + + wrapProgram $out/opt/${basename}/${basename} --add-flags "--no-version-check" --prefix LD_LIBRARY_PATH : ${runtimeLibs} + + ln -s "$out/opt/${basename}/${basename}" $out/bin/ + ln -s "${desktopItem}/share/applications" $out/share/ + ''; + + desktopItem = makeDesktopItem { + name = basename; + exec = basename; + icon = basename; + desktopName = "Streamlink Twitch GUI"; + genericName = meta.description; + categories = "AudioVideo;Network;"; + }; + + meta = with stdenv.lib; { + description = "Twitch.tv browser for Streamlink"; + longDescription = "Browse Twitch.tv and watch streams in your videoplayer of choice"; + homepage = "https://streamlink.github.io/streamlink-twitch-gui/"; + downloadPage = https://github.com/streamlink/streamlink-twitch-gui/releases; + license = licenses.mit; + maintainers = with maintainers; [ rileyinman ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a5ac3065d8..90ae5de7da9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14635,6 +14635,7 @@ in stlport = callPackage ../development/libraries/stlport { }; streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; }; + streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {}; strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; From f8a49ec8dbe3eac1a8f6e4dd8146eae633142808 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 22 Aug 2020 22:16:14 +0000 Subject: [PATCH 516/520] nheko: dirty fix to #94942 (#95060) The real issue is #94952 or #94905. --- .../networking/instant-messengers/nheko/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 2f5316c9fe2..5d9963956ed 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -54,6 +54,11 @@ mkDerivation rec { qtquickcontrols2 qtgraphicaleffects ] ++ lib.optional stdenv.isDarwin qtmacextras; + # Quick and dirty fix to https://github.com/NixOS/nixpkgs/issues/94952 + # and/or: https://github.com/NixOS/nixpkgs/issues/94905 + cmakeFlags = [ + "-DCMAKE_OSX_ARCHITECTURES=" + ]; meta = with stdenv.lib; { description = "Desktop client for the Matrix protocol"; From 405dc04eab5971b8eb064deed8b251f8d3d03236 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 23 Aug 2020 09:04:13 +1000 Subject: [PATCH 517/520] .github/CODEOWNERS: add myself to podman --- .github/CODEOWNERS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d362d857838..29fbfa2a0bc 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -195,10 +195,10 @@ /pkgs/top-level/php-packages.nix @NixOS/php # Podman, CRI-O modules and related -/nixos/modules/virtualisation/containers.nix @NixOS/podman -/nixos/modules/virtualisation/cri-o.nix @NixOS/podman -/nixos/modules/virtualisation/podman.nix @NixOS/podman -/nixos/tests/podman.nix @NixOS/podman +/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq +/nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq +/nixos/modules/virtualisation/podman.nix @NixOS/podman @zowoq +/nixos/tests/podman.nix @NixOS/podman @zowoq # Blockchains /pkgs/applications/blockchains @mmahut From 026b4765bada7437c679693491ca2c6b6a1cc35c Mon Sep 17 00:00:00 2001 From: Amirhossein Rouzbahani Date: Mon, 17 Aug 2020 10:51:51 +0430 Subject: [PATCH 518/520] maintainers: add ahrzb --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fb8771a9a0f..e53e8e5f832 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -254,6 +254,12 @@ githubId = 732652; name = "Andreas Herrmann"; }; + ahrzb = { + email = "ahrzb5@gmail.com"; + github = "ahrzb"; + githubId = 5220438; + name = "AmirHossein Roozbahani"; + }; ahuzik = { email = "ales.guzik@gmail.com"; github = "alesguzik"; From 829dd22cad662dfb9dd90d6f31793316a0490a2e Mon Sep 17 00:00:00 2001 From: Amirhossein Rouzbahani Date: Mon, 17 Aug 2020 10:52:18 +0430 Subject: [PATCH 519/520] shadowsocks-v2ray-plugin: init at 1.3.1 --- .../shadowsocks-v2ray-plugin/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix diff --git a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix new file mode 100644 index 00000000000..be3a2f77d5c --- /dev/null +++ b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "shadowsocks-v2ray-plugin"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "shadowsocks"; + repo = "v2ray-plugin"; + rev = "v${version}"; + sha256 = "0aq445gnqk9dxs1hkw7rvk86wg0iyiy0h740lvyh6d9zsqhf61wb"; + }; + + vendorSha256 = "0vzd9v33p4a32f5ic9ir4g5ckis06wpdf07a649h9qalimxnvzfz"; + + meta = with lib; { + description = "Yet another SIP003 plugin for shadowsocks, based on v2ray"; + homepage = "https://github.com/shadowsocks/v2ray-plugin/"; + license = licenses.mit; + maintainers = [ maintainers.ahrzb ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e718a46b07..fb04b0e54ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6813,6 +6813,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + shadowsocks-v2ray-plugin = callPackage ../tools/networking/shadowsocks-v2ray-plugin { }; + sharutils = callPackage ../tools/archivers/sharutils { }; shelldap = callPackage ../tools/misc/shelldap { }; From ddfa22167019726c015a5638e815d028031162e8 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Sat, 22 Aug 2020 22:49:05 +0200 Subject: [PATCH 520/520] cri-o: add loobpack CNI config to module Signed-off-by: Sascha Grunert --- nixos/modules/virtualisation/cri-o.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index f8a75d3faa5..9c818eee73b 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -110,6 +110,7 @@ in ''; environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf"; + environment.etc."cni/net.d/99-loopback.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf"; # Enable common /etc/containers configuration virtualisation.containers.enable = true;