diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 00000000000..0db6fd7832b
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,146 @@
+"6.topic: agda":
+ - doc/languages-frameworks/agda.section.md
+ - nixos/tests/agda.nix
+ - pkgs/build-support/agda/**/*
+ - pkgs/development/libraries/agda/**/*
+ - pkgs/top-level/agda-packages.nix
+
+"6.topic: cinnamon":
+ - pkgs/desktops/cinnamon/**/*
+
+"6.topic: emacs":
+ - nixos/modules/services/editors/emacs.nix
+ - nixos/modules/services/editors/emacs.xml
+ - nixos/tests/emacs-daemon.nix
+ - pkgs/applications/editors/emacs-modes/**/*
+ - pkgs/applications/editors/emacs/**/*
+ - pkgs/build-support/emacs/**/*
+ - pkgs/top-level/emacs-packages.nix
+
+"6.topic: erlang":
+ - doc/languages-frameworks/beam.section.md
+ - pkgs/development/beam-modules/**/*
+ - pkgs/development/interpreters/elixir/**/*
+ - pkgs/development/interpreters/erlang/**/*
+ - pkgs/development/tools/build-managers/rebar/**/*
+ - pkgs/development/tools/build-managers/rebar3/**/*
+ - pkgs/development/tools/erlang/**/*
+ - pkgs/top-level/beam-packages.nix
+
+"6.topic: fetch":
+ - pkgs/build-support/fetch*/**/*
+
+"6.topic: GNOME":
+ - doc/languages-frameworks/gnome.section.md
+ - nixos/modules/services/desktops/gnome3/**/*
+ - nixos/modules/services/x11/desktop-managers/gnome3.nix
+ - nixos/tests/gnome3-xorg.nix
+ - nixos/tests/gnome3.nix
+ - pkgs/desktops/gnome-3/**/*
+
+"6.topic: golang":
+ - doc/languages-frameworks/go.section.md
+ - pkgs/development/compilers/go/**/*
+ - pkgs/development/go-modules/**/*
+ - pkgs/development/go-packages/**/*
+
+"6.topic: haskell":
+ - doc/languages-frameworks/haskell.section.md
+ - pkgs/development/compilers/ghc/**/*
+ - pkgs/development/haskell-modules/**/*
+ - pkgs/development/tools/haskell/**/*
+ - pkgs/top-level/haskell-packages.nix
+
+"6.topic: kernel":
+ - pkgs/build-support/kernel/**/*
+
+"6.topic: lua":
+ - pkgs/development/interpreters/lua-5/**/*
+ - pkgs/development/interpreters/luajit/**/*
+ - pkgs/development/lua-modules/**/*
+ - pkgs/top-level/lua-packages.nix
+
+"6.topic: nixos":
+ - nixos/**/*
+
+"6.topic: ocaml":
+ - doc/languages-frameworks/ocaml.section.md
+ - pkgs/development/compilers/ocaml/**/*
+ - pkgs/development/compilers/reason/**/*
+ - pkgs/development/ocaml-modules/**/*
+ - pkgs/development/tools/ocaml/**/*
+ - pkgs/top-level/ocaml-packages.nix
+
+"6.topic: pantheon":
+ - nixos/modules/services/desktops/pantheon/**/*
+ - nixos/modules/services/x11/desktop-managers/pantheon.nix
+ - nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+ - nixos/tests/pantheon.nix
+ - pkgs/desktops/pantheon/**/*
+
+"6.topic: policy discussion":
+ - .github/**/*
+
+"6.topic: printing":
+ - nixos/modules/services/printing/cupsd.nix
+ - pkgs/misc/cups/**/*
+
+"6.topic: python":
+ - doc/languages-frameworks/python.section.md
+ - pkgs/development/interpreters/python/**/*
+ - pkgs/development/python-modules/**/*
+ - pkgs/top-level/python-packages.nix
+
+"6.topic: qt/kde":
+ - doc/languages-frameworks/qt.section.md
+ - nixos/modules/services/x11/desktop-managers/plasma5.nix
+ - nixos/tests/plasma5.nix
+ - pkgs/applications/kde/**/*
+ - pkgs/desktops/plasma-5/**/*
+ - pkgs/development/libraries/kde-frameworks/**/*
+ - pkgs/development/libraries/qt-5/**/*
+
+"6.topic: ruby":
+ - doc/languages-frameworks/ruby.section.md
+ - pkgs/development/interpreters/ruby/**/*
+ - pkgs/development/ruby-modules/**/*
+
+"6.topic: rust":
+ - doc/languages-frameworks/rust.section.md
+ - pkgs/build-support/rust/**/*
+ - pkgs/development/compilers/rust/**/*
+
+"6.topic: stdenv":
+ - pkgs/stdenv/**/*
+
+"6.topic: steam":
+ - pkgs/games/steam/**/*
+
+"6.topic: systemd":
+ - pkgs/os-specific/linux/systemd/**/*
+ - nixos/modules/system/boot/systemd*/**/*
+
+"6.topic: TeX":
+ - doc/languages-frameworks/texlive.section.md
+ - pkgs/tools/typesetting/tex/**/*
+
+"6.topic: vim":
+ - doc/languages-frameworks/vim.section.md
+ - pkgs/applications/editors/vim/**/*
+ - pkgs/misc/vim-plugins/**/*
+
+"6.topic: xfce":
+ - nixos/doc/manual/configuration/xfce.xml
+ - nixos/modules/services/x11/desktop-managers/xfce.nix
+ - nixos/tests/xfce.nix
+ - pkgs/desktops/xfce/**/*
+
+"8.has: changelog":
+ - nixos/doc/manual/release-notes/**/*
+
+"8.has: documentation":
+ - doc/**/*
+ - nixos/doc/**/*
+
+"8.has: module (update)":
+ - nixos/modules/**/*
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
new file mode 100644
index 00000000000..1139807753d
--- /dev/null
+++ b/.github/workflows/labels.yml
@@ -0,0 +1,14 @@
+name: "Label PR"
+
+on:
+ pull_request_target:
+
+jobs:
+ labels:
+ runs-on: ubuntu-latest
+ if: github.repository_owner == 'NixOS'
+ steps:
+ - uses: actions/labeler@v3
+ with:
+ repo-token: ${{ secrets.GITHUB_TOKEN }}
+ sync-labels: true
diff --git a/doc/builders/packages/ibus.section.md b/doc/builders/packages/ibus.section.md
new file mode 100644
index 00000000000..2ce85467bb8
--- /dev/null
+++ b/doc/builders/packages/ibus.section.md
@@ -0,0 +1,38 @@
+# ibus-engines.typing-booster {#sec-ibus-typing-booster}
+
+This package is an ibus-based completion method to speed up typing.
+
+## Activating the engine {#sec-ibus-typing-booster-activate}
+
+IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/documentation.html).
+
+On NixOS you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module:
+
+```nix
+{ pkgs, ... }: {
+ i18n.inputMethod = {
+ enabled = "ibus";
+ ibus.engines = with pkgs.ibus-engines; [ typing-booster ];
+ };
+}
+```
+
+## Using custom hunspell dictionaries {#sec-ibus-typing-booster-customize-hunspell}
+
+The IBus engine is based on `hunspell` to support completion in many languages. By default the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this:
+
+```nix
+ibus-engines.typing-booster.override { langs = [ "de-at" "en-gb" ]; }
+```
+
+_Note: each language passed to `langs` must be an attribute name in `pkgs.hunspellDicts`._
+
+## Built-in emoji picker {#sec-ibus-typing-booster-emoji-picker}
+
+The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-emoji` is needed:
+
+On NixOS it can be installed using the following expression:
+
+```nix
+{ pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; }
+```
diff --git a/doc/builders/packages/ibus.xml b/doc/builders/packages/ibus.xml
deleted file mode 100644
index 2ed37903a27..00000000000
--- a/doc/builders/packages/ibus.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
- ibus-engines.typing-booster
-
-
- This package is an ibus-based completion method to speed up typing.
-
-
-
- Activating the engine
-
-
- IBus needs to be configured accordingly to activate typing-booster. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the upstream docs.
-
-
-
- On NixOS you need to explicitly enable ibus with given engines before customizing your desktop to use typing-booster. This can be achieved using the ibus module:
-{ pkgs, ... }: {
- i18n.inputMethod = {
- enabled = "ibus";
- ibus.engines = with pkgs.ibus-engines; [ typing-booster ];
- };
-}
-
-
-
-
- Using custom hunspell dictionaries
-
-
- The IBus engine is based on hunspell to support completion in many languages. By default the dictionaries de-de, en-us, fr-moderne es-es, it-it, sv-se and sv-fi are in use. To add another dictionary, the package can be overridden like this:
-ibus-engines.typing-booster.override {
- langs = [ "de-at" "en-gb" ];
-}
-
-
-
- Note: each language passed to langs must be an attribute name in pkgs.hunspellDicts.
-
-
-
-
- Built-in emoji picker
-
-
- The ibus-engines.typing-booster package contains a program named emoji-picker. To display all emojis correctly, a special font such as noto-fonts-emoji is needed:
-
-
-
- On NixOS it can be installed using the following expression:
-{ pkgs, ... }: {
- fonts.fonts = with pkgs; [ noto-fonts-emoji ];
-}
-
-
-
diff --git a/doc/builders/packages/index.xml b/doc/builders/packages/index.xml
index fac82180b26..e1e2fef3f16 100644
--- a/doc/builders/packages/index.xml
+++ b/doc/builders/packages/index.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 601487c4f77..54c7d5e9e5c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -746,6 +746,12 @@
githubId = 1296771;
name = "Anders Riutta";
};
+ armijnhemel = {
+ email = "armijn@tjaldur.nl";
+ github = "armijnhemel";
+ githubId = 10587952;
+ name = "Armijn Hemel";
+ };
arnarg = {
email = "arnarg@fastmail.com";
github = "arnarg";
@@ -4015,6 +4021,12 @@
githubId = 61913481;
name = "Mat Marini";
};
+ illustris = {
+ email = "me@illustris.tech";
+ github = "illustris";
+ githubId = 3948275;
+ name = "Harikrishnan R";
+ };
ilya-fedin = {
email = "fedin-ilja2010@ya.ru";
github = "ilya-fedin";
@@ -9821,6 +9833,16 @@
githubId = 16151097;
name = "Valentin Gehrke";
};
+ tuxinaut = {
+ email = "trash4you@tuxinaut.de";
+ github = "tuxinaut";
+ githubId = 722482;
+ name = "Denny Schäfer";
+ keys = [{
+ longkeyid = "rsa4096/0xB057455D1E567270";
+ fingerprint = "C752 0E49 4D92 1740 D263 C467 B057 455D 1E56 7270";
+ }];
+ };
tv = {
email = "tv@krebsco.de";
github = "4z3";
@@ -10216,6 +10238,12 @@
email = "kirill.wedens@gmail.com";
name = "wedens";
};
+ weihua = {
+ email = "luwh364@gmail.com";
+ github = "weihua-lu";
+ githubId = 9002575;
+ name = "Weihua Lu";
+ };
wheelsandmetal = {
email = "jakob@schmutz.co.uk";
github = "wheelsandmetal";
diff --git a/nixos/modules/services/web-apps/galene.nix b/nixos/modules/services/web-apps/galene.nix
index 769490e915a..dd63857a55c 100644
--- a/nixos/modules/services/web-apps/galene.nix
+++ b/nixos/modules/services/web-apps/galene.nix
@@ -133,8 +133,10 @@ in
wantedBy = [ "multi-user.target" ];
preStart = ''
- install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem
- install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem
+ ${optionalString (cfg.insecure != true) ''
+ install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem
+ install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem
+ ''}
'';
serviceConfig = mkMerge [
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index f4099f49ecf..6524700ae15 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -75,7 +75,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = teams.gnome.members;
platforms = platforms.unix;
- # couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2)
- broken = true;
};
}
diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix
index 638f54da515..4d7d70aebd6 100644
--- a/pkgs/applications/audio/littlegptracker/default.nix
+++ b/pkgs/applications/audio/littlegptracker/default.nix
@@ -43,7 +43,9 @@ stdenv.mkDerivation rec {
installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe";
in "install -Dm555 lgpt.${extension} $out/bin/lgpt";
- passthru.updateScript = unstableGitUpdater { };
+ passthru.updateScript = unstableGitUpdater {
+ url = "https://github.com/Mdashdotdashn/littlegptracker.git";
+ };
meta = with lib; {
description = "A music tracker similar to lsdj optimised to run on portable game consoles";
diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix
new file mode 100644
index 00000000000..09256911f87
--- /dev/null
+++ b/pkgs/applications/audio/mpdevil/default.nix
@@ -0,0 +1,52 @@
+{ lib, fetchFromGitHub
+, python3Packages
+, gdk-pixbuf, glib, gobject-introspection, gtk3
+, intltool
+, wrapGAppsHook }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "mpdevil";
+ version = "1.1.1";
+
+ src = fetchFromGitHub {
+ owner = "SoongNoonien";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0l7mqv7ys05al2hds4icb32hf14fqi3n7b0f5v1yx54cbl9cqfap";
+ };
+
+ nativeBuildInputs = [
+ glib.dev gobject-introspection gtk3 intltool wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gdk-pixbuf glib
+ ];
+
+ propagatedBuildInputs = with python3Packages; [
+ beautifulsoup4 distutils_extra mpd2 notify-py pygobject3 requests
+ ];
+
+ postInstall = ''
+ glib-compile-schemas $out/share/glib-2.0/schemas
+ '';
+
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+
+ # Prevent double wrapping.
+ dontWrapGApps = true;
+ # Otherwise wrapGAppsHook do not pick up the dependencies correctly.
+ strictDeps = false;
+ # There aren't any checks.
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A simple music browser for MPD";
+ homepage = "https://github.com/SoongNoonien/mpdevil";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ bloomvdomino ];
+ };
+}
diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix
index 2fd1aeccd7a..d770396a6ad 100644
--- a/pkgs/applications/audio/ocenaudio/default.nix
+++ b/pkgs/applications/audio/ocenaudio/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "ocenaudio";
- version = "3.9.6";
+ version = "3.10.2";
src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
- sha256 = "07r49133kk99ya4grwby3admy892mkk9cfxz3wh0v81aznhpw4jg";
+ sha256 = "sha256-mmo6/zc/3R8ptXfY01RKUOLgmDhWTHiYBMlGqpdMTAo=";
};
diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix
index 6a093c91daf..72e8ba135dd 100644
--- a/pkgs/applications/audio/pt2-clone/default.nix
+++ b/pkgs/applications/audio/pt2-clone/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "pt2-clone";
- version = "1.28";
+ version = "1.29";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${version}";
- sha256 = "1c2x43f46l7556kl9y9qign0g6ywdkh7ywkzv6c9y63n68ph20x2";
+ sha256 = "sha256-xnw4UL30nUv/Ru6x/7d05gC0X9nREMdXO9QWBjVoIvo=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch b/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch
deleted file mode 100644
index 5bbec1d39be..00000000000
--- a/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b43f02f6..4470abbf 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -119,7 +119,7 @@ endif (RAIBLOCKS_SECURE_RPC)
-
- include_directories (${CMAKE_SOURCE_DIR})
-
--set(Boost_USE_STATIC_LIBS ON)
-+add_definitions(-DBOOST_LOG_DYN_LINK)
- set(Boost_USE_MULTITHREADED ON)
-
- if (BOOST_CUSTOM)
diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix
index 60ad51152f6..0e39587fabb 100644
--- a/pkgs/applications/blockchains/nano-wallet/default.nix
+++ b/pkgs/applications/blockchains/nano-wallet/default.nix
@@ -1,28 +1,24 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL
-, qtbase}:
+, qtbase, python }:
stdenv.mkDerivation rec {
pname = "nano-wallet";
- version = "20.0";
+ version = "21.3";
src = fetchFromGitHub {
owner = "nanocurrency";
- repo = "raiblocks";
+ repo = "nano-node";
rev = "V${version}";
- sha256 = "12nrjjd89yjzx20d85ccmp395pl0djpx0x0qb8dgka8xfy11k7xn";
+ sha256 = "0f6chl5vrzdr4w8g3nivfxk3qm6m11js401998afnhz0xaysm4pm";
fetchSubmodules = true;
};
- # Use a patch to force dynamic linking
- patches = [
- ./CMakeLists.txt.patch
- ];
-
cmakeFlags = let
options = {
+ PYTHON_EXECUTABLE = "${python}/bin/python";
+ NANO_SHARED_BOOST = "ON";
BOOST_ROOT = boost;
- Boost_USE_STATIC_LIBS = "OFF";
RAIBLOCKS_GUI = "ON";
RAIBLOCKS_TEST = "ON";
Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5";
@@ -37,17 +33,15 @@ stdenv.mkDerivation rec {
buildInputs = [ boost libGL qtbase ];
buildPhase = ''
+ runHook preBuild
make nano_wallet
- '';
-
- # Move executables under bin directory
- postInstall = ''
- mkdir -p $out/bin
- mv $out/nano* $out/bin/
+ runHook postBuild
'';
checkPhase = ''
+ runHook preCheck
./core_test
+ runHook postCheck
'';
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 842b181cc4c..a389cf539a9 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -4,10 +4,10 @@
elpaBuild {
pname = "ace-window";
ename = "ace-window";
- version = "0.9.0";
+ version = "0.10.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ace-window-0.9.0.el";
- sha256 = "1m7fc4arcxn7fp0hnzyp20czjp4zx3rjaspfzpxzgc8sbghi81a3";
+ url = "https://elpa.gnu.org/packages/ace-window-0.10.0.tar";
+ sha256 = "1kfyf7za4zc41gf0k3rq8byvwkw7q5pxnyynh5i0gv686zrzak1i";
};
packageRequires = [ avy ];
meta = {
@@ -343,10 +343,10 @@
elpaBuild {
pname = "bnf-mode";
ename = "bnf-mode";
- version = "0.4.4";
+ version = "0.4.5";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/bnf-mode-0.4.4.tar";
- sha256 = "0acr3x96zknxs90dc9mpnrwiaa81883h36lx5q1lxfn78vjfw14x";
+ url = "https://elpa.gnu.org/packages/bnf-mode-0.4.5.tar";
+ sha256 = "0bj5ffqi54cdrraj5bp4v2cpbxjzly1p467dx1hzrlwv2b1svy2y";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -497,10 +497,10 @@
elpaBuild {
pname = "clipboard-collector";
ename = "clipboard-collector";
- version = "0.2";
+ version = "0.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/clipboard-collector-0.2.el";
- sha256 = "19scspkxgm3b1jkv10jy6nw9gv1q6sfjys09l37mvsva3djxa1dl";
+ url = "https://elpa.gnu.org/packages/clipboard-collector-0.3.tar";
+ sha256 = "09zxbivmc1zhcj8ksac2a0qpqh74rrx2slnj6cwz1n1nixn19743";
};
packageRequires = [ emacs ];
meta = {
@@ -591,10 +591,10 @@
elpaBuild {
pname = "company-math";
ename = "company-math";
- version = "1.3";
+ version = "1.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/company-math-1.3.tar";
- sha256 = "0fc9ms0s9w81sxp3qcfva3n3d2qys0pj19pnm621a6v1xdsc7i1l";
+ url = "https://elpa.gnu.org/packages/company-math-1.4.tar";
+ sha256 = "17p5ib65lg8lj2gwip5qgsznww96pch16pr16b41lls5dx4k6d6z";
};
packageRequires = [ company math-symbol-lists ];
meta = {
@@ -940,10 +940,10 @@
elpaBuild {
pname = "easy-kill";
ename = "easy-kill";
- version = "0.9.3";
+ version = "0.9.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/easy-kill-0.9.3.tar";
- sha256 = "17nw0mglmg877axwg1d0gs03yc0p04lzmd3pl0nsnqbh3303fnqb";
+ url = "https://elpa.gnu.org/packages/easy-kill-0.9.4.tar";
+ sha256 = "1pqqv4dhfm00wqch4wy3n2illsvxlz9r6r64925cvq3i7wq4la1x";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -1118,10 +1118,10 @@
elpaBuild {
pname = "elisp-benchmarks";
ename = "elisp-benchmarks";
- version = "1.9";
+ version = "1.11";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.9.tar";
- sha256 = "14qmybmjlgkjns6vlbsf46f276ykydnbm0f6mij2w3b9qx7z2nb2";
+ url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.11.tar";
+ sha256 = "0s1mpapvcivy25zbhw6ghpg0ym23vb4dsrz876rl4z2rfyckxral";
};
packageRequires = [];
meta = {
@@ -1884,10 +1884,10 @@
elpaBuild {
pname = "kiwix";
ename = "kiwix";
- version = "1.0.1";
+ version = "1.0.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/kiwix-1.0.1.tar";
- sha256 = "1dly6pilf71hq3mra9kc63i6iynzkxjmp9gwy0rhnvhq4b4qr01d";
+ url = "https://elpa.gnu.org/packages/kiwix-1.0.3.tar";
+ sha256 = "061b816xp8ykqd56z0nvc69aql9y4mba42p6x6vc0j6gr9n3c1j6";
};
packageRequires = [ emacs request ];
meta = {
@@ -1929,10 +1929,10 @@
elpaBuild {
pname = "leaf";
ename = "leaf";
- version = "4.3.2";
+ version = "4.4.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/leaf-4.3.2.tar";
- sha256 = "190sfnnii9jnj8amjkdabd8w9k2xyalhg4h488a5gzjxdzz2s6zi";
+ url = "https://elpa.gnu.org/packages/leaf-4.4.4.tar";
+ sha256 = "1npg06zmy21kg2qsqgfm03l7vjib697i96awypcdb0hw5mvmc1a1";
};
packageRequires = [ emacs ];
meta = {
@@ -2195,31 +2195,54 @@
license = lib.licenses.free;
};
}) {};
- modus-operandi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ modus-operandi-theme = callPackage ({ elpaBuild
+ , emacs
+ , fetchurl
+ , lib
+ , modus-themes }:
elpaBuild {
pname = "modus-operandi-theme";
ename = "modus-operandi-theme";
- version = "0.12.0";
+ version = "0.13.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.12.0.el";
- sha256 = "1mllyysn701qfnglxs7n2f6mrzrz55v9hcwspvafc6fl2blr393y";
+ url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.13.1.tar";
+ sha256 = "08l9qmhvxiscxn4mfb80x57mk4gfm5r0fs2l9c8i3gfzd4i3h091";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs modus-themes ];
meta = {
homepage = "https://elpa.gnu.org/packages/modus-operandi-theme.html";
license = lib.licenses.free;
};
}) {};
- modus-vivendi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ modus-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "modus-themes";
+ ename = "modus-themes";
+ version = "1.2.4";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/modus-themes-1.2.4.tar";
+ sha256 = "0wz6dgkrq4ryvj0kxnzqxwh4i8b9lw15d5dsazjpqa7gfwffpzp0";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/modus-themes.html";
+ license = lib.licenses.free;
+ };
+ }) {};
+ modus-vivendi-theme = callPackage ({ elpaBuild
+ , emacs
+ , fetchurl
+ , lib
+ , modus-themes }:
elpaBuild {
pname = "modus-vivendi-theme";
ename = "modus-vivendi-theme";
- version = "0.12.0";
+ version = "0.13.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.12.0.el";
- sha256 = "01f6z5xjnmki1k9m83jwva42lxidb31pdpwm4wpxjzxqmb96picn";
+ url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.13.1.tar";
+ sha256 = "0xz304zcc872c2zwnlm8ky0m18smf7bffiyj21ygghgclr7kgma1";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs modus-themes ];
meta = {
homepage = "https://elpa.gnu.org/packages/modus-vivendi-theme.html";
license = lib.licenses.free;
@@ -2763,10 +2786,10 @@
elpaBuild {
pname = "pyim";
ename = "pyim";
- version = "3.5";
+ version = "3.6";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/pyim-3.5.tar";
- sha256 = "0593ds3zbmpd6235b8v33f3cb3sn8cwr6arb6zbf1ba97nawjxqs";
+ url = "https://elpa.gnu.org/packages/pyim-3.6.tar";
+ sha256 = "1fmbzh33s9xdvrfjhkqr9ydcqbiv8lr04k5idvbpc9vwjjjan5y0";
};
packageRequires = [ async emacs xr ];
meta = {
@@ -3103,10 +3126,10 @@
elpaBuild {
pname = "rich-minority";
ename = "rich-minority";
- version = "1.0.1";
+ version = "1.0.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/rich-minority-1.0.1.el";
- sha256 = "1pr89k3jz044vf582klphl1zf0r7hj2g7ga8j1dwbrpr9ngiicgc";
+ url = "https://elpa.gnu.org/packages/rich-minority-1.0.3.tar";
+ sha256 = "1w61qvx2rw6a6gmrm61080zghil95nzdv4w06c0pvyb62m4rwab0";
};
packageRequires = [ cl-lib ];
meta = {
@@ -3225,6 +3248,21 @@
license = lib.licenses.free;
};
}) {};
+ setup = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "setup";
+ ename = "setup";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/setup-0.1.1.tar";
+ sha256 = "0z34m06lxw6xd6bxacm1h5cijamsksk4daf6fbzhd7kqmw3gbgqg";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/setup.html";
+ license = lib.licenses.free;
+ };
+ }) {};
shelisp = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "shelisp";
@@ -3797,10 +3835,10 @@
elpaBuild {
pname = "valign";
ename = "valign";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/valign-3.1.0.tar";
- sha256 = "0zx6p2nlvd4nkffj0myqv4hry8kgnhq45fcivfjzbfn62j2kp293";
+ url = "https://elpa.gnu.org/packages/valign-3.1.1.tar";
+ sha256 = "1nla0zfj0rxwhdjgnsy2c34wzrxfxiwl89cjb6aicyvfxninz7j0";
};
packageRequires = [ emacs ];
meta = {
@@ -4012,10 +4050,10 @@
elpaBuild {
pname = "which-key";
ename = "which-key";
- version = "3.3.2";
+ version = "3.5.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/which-key-3.3.2.tar";
- sha256 = "01g5jcikhgxnri1rpbjq191220b4r3bimz2jzs1asc766w42q2gb";
+ url = "https://elpa.gnu.org/packages/which-key-3.5.1.tar";
+ sha256 = "187cssvqpd0wj01rgd19pp1k6aj9m2n5fdqznkga6w1h6cb5cm2b";
};
packageRequires = [ emacs ];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 95f9ee3245c..7ed43a82cc3 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 = "20210308";
+ version = "20210315";
src = fetchurl {
- url = "https://orgmode.org/elpa/org-20210308.tar";
- sha256 = "1i5zga615inn5s547329g6paqbzcbhyj9hxv14c0c1m9bhra5bjs";
+ url = "https://orgmode.org/elpa/org-20210315.tar";
+ sha256 = "128agds82kfmvxshzrs61802vgwlf2dsm79hq9x2bljrnvf8p14l";
};
packageRequires = [];
meta = {
@@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
- version = "20210308";
+ version = "20210315";
src = fetchurl {
- url = "https://orgmode.org/elpa/org-plus-contrib-20210308.tar";
- sha256 = "1agbxhjkkmf4p8p8mwc6sv77ij22dr5fyhkpsnljvzkidiarfldf";
+ url = "https://orgmode.org/elpa/org-plus-contrib-20210315.tar";
+ sha256 = "0dih4690pbbnwlphjnv1kgvsw43pkcgk41xjjiphy9sf7w9gr11j";
};
packageRequires = [];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index e7a530d46ae..3b9cb3f5288 100644
--- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -198,11 +198,11 @@
"repo": "ymarco/auto-activating-snippets",
"unstable": {
"version": [
- 20210303,
- 1228
+ 20210316,
+ 2027
],
- "commit": "dd58b7601ec536980a14540bddac53f5d1c1da08",
- "sha256": "0ccvidz5zivmy3pkxn3mj3y3c7j6qr6im7cf2fz7n98wq1h2cpn1"
+ "commit": "af9d405a0f6ea078ae5b6567f664f4166f9f0ab0",
+ "sha256": "0jsnvnpvrrz5b4vh9jf3sjjm0pgh4241zw54bjkqa1ld9vvxwkxn"
},
"stable": {
"version": [
@@ -1507,14 +1507,14 @@
"repo": "mrkkrp/ace-popup-menu",
"unstable": {
"version": [
- 20190713,
- 1337
+ 20210318,
+ 1748
],
"deps": [
"avy-menu"
],
- "commit": "390f0711d2a42675980d8b531fd5dc396b85f24b",
- "sha256": "00va4glq9iibrfrnhinv8a7f5q0z7xvfyxnjf1rl4z770drz9j4n"
+ "commit": "9a2056c53faba0bd7b7f44fb3faabf4d34b8497f",
+ "sha256": "0i7a708y9x4xdny3ccqwngn4la5vg0539c7qk87d163gl61mbk7k"
},
"stable": {
"version": [
@@ -1918,8 +1918,8 @@
"annotation",
"eri"
],
- "commit": "f9a181685397517b5d14943ca88a1c0acacc2075",
- "sha256": "10gk6052zdp28n9z3bjxwcgg0161sfcnz52h46w7s5jwibl1ymiw"
+ "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299",
+ "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08"
},
"stable": {
"version": [
@@ -2378,11 +2378,11 @@
"repo": "domtronn/all-the-icons.el",
"unstable": {
"version": [
- 20210307,
- 1457
+ 20210313,
+ 2205
],
- "commit": "96772f87b0bd22573b9d6433e4c5e9f082616600",
- "sha256": "1l329c754qlddzffgdnx5c50lz1v573lv3y4f053qp4d0az5m3js"
+ "commit": "a8c84176af7f3b97019423ebf3e02f983f4ebdf9",
+ "sha256": "07vscdf28wjjxsqaich694r94rf9iffjbqsvmqcq8h0qhqzfp2pq"
},
"stable": {
"version": [
@@ -3146,8 +3146,8 @@
20200914,
644
],
- "commit": "f9a181685397517b5d14943ca88a1c0acacc2075",
- "sha256": "10gk6052zdp28n9z3bjxwcgg0161sfcnz52h46w7s5jwibl1ymiw"
+ "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299",
+ "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08"
},
"stable": {
"version": [
@@ -3644,11 +3644,11 @@
"repo": "waymondo/apropospriate-theme",
"unstable": {
"version": [
- 20210303,
- 2006
+ 20210316,
+ 2156
],
- "commit": "cf12db35089836ee521ef248860ef8c48ea6ce4a",
- "sha256": "0fqj5zc82nl2x3lsdaz7v1df366lzhymf0ji4d8a2cpbpliy1dh4"
+ "commit": "22b394e3c9fc8db3a33c0f7fa36263ce44b0dec5",
+ "sha256": "1075f1gp9q210h4varmrj69g35wf8dygamzwsgfp38kqggdqdrxq"
},
"stable": {
"version": [
@@ -5454,8 +5454,8 @@
"avy",
"embark"
],
- "commit": "d267c11b2d6f510d9e173400ec90e18a471fc7b3",
- "sha256": "1a8qj71jcy0cpywy6677kg9d3l2a4v96nvaw7kccm2xmsrhq6wa2"
+ "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd",
+ "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54"
},
"stable": {
"version": [
@@ -5665,11 +5665,11 @@
"url": "https://bitbucket.org/pdo/axiom-environment",
"unstable": {
"version": [
- 20210131,
- 2053
+ 20210312,
+ 2248
],
- "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f",
- "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218"
+ "commit": "ac8228a702290732ba12c5d13b38576a57afb0d6",
+ "sha256": "1nrlgrckvh2fiwis9bmr95h2bpxfkz1nknxdz61380f2caqwwhw7"
}
},
{
@@ -6144,14 +6144,26 @@
"repo": "dykstrom/basic-mode",
"unstable": {
"version": [
- 20180919,
- 1752
+ 20210316,
+ 1253
],
"deps": [
"seq"
],
- "commit": "812f078240f9de09491701853569335ba6d9b5ff",
- "sha256": "1492klgbkxb46x02kmhngccx4p9fmjvf6m4ay89j7pyaixvcqj8v"
+ "commit": "eaa5f24d2fb303d9e5d7de2a28c7c18b01532ab6",
+ "sha256": "1qvrf6mdrxzzd66888saddjrg5008rrgk0shg6vsyd39gk2bai22"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 4,
+ 3
+ ],
+ "deps": [
+ "seq"
+ ],
+ "commit": "0f135eb6581dabe69fff07f31082c8f53b4dcc70",
+ "sha256": "13z1b9wqhrx5c87ymc7jikvais7xd1jzx5qsnn03d6wmlm1y027z"
}
},
{
@@ -6502,11 +6514,11 @@
"repo": "DamienCassou/beginend",
"unstable": {
"version": [
- 20200526,
- 2005
+ 20210319,
+ 1039
],
- "commit": "9c7a92779d75f6fd985cf707ff5241bc98ccea6c",
- "sha256": "1r9033zlx2q2dk3bjz004flxdiw79qiswq0zqdjnlzwassvk0f35"
+ "commit": "94465a6c80827e7db9dc2384932b168a0d8254e4",
+ "sha256": "1jnx6fqmj0i4kxpw03znribqj5nlhyprwlmsbi63hjzbd51h83q3"
},
"stable": {
"version": [
@@ -6902,8 +6914,8 @@
"a",
"pdf-tools"
],
- "commit": "e086c59a14701cd041641b51c952fa704ee963df",
- "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p"
+ "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f",
+ "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q"
}
},
{
@@ -7598,8 +7610,8 @@
"repo": "josteink/bmx-mode",
"unstable": {
"version": [
- 20180929,
- 1132
+ 20210319,
+ 620
],
"deps": [
"cl-lib",
@@ -7607,8 +7619,8 @@
"dash",
"s"
],
- "commit": "30122e2a6bfb00834e18363e7909182b2701ce82",
- "sha256": "1kk98g2zlgz9s7r95986p7f9dch23r8dk78k2dgy07ifnqickvfx"
+ "commit": "6f008707efe0bb5646f0c1b0d6f57f0a8800e200",
+ "sha256": "0v6b8w4hy1yw713mkkh74b7c638hnk24ccbizfsylnk00ynrrza1"
}
},
{
@@ -9696,8 +9708,8 @@
"repo": "cask/cask",
"unstable": {
"version": [
- 20210309,
- 2113
+ 20210319,
+ 2155
],
"deps": [
"ansi",
@@ -9708,8 +9720,8 @@
"s",
"shut-up"
],
- "commit": "afa7fd8a885ee76c9cc0dcf1425f01b98e4b2e48",
- "sha256": "0vdrazjhlnpxjw6ah065713g15qmdx11mfcjjzr3004nvhksnmwh"
+ "commit": "d1ee01ba3c06a62e784c3982ad6f50dbabf5c00f",
+ "sha256": "1fbk6b4jpg9sg886dbd66fmmwawrjzdw564d49822s6vnjhgs0wf"
},
"stable": {
"version": [
@@ -10226,8 +10238,8 @@
20171115,
2108
],
- "commit": "80e18350c1c55906f624915f58e9eb3d87d2af92",
- "sha256": "0qk2hn4w5k6a8147a46fzsyfyagq4kwiii4jgn19qwwzpfa1iijx"
+ "commit": "225c5e0cbd4704606eaafecb908bcd8daed4c54f",
+ "sha256": "1k8lx2s61kynhdv43czasp27vxb3bh6kmpsd0caxklk5n6m804rj"
},
"stable": {
"version": [
@@ -10272,6 +10284,40 @@
"sha256": "1hqyxsnnl6zbbbfbacipd226dvhc9zlfpxvacmn6g9iv7qfc8k53"
}
},
+ {
+ "ename": "cfn-mode",
+ "commit": "3ac23c6e0cceb3dd52519a9946dcd500936d8e97",
+ "sha256": "0yk7zlgbr0s3lc2b05g057g55x3rl767xd317hb162lg0d7d900v",
+ "fetcher": "gitlab",
+ "repo": "worr/cfn-mode",
+ "unstable": {
+ "version": [
+ 20210129,
+ 2037
+ ],
+ "deps": [
+ "f",
+ "s",
+ "yaml-mode"
+ ],
+ "commit": "a4ca40978e680f9edc86c141e696e0ae57c63533",
+ "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 2
+ ],
+ "deps": [
+ "f",
+ "s",
+ "yaml-mode"
+ ],
+ "commit": "f3462930067de8f79c3d2e8da14d1924f609d3ab",
+ "sha256": "15ndphxz1jy4wbk52f6l3hk67b29844ljmmxd8wmahmi6c8nh3si"
+ }
+ },
{
"ename": "cframe",
"commit": "6e39555b2538cc8a955766c5533871396e8fe712",
@@ -10927,8 +10973,8 @@
"repo": "clojure-emacs/cider",
"unstable": {
"version": [
- 20210302,
- 849
+ 20210318,
+ 837
],
"deps": [
"clojure-mode",
@@ -10939,8 +10985,8 @@
"sesman",
"spinner"
],
- "commit": "15eaf42922e5e24b834e8078f953f9f51310f335",
- "sha256": "0wx5w7vy81afyz3rh7vr3pzj6yhry9b9gi5p7738qgcblns076ad"
+ "commit": "32835ea157212c500756ab625ddba4844b029c14",
+ "sha256": "0h9wwk72gp19fljiv9c18h5qz7ckddqhcvppm9k0vddxy7vhbhv5"
},
"stable": {
"version": [
@@ -12233,8 +12279,8 @@
20210104,
1831
],
- "commit": "e3009f16e9a29e5fd29c8e19dfecb970c3783a55",
- "sha256": "17fag7xl25apynprz2g5lldjmg5wwpla59f7ap9mp6g4pgpx1z92"
+ "commit": "9b4390e76be7e46f2031563642f0a1cae5dbf4e8",
+ "sha256": "19h3gf7b63b8xblyqrdlizzsjpjsg6xi0spp4fsymlhvxm5j2g1b"
},
"stable": {
"version": [
@@ -12242,10 +12288,10 @@
20,
0,
-1,
- 4
+ 5
],
- "commit": "c69d4b177fb3f6ebd22cddec919dbe1c30f43714",
- "sha256": "03ivc8pmhbfrba0nfy1b7j83mdcrg6qb0c98qns6gagw35s338d1"
+ "commit": "fab7fe7ef5a5462952297611c1dd668a603e3a36",
+ "sha256": "12v6v1hpw0ykkikj4qid3m4m7sb164rgpx6fxin4hvsm20pjcrd4"
}
},
{
@@ -13346,8 +13392,8 @@
"axiom-environment",
"company"
],
- "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f",
- "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218"
+ "commit": "ac8228a702290732ba12c5d13b38576a57afb0d6",
+ "sha256": "1nrlgrckvh2fiwis9bmr95h2bpxfkz1nknxdz61380f2caqwwhw7"
}
},
{
@@ -14149,8 +14195,8 @@
"company",
"native-complete"
],
- "commit": "be7ced29c5a86e29c364f19d248634b8b54d0e52",
- "sha256": "1lyad89byq54fva58njf7wiq2rw3767fxif1ykijirzx7q14ahxd"
+ "commit": "cf142e84eaa4dd91bc75d96a5d26dab5e38eba4c",
+ "sha256": "01li6c271v5j35chg3a8nl9az3bwq4hk1j8lfjq5a27p91iszpc0"
}
},
{
@@ -15400,11 +15446,11 @@
"repo": "minad/consult",
"unstable": {
"version": [
- 20210312,
- 1143
+ 20210318,
+ 1440
],
- "commit": "bd58f2e3b7a9bd52145aa97997e62ec5d9e7e4d5",
- "sha256": "007i3qxjkvqrkpwyx495s46xbfzjxp4hbzgfvg8ys7yi2qxnbsys"
+ "commit": "e7d409c684a34475349e4019c9c54ee08f644cdb",
+ "sha256": "1z5qkaaqpz7h9sjfjfr4rvy49gaxfxg82knmplq9x0iyxc31k8b9"
},
"stable": {
"version": [
@@ -15430,8 +15476,8 @@
"consult",
"flycheck"
],
- "commit": "bd58f2e3b7a9bd52145aa97997e62ec5d9e7e4d5",
- "sha256": "007i3qxjkvqrkpwyx495s46xbfzjxp4hbzgfvg8ys7yi2qxnbsys"
+ "commit": "e7d409c684a34475349e4019c9c54ee08f644cdb",
+ "sha256": "1z5qkaaqpz7h9sjfjfr4rvy49gaxfxg82knmplq9x0iyxc31k8b9"
},
"stable": {
"version": [
@@ -15454,15 +15500,15 @@
"url": "https://codeberg.org/jao/consult-notmuch.git",
"unstable": {
"version": [
- 20210309,
- 2100
+ 20210312,
+ 2201
],
"deps": [
"consult",
"notmuch"
],
- "commit": "f3f8ffe3d2e15e67ded5d7aaa7f50bf17c2b1aa4",
- "sha256": "0gkvqwqi07saf8hy7bqbafi97ygp361jrn9qxp7k663jpj7b9d71"
+ "commit": "67cf219fcce211237347a783ce6982402341d5fd",
+ "sha256": "03amdvzj09dsdjc7y6xvxn429by9vzyv5wghyairn9n0rf8c3r1m"
},
"stable": {
"version": [
@@ -15493,8 +15539,8 @@
"espotify",
"marginalia"
],
- "commit": "e714905b71993b6234a4aee6138d5b659605fe57",
- "sha256": "118cksih4rm113miiagw31w0fx5inih60b04431amp0ydphp4fdw"
+ "commit": "031e0e63a214dd089478d60e6d900c1a65851678",
+ "sha256": "0lmcihysjwmk22yhqmiby1sbj9f67lr6wpdzyz9df8wsmziva26v"
}
},
{
@@ -15810,15 +15856,15 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20210310,
- 1746
+ 20210313,
+ 1108
],
"deps": [
"ivy",
"swiper"
],
- "commit": "8866138333f92c3d82062c5fa613beba38901504",
- "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8"
+ "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
+ "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
},
"stable": {
"version": [
@@ -16927,16 +16973,16 @@
"repo": "emacs-csharp/csharp-mode",
"unstable": {
"version": [
- 20210311,
- 1831
+ 20210319,
+ 846
],
"deps": [
"tree-sitter",
"tree-sitter-indent",
"tree-sitter-langs"
],
- "commit": "43e591987f620479413defa3d0bc5b3cd7887159",
- "sha256": "0mxdywffg4ww98905mc6kjhk9mfzhgwzsn98w0vmy0fckcarl3gl"
+ "commit": "d942b2762c72a0112f564af173fa66d2e63903cf",
+ "sha256": "0g6x85mayjd7cf9b19bsnrbmv32kf75318qx76csa3bqgq309whx"
},
"stable": {
"version": [
@@ -17409,6 +17455,21 @@
"sha256": "1d1mz0j51i09g2fn25iik7wk0cc9i6ps8qviik73fy7ivvxjn0vp"
}
},
+ {
+ "ename": "curry-on-theme",
+ "commit": "a87da8c1522b826252193faa67c933a0eb3a3266",
+ "sha256": "08nfpzpg4q46p62l3kfxnfcmnmzjbi35vfgvlwl1aan29sw0ciid",
+ "fetcher": "github",
+ "repo": "mvarela/Curry-On-theme",
+ "unstable": {
+ "version": [
+ 20210308,
+ 1244
+ ],
+ "commit": "316fad72466cc5bd120a26cf235e9357117230a0",
+ "sha256": "11gkfccrynq3bk8qcbibinai9l497sij4b4zlizdf8qicjymmkd1"
+ }
+ },
{
"ename": "cursor-test",
"commit": "6439f7561cfab4f6f3beb132d2a65e94b3deba9e",
@@ -17548,11 +17609,11 @@
"repo": "mrkkrp/cyphejor",
"unstable": {
"version": [
- 20210111,
- 841
+ 20210319,
+ 1423
],
- "commit": "037c0f2d0cd0e23acd2aacb621d7694080f5eef6",
- "sha256": "16jca2abc66vcf92js5m5489np7a4ymb27i78rkqwsrwcniz178j"
+ "commit": "cf580995f891e339a9485ba91d6cb81a2abd61e4",
+ "sha256": "1k0zwgr80figw0xkni2ih87bi566q3j4009dhicq4ldv2lyaybl9"
},
"stable": {
"version": [
@@ -17590,8 +17651,8 @@
20190111,
2150
],
- "commit": "9a761a637fce6a7b70735ae2248963d63e569e14",
- "sha256": "1f7zk28ywx47ig5fa6plq4415lbvd4972j4jjgb05qrg853zpca5"
+ "commit": "0ec9be57f5770869cb2fbe36e00bbde405b3b855",
+ "sha256": "16qiazp9p24nwaspdyi04jjlvpjpw291c40nvzlnqa2afdk5zwxn"
},
"stable": {
"version": [
@@ -17798,8 +17859,8 @@
"repo": "emacs-lsp/dap-mode",
"unstable": {
"version": [
- 20210305,
- 1555
+ 20210317,
+ 151
],
"deps": [
"bui",
@@ -17811,8 +17872,8 @@
"posframe",
"s"
],
- "commit": "7b67475361f7a89a1c3d5f6979d12209ad036f54",
- "sha256": "0yvaplfrd6agi8balv1wnyvyi9n7wgc1raqw43qlzaz03bbdq1da"
+ "commit": "ae395aa991d55eaddb2d2b80cd469089b9d19bb7",
+ "sha256": "1bxpnaj466n6sw00zc4fbw7i7nmkr0b6g8qvai6vql503lmm5f89"
},
"stable": {
"version": [
@@ -19392,14 +19453,14 @@
"repo": "dgutov/diff-hl",
"unstable": {
"version": [
- 20210223,
- 2303
+ 20210318,
+ 1413
],
"deps": [
"cl-lib"
],
- "commit": "738c5d6a6bffe46b18249c77d59ae1d9e2d4d126",
- "sha256": "1dn77ysxi9h1yz7f3lpw2gv4jsbwgjqbci5b6blgk5zaqpkj8nrd"
+ "commit": "1af31fe1c177646ef7419c95b5d9c25655187ceb",
+ "sha256": "10gh6fl0j41ga612kk2yh82zh67hbd86rg640r1fk6gc0lcmwqih"
},
"stable": {
"version": [
@@ -19641,6 +19702,24 @@
"sha256": "0k9m57zrdpabb6b34j9xy3cmcpzni89wq71pzzwgdi47p1n4r4vd"
}
},
+ {
+ "ename": "dime",
+ "commit": "227c61618e491c4da2b2b48daf7f1bebd2271558",
+ "sha256": "1pd464l4rj1nychdhmi23m98cfxkhvdpxhzni33j275jqin335mp",
+ "fetcher": "github",
+ "repo": "dylan-lang/dylan-emacs-support",
+ "unstable": {
+ "version": [
+ 20210319,
+ 1414
+ ],
+ "deps": [
+ "dylan"
+ ],
+ "commit": "c51cdb2d947494d8161a429134f9e9d23070a173",
+ "sha256": "0p4kp2gp27xgs4fw0cfd4qz06yp6kvn0k1pq902arzcxkrqz6lj3"
+ }
+ },
{
"ename": "diminish",
"commit": "1bfb4acb381cada46458cf60eae9b88d007294d5",
@@ -20304,11 +20383,11 @@
"repo": "vifon/dired-rifle.el",
"unstable": {
"version": [
- 20200308,
- 2358
+ 20210316,
+ 1452
],
- "commit": "99e4110c80d65ca43e2b0ec078e3202995e392d7",
- "sha256": "034qak8kdp7laz1ylqy9np5ajhwf741mdl0bj5kb7rrrsijxada6"
+ "commit": "cc1af692bbac651f5e5111d9ab1c0805989d65e5",
+ "sha256": "08csqjpwlqln2yk5by9zwh6jsl5kn33jy240d7a1py1d892b7xy8"
}
},
{
@@ -20493,11 +20572,11 @@
"repo": "Boruch-Baum/emacs-diredc",
"unstable": {
"version": [
- 20210312,
- 758
+ 20210316,
+ 1841
],
- "commit": "354b7a38d1e5778fa88287ddf2f54a8177bf78ad",
- "sha256": "0wpv0ym6zs11pf30bj6b672hgaf0gsh9pxnlbyrbm5pgdwzfcxs0"
+ "commit": "dd945de3e0c66a164f003a96d473376b58fc6dc7",
+ "sha256": "1d4rdrc827nnb9p56la1sd9nzwjbxbnr8fgmcgardlz3qw97j3q1"
},
"stable": {
"version": [
@@ -21337,8 +21416,8 @@
"repo": "Silex/docker.el",
"unstable": {
"version": [
- 20210304,
- 1614
+ 20210313,
+ 1943
],
"deps": [
"dash",
@@ -21348,8 +21427,8 @@
"tablist",
"transient"
],
- "commit": "85bc970dc2c1b81737c5ab89c62d6b75983388c2",
- "sha256": "0y8zdvv11kxkbsrhnh3dl2sgxk6gbr3b7jz3d4kzgs36hyzv15l3"
+ "commit": "ed0cdf08597ceb3a1f85e065d1b2b7aefd7e35ee",
+ "sha256": "1p0281gaj09jpavlkv24dzvf0gdh9r7ki1z53x0q49dm1fcday6m"
},
"stable": {
"version": [
@@ -21543,14 +21622,14 @@
"repo": "jcs-elpa/docstr",
"unstable": {
"version": [
- 20210301,
- 1350
+ 20210317,
+ 1612
],
"deps": [
"s"
],
- "commit": "a60b49ed37345c5f47604e857c97978a93e314bf",
- "sha256": "0x8ih30m1d2m4za17zzfdjvc2h0qlpdh4nwzgz9laxwibgm499ds"
+ "commit": "5ce0d758dbabb6c250f761fcb6754930cd793c2a",
+ "sha256": "0x9sxcp40p83isjc6smhg00n42056q5dsf0w71gglb1gc5rqhhl6"
},
"stable": {
"version": [
@@ -22232,8 +22311,8 @@
"s",
"seq"
],
- "commit": "945f014d2a3618caa5031f6a8fbc8daf1a5754ae",
- "sha256": "13rdlp0j3f4kvms29akhrbr5l2y58x48jlzgaivi6qhhh2ggya8w"
+ "commit": "2a2a635e2b1d8243a41df0450e45fc8c75c6674b",
+ "sha256": "0kd8lkvaxqaz4ns8mwyczbbjyi68r3gicngnrichwlbl27am1zvm"
}
},
{
@@ -22394,8 +22473,8 @@
20210213,
757
],
- "commit": "2d20e430437a09fb438d7294672e4c7f30a68504",
- "sha256": "1rl8zrv7bwsvffbp9k7gqz2j5gmx7bs1rbq3vhq5aq2hw5k06an4"
+ "commit": "a181b937c20c706f24ba1d17021593b0087ac574",
+ "sha256": "0g3s4g3lq42c6ca10idxlybwj3pici2v7r9aifyr5q15n2xgpizq"
},
"stable": {
"version": [
@@ -22480,18 +22559,18 @@
}
},
{
- "ename": "dylan-mode",
- "commit": "94481ba3ebba6a99f11efab5a33e8bc6ea2d857a",
- "sha256": "0kimvz8vmcvgxi0wvf7dqv6plj31xlksmvgip8h3bhyy7slxj3yy",
+ "ename": "dylan",
+ "commit": "227c61618e491c4da2b2b48daf7f1bebd2271558",
+ "sha256": "0i0139jv2l9yw82hpmavw0jkzi3jxbz663xls604nhdggi7kqgzg",
"fetcher": "github",
- "repo": "dylan-lang/dylan-mode",
+ "repo": "dylan-lang/dylan-emacs-support",
"unstable": {
"version": [
- 20210309,
- 1456
+ 20210317,
+ 1405
],
- "commit": "25dd620cf467a4a322461d9f9983db0fcca08e43",
- "sha256": "0w70h20b33h6vykqkb0h3cb21hv1nd7rm4j9dcc66ihpisw9crkp"
+ "commit": "c51cdb2d947494d8161a429134f9e9d23070a173",
+ "sha256": "0p4kp2gp27xgs4fw0cfd4qz06yp6kvn0k1pq902arzcxkrqz6lj3"
}
},
{
@@ -23065,14 +23144,14 @@
"repo": "joostkremers/ebib",
"unstable": {
"version": [
- 20210307,
- 1125
+ 20210316,
+ 840
],
"deps": [
"parsebib"
],
- "commit": "6a3351c4bee70517facf0eac457a17a1efc21144",
- "sha256": "0ppp6a8qyllh1kjrh8fa8dvhv98wnq0w742mzh8gahkjbrsjdwcj"
+ "commit": "1a23ce943991d5dce4a3c3d71d7b5d6b6f9897fe",
+ "sha256": "1wwgfgcr83mvjp9w1yizg49j85j92kd2fyiyyl6x9v8bs4xsn4pi"
},
"stable": {
"version": [
@@ -23913,8 +23992,8 @@
"repo": "joaotavora/eglot",
"unstable": {
"version": [
- 20210306,
- 2312
+ 20210319,
+ 2010
],
"deps": [
"eldoc",
@@ -23923,8 +24002,8 @@
"project",
"xref"
],
- "commit": "f0c770cfbbc75c7aeb22cd2b118bc3948596d7a7",
- "sha256": "0qcjiawszs3v166q8nanifp465yd5ib2gl2ywrlmgk1l7ixr80wp"
+ "commit": "b4ffcf26fb392ed83f6c40bc9b62cbe54483119c",
+ "sha256": "1lpi249cv61892nl8a0asx6z4dzgyphrh4f5cn9awryyv8x166dx"
},
"stable": {
"version": [
@@ -24074,8 +24153,8 @@
"repo": "millejoh/emacs-ipython-notebook",
"unstable": {
"version": [
- 20210228,
- 15
+ 20210317,
+ 12
],
"deps": [
"anaphora",
@@ -24086,8 +24165,8 @@
"websocket",
"with-editor"
],
- "commit": "dfd968c0ae92f368a1861a15b54d4e4385271469",
- "sha256": "1cna661kqkw1sz1dz7pba06d9l581k6g3vjl99vrraq1f7k4afcl"
+ "commit": "147940d5d734b22e8dc6fc24d1d7423766ceed0c",
+ "sha256": "1yjdlghgsm4alrfp6nsfq2wi7ym66nbh1gx3dfsm5c1hr22lx9fq"
},
"stable": {
"version": [
@@ -24170,8 +24249,8 @@
"direx",
"spinner"
],
- "commit": "6eecf51e4c5e6f7d24ab90e8def34f6cea4eda52",
- "sha256": "0yk5bblrzf0bvnkzdkb0bzk8mfp4b6j84cjg60k3i4dyyp17h847"
+ "commit": "c24519e5b7fc1051257b0ec67fc6dec84d6b996e",
+ "sha256": "1qsps36cxvd8vpssr7xjydgmgq8zslck0j77920xm27wvfyrj2a2"
},
"stable": {
"version": [
@@ -24584,11 +24663,11 @@
"repo": "Mstrodl/elcord",
"unstable": {
"version": [
- 20210311,
- 256
+ 20210316,
+ 1921
],
- "commit": "9bea3248938b99498f5114f46441720e1d4b2f3a",
- "sha256": "0l540rpw2vwjm9vh4bv673lcjw20v5gvfyf1xmxdsfhsf7m0rdns"
+ "commit": "d63021046b5ccb129669f1eae60ffc5f48338230",
+ "sha256": "1mf98cfnmb58bzwrfcg6v1k02mmzwzkig3h61qx779014ayq7v2h"
}
},
{
@@ -24657,11 +24736,11 @@
"repo": "casouri/eldoc-box",
"unstable": {
"version": [
- 20200316,
- 1956
+ 20210313,
+ 1824
],
- "commit": "c1a1b77ec0c7fff9ecf7122d10dcd16eebcd3829",
- "sha256": "1gg3gxw5ks4fds7lgl9mqxyb2qjrdsdwyyc183nfz6aq0m4w91yb"
+ "commit": "d4574ee392b9a8c537bec895be37468b600c25ac",
+ "sha256": "08fscq9amwqap741i25j7swb0gwzipkczqrvrgg3430jb3i0d663"
},
"stable": {
"version": [
@@ -24814,11 +24893,11 @@
"repo": "xwl/electric-spacing",
"unstable": {
"version": [
- 20200607,
- 1405
+ 20210313,
+ 1118
],
- "commit": "f039011edb922cdc56c1d2bd0e49bb4575c35ab3",
- "sha256": "1qfjk928y8bnx2ksciv0f0ackahj78x3qsr84m9qcvsvlg9cql5p"
+ "commit": "fb1437a3386f55440abdbe7c107c86e5b028bdc5",
+ "sha256": "00pmp1596p24i7pasmm080aly8ifinp9hbvia2l4jf8mbfg2ndlw"
}
},
{
@@ -26445,11 +26524,11 @@
"repo": "oantolin/embark",
"unstable": {
"version": [
- 20210309,
- 1632
+ 20210317,
+ 1432
],
- "commit": "d267c11b2d6f510d9e173400ec90e18a471fc7b3",
- "sha256": "1a8qj71jcy0cpywy6677kg9d3l2a4v96nvaw7kccm2xmsrhq6wa2"
+ "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd",
+ "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54"
},
"stable": {
"version": [
@@ -26475,8 +26554,8 @@
"consult",
"embark"
],
- "commit": "d267c11b2d6f510d9e173400ec90e18a471fc7b3",
- "sha256": "1a8qj71jcy0cpywy6677kg9d3l2a4v96nvaw7kccm2xmsrhq6wa2"
+ "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd",
+ "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54"
},
"stable": {
"version": [
@@ -28019,8 +28098,8 @@
20200914,
644
],
- "commit": "f9a181685397517b5d14943ca88a1c0acacc2075",
- "sha256": "10gk6052zdp28n9z3bjxwcgg0161sfcnz52h46w7s5jwibl1ymiw"
+ "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299",
+ "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08"
},
"stable": {
"version": [
@@ -28041,11 +28120,11 @@
"repo": "erlang/otp",
"unstable": {
"version": [
- 20210226,
- 1127
+ 20210315,
+ 1640
],
- "commit": "13f941d2ed90b3dcb0f8fc97bbad79bcdc474f64",
- "sha256": "1ikxsgynzs0k3yxxf442bxnvlpy5zkkri3i886sy03cik04yhjvq"
+ "commit": "ebc70093c3be41cd86da18d2f188ce9648dc287c",
+ "sha256": "1gvb5p92gnl0lv48wqgls6jyhyzkd7kckklrsmn325s6vnqx72cd"
},
"stable": {
"version": [
@@ -28794,8 +28873,8 @@
20210224,
126
],
- "commit": "e714905b71993b6234a4aee6138d5b659605fe57",
- "sha256": "118cksih4rm113miiagw31w0fx5inih60b04431amp0ydphp4fdw"
+ "commit": "6a0a939ad2b07203e7c66a71b3a348ea06780cff",
+ "sha256": "1kjywdafjga5rd2way2vafwb0paz2fb2dkg1i5vlsggwhkl7dn6r"
}
},
{
@@ -28907,11 +28986,11 @@
"repo": "emacs-ess/ESS",
"unstable": {
"version": [
- 20210307,
- 735
+ 20210318,
+ 748
],
- "commit": "a83206ab65ed5f0b1710de69241938f2fc7e3d25",
- "sha256": "045004dmljnxfvalngjp8y0qdmii68gk5jp12r2fg0axd5rwxprk"
+ "commit": "96ba4876753e7ac592a150f7ee1272747dc693d3",
+ "sha256": "0drfgzkdah2gpz7ahacbsqh5i1y4znrjgj4hmlwx4ycpcvvixbrz"
},
"stable": {
"version": [
@@ -29063,8 +29142,8 @@
"f",
"s"
],
- "commit": "d4e5a340b7bcc58c434867b97923094bd0680283",
- "sha256": "1yzki5f2k7gmj4m0871h4h46zalv2x71rbpa6glkfx7bm9kyc193"
+ "commit": "925cafd876e2cc37bc756bb7fcf3f34534b457e2",
+ "sha256": "1hb83cjr711yg4dphbyg9nfkdmd1a6bcsqw964nwdarflw6jss24"
}
},
{
@@ -29075,15 +29154,15 @@
"repo": "ShuguangSun/ess-view-data",
"unstable": {
"version": [
- 20201202,
- 1124
+ 20210315,
+ 1643
],
"deps": [
"csv-mode",
"ess"
],
- "commit": "9aeb18c0adc3e0fed75640a15500944becd5f3ef",
- "sha256": "0mspy45wrc42r7agksyzrlf6ir3wqnyx19hfikm0fh81bn23im2h"
+ "commit": "b642e2e7f4643eadee14c3599f9af399a2f714fe",
+ "sha256": "1dm4w0cj4sc1ybfmvgapwxlnkbywkfqs79gx13381k99ah0wbgji"
},
"stable": {
"version": [
@@ -29490,15 +29569,15 @@
"repo": "emacs-evil/evil",
"unstable": {
"version": [
- 20210305,
- 1341
+ 20210319,
+ 1539
],
"deps": [
"cl-lib",
"goto-chg"
],
- "commit": "f5ab7ff7b5cfbcdc6953589954c9aadc2d81ff6a",
- "sha256": "1na7y6d77rzsvcqqaadzvv3m99dsbj73vrnldabk89i3gngdcsvs"
+ "commit": "325a822bee6b9f8590e6e77fe73b4d916fcec357",
+ "sha256": "0lbzmarhddmsr334d51ia1p64i3wzy3mak586pj3gziv7fcvn06h"
},
"stable": {
"version": [
@@ -29692,15 +29771,15 @@
"repo": "emacs-evil/evil-collection",
"unstable": {
"version": [
- 20210302,
- 124
+ 20210319,
+ 1440
],
"deps": [
"annalist",
"evil"
],
- "commit": "26493597c74a7e574364aa2ca751a1e70ee4e5eb",
- "sha256": "123shmnxrc304ppa1xc4ckxsizw3j88llrvg2kjgafj7b7csmjcv"
+ "commit": "2d3d652cb51eeddc6c63ad9cbf251ecbd2f561d6",
+ "sha256": "15vdi5kynm1gczvdp006zyac96n1q25im9pf2q2n244ph9rzgc4v"
},
"stable": {
"version": [
@@ -31015,8 +31094,8 @@
"deps": [
"evil"
],
- "commit": "f5ab7ff7b5cfbcdc6953589954c9aadc2d81ff6a",
- "sha256": "1na7y6d77rzsvcqqaadzvv3m99dsbj73vrnldabk89i3gngdcsvs"
+ "commit": "325a822bee6b9f8590e6e77fe73b4d916fcec357",
+ "sha256": "0lbzmarhddmsr334d51ia1p64i3wzy3mak586pj3gziv7fcvn06h"
},
"stable": {
"version": [
@@ -31804,11 +31883,11 @@
"repo": "extemporelang/extempore-emacs-mode",
"unstable": {
"version": [
- 20200518,
- 1043
+ 20210316,
+ 205
],
- "commit": "7d0ca861e6b483be1f4a08e63c5ade9cd07b4799",
- "sha256": "0mw041jccyn8s1n3wpas397k2vrp9ryq9lfj16ipk9iqs4la6hlx"
+ "commit": "81d79cb2f611aef10fd7b05f6d47977a66502a08",
+ "sha256": "0bmpmiaz32id2yplfp2vmg3bjbfypg8k0mac8m7v6jclaprw3mal"
}
},
{
@@ -33103,20 +33182,20 @@
"repo": "redguardtoo/find-file-in-project",
"unstable": {
"version": [
- 20210310,
- 426
+ 20210315,
+ 413
],
- "commit": "ee471c23a5a890427b1afa55cd74ad27a42f46f7",
- "sha256": "1zygz8imm0r0370imzksfc6257hcnyi1lri8ngdsspzz6hlrd2z1"
+ "commit": "50607615352df980dfe99d464f5fd0b3d70a4381",
+ "sha256": "120182fjalcamijwxvrfgf72f63k5jy1z9rl4arg80bx2682a0pj"
},
"stable": {
"version": [
6,
0,
- 2
+ 3
],
- "commit": "ee471c23a5a890427b1afa55cd74ad27a42f46f7",
- "sha256": "1zygz8imm0r0370imzksfc6257hcnyi1lri8ngdsspzz6hlrd2z1"
+ "commit": "6a6328c59a96b09e771cbcc5f4188f20d0757aca",
+ "sha256": "17l5b9nibhfymyndppq0avbdr2rh20527fyr1q5i1c3xkn4d6wvp"
}
},
{
@@ -33500,14 +33579,14 @@
"repo": "mrkkrp/fix-word",
"unstable": {
"version": [
- 20190713,
- 1338
+ 20210319,
+ 1414
],
"deps": [
"cl-lib"
],
- "commit": "46487e5279a3079730e2d7146ace7c8ad42371ac",
- "sha256": "0ij0bjrb446h07lyhflfk06sk802jylgdl11ib00r89zai8sq8r7"
+ "commit": "80cf4529915c34d2d39b4d3410781a19ef264e9f",
+ "sha256": "193bwcsj42w07aj8k32zl895yp0kw4rgrphn10dd81jv5411r6ij"
},
"stable": {
"version": [
@@ -34099,8 +34178,8 @@
"repo": "flycheck/flycheck",
"unstable": {
"version": [
- 20201228,
- 2104
+ 20210314,
+ 2015
],
"deps": [
"dash",
@@ -34108,8 +34187,8 @@
"pkg-info",
"seq"
],
- "commit": "01396a5eff9fa494285e0d3139838231c05e3948",
- "sha256": "0s740sbchr84yddcg0zbs4v4s52smy178f8fq5y07i3vsdnfly8m"
+ "commit": "6e6ac0c50f85170ed47bf1711bc761941b69b325",
+ "sha256": "1rp53zpd8mi16r7n66hxy3jv966rr3yw9v3d8dsq9lnnyly9llny"
},
"stable": {
"version": [
@@ -34270,6 +34349,36 @@
"sha256": "1wm5saf29gw0gp0qq5glf9qq3iras99npc2rip7bsnn0czr2mscy"
}
},
+ {
+ "ename": "flycheck-cfn",
+ "commit": "3ac23c6e0cceb3dd52519a9946dcd500936d8e97",
+ "sha256": "16ls9xbg7s8c4li51zvv9frlinrwflp6blgxw5psnvvdrm6gavi5",
+ "fetcher": "gitlab",
+ "repo": "worr/cfn-mode",
+ "unstable": {
+ "version": [
+ 20201120,
+ 2307
+ ],
+ "deps": [
+ "flycheck"
+ ],
+ "commit": "a4ca40978e680f9edc86c141e696e0ae57c63533",
+ "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "deps": [
+ "flycheck"
+ ],
+ "commit": "b4ffad5cabea7e858c66dc824d545653b1cdcb70",
+ "sha256": "1la7qhczg9bgs1klinwj21mjywsg1nm3sxd5cyc09bxjzbflzzz6"
+ }
+ },
{
"ename": "flycheck-checkbashisms",
"commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228",
@@ -35781,24 +35890,6 @@
"sha256": "072jc0vrjg531ydk5bjrjpmbvdk81yw75jqjnvb7alkib6jn5f9r"
}
},
- {
- "ename": "flycheck-perl6",
- "commit": "2f6ecdb2ce6bc74a27dca01ab4942778e986ac8f",
- "sha256": "0czc0fqx7g543afzkbjyz4bhxfl4s3v5swn9xrkayv8cgk8acvp4",
- "fetcher": "github",
- "repo": "hinrik/flycheck-perl6",
- "unstable": {
- "version": [
- 20180509,
- 2201
- ],
- "deps": [
- "flycheck"
- ],
- "commit": "b804702305d7a6e26f762ff98cfdeec2e9dd4cb7",
- "sha256": "0gys38rlx9lx35bia6nj7kfhz1v5xfrirgf8adwk7b2hfjazrsib"
- }
- },
{
"ename": "flycheck-pest",
"commit": "f0c1b89d79456ecaa22b95f3c292799f5d1aa133",
@@ -36003,15 +36094,15 @@
"repo": "alexmurray/flycheck-posframe",
"unstable": {
"version": [
- 20210217,
- 327
+ 20210316,
+ 618
],
"deps": [
"flycheck",
"posframe"
],
- "commit": "24fd9b3d81eab8dd850c504ae46a5c5f11a46ee0",
- "sha256": "0dv9bkagzk61r32i9231zpndizv6avpg8n84nrnh8yyl0w4hzldv"
+ "commit": "8f60c9bf124ab9597d681504a73fdf116a0bde12",
+ "sha256": "0qh9hzvs95jvfrspglzkwhfq6a5pinab94bbh5vzkg8jc2fq6drf"
}
},
{
@@ -36162,6 +36253,24 @@
"sha256": "0f58127197q6yfylz53nigyn7v91pcsdd91ywfgq5lrl0f5fvmdy"
}
},
+ {
+ "ename": "flycheck-raku",
+ "commit": "a285426ee792eab3138ceb012f3825d91a7c85b1",
+ "sha256": "13il1cl60rv18xnp381z57l4nv4jc4isavjsqbrrqpyjpi81c3g8",
+ "fetcher": "github",
+ "repo": "Raku/flycheck-raku",
+ "unstable": {
+ "version": [
+ 20210316,
+ 820
+ ],
+ "deps": [
+ "flycheck"
+ ],
+ "commit": "4163c0dcc1447bc98bb20b835eb23cb68a638ba9",
+ "sha256": "0z19zz5dq0pjkzrjg2fbrh9szlgd0lq2j9wmkf4pzkrcb519kchn"
+ }
+ },
{
"ename": "flycheck-relint",
"commit": "e20128460e942a78a88bd9e6389a8fcbb14343ad",
@@ -37615,11 +37724,11 @@
"repo": "federicotdn/flymake-shellcheck",
"unstable": {
"version": [
- 20210307,
- 1609
+ 20210314,
+ 2048
],
- "commit": "68c7da5b53be4a3cc4d4c85d9367ed2a47448aec",
- "sha256": "00062bk5q5n5z733v18nk2b242azhqsvcy4jprpcmllpd9pmx7mv"
+ "commit": "ac534e9ef15c82ac86ae65fe5004d29dbc8c92c7",
+ "sha256": "04yfb4sy41spjzk9mhm4gy0h8vnjx09p2g6nm1yzgd9a5ph9sqgl"
}
},
{
@@ -38254,8 +38363,8 @@
20191004,
1850
],
- "commit": "e086c59a14701cd041641b51c952fa704ee963df",
- "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p"
+ "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f",
+ "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q"
}
},
{
@@ -38332,8 +38441,8 @@
"repo": "magit/forge",
"unstable": {
"version": [
- 20210303,
- 2046
+ 20210314,
+ 2238
],
"deps": [
"closql",
@@ -38345,8 +38454,8 @@
"markdown-mode",
"transient"
],
- "commit": "8382fd3d43855de779c46da338dd59b1cb1d333e",
- "sha256": "1ah4f5sy2ja33ibk37yqps7vmgdvkp36vahs2njqg0rg6zx057r3"
+ "commit": "f4c95dd0e633b3dd332d6f91122c864ab3640912",
+ "sha256": "02jhimj1ykz0mfg63iwaaxg1i9fdijczcd1g5fz02zwj1v2dgqgh"
},
"stable": {
"version": [
@@ -38401,15 +38510,15 @@
"repo": "lassik/emacs-format-all-the-code",
"unstable": {
"version": [
- 20210305,
- 809
+ 20210315,
+ 640
],
"deps": [
"inheritenv",
"language-id"
],
- "commit": "50e9def18f5cfa6bc7d30567dc05e4539ef3af8c",
- "sha256": "0vi9r4sm8isi33dc2vnjq61vy1pxi1bqd5mxy2vfpg5sff3awgmg"
+ "commit": "94239d35944830ce009d01ac3369e0d61f9723c2",
+ "sha256": "1q27yr916vhk0ah1406vs540f8hpp8bca1f118xwhyj1fw3yrbaw"
},
"stable": {
"version": [
@@ -39170,8 +39279,8 @@
"deps": [
"cl-lib"
],
- "commit": "0ca6901328dbc4279d70dedf7201ceebdaab037c",
- "sha256": "063wyg4mpq6g5h462l6zs7r2g2zavlxm4hv2lh7lr1asrmcf6rxm"
+ "commit": "8f5f6939044b68a97d231b6902ab5ac86744db2a",
+ "sha256": "15fnn413rmaav9zi8p5yqvim0wblsljfp6xhgsa68zji5y99lxva"
},
"stable": {
"version": [
@@ -39366,11 +39475,11 @@
"repo": "auto-complete/fuzzy-el",
"unstable": {
"version": [
- 20210301,
- 1541
+ 20210317,
+ 140
],
- "commit": "122939ee0a82efa1bcf405de3134debe34e4a0b6",
- "sha256": "07kpixgqc6vky91bi7j4r0q78ccc3azydwmkaz4z7lr3ncbc6ymj"
+ "commit": "edce468a3077d03ca63e1559f7ffebfa09c8effd",
+ "sha256": "126wbccdilqi7yf1w7z9gjr6zr4lmrrii6bz65jg5ffnpx8kj30d"
},
"stable": {
"version": [
@@ -40916,11 +41025,11 @@
"repo": "sshaw/git-link",
"unstable": {
"version": [
- 20210121,
- 235
+ 20210318,
+ 313
],
- "commit": "d6eef8051003a9a0966e4524232648d110199c74",
- "sha256": "1jc4acvlhgjdfh0ckalnv4hiv7nx8l1i6wh02zv2p9gxjxaqrj7x"
+ "commit": "2b510cf3f28bed842853294fc4ee23c7f8b6435a",
+ "sha256": "0c5p5llxlgi09lymjnh0jpp36v5vfmi6rjb77123gcnsqi0031wn"
},
"stable": {
"version": [
@@ -41366,8 +41475,8 @@
"repo": "charignon/github-review",
"unstable": {
"version": [
- 20201012,
- 40
+ 20210314,
+ 2203
],
"deps": [
"a",
@@ -41376,8 +41485,8 @@
"ghub",
"s"
],
- "commit": "d0c8234cf523818513f892f30153210606abb6be",
- "sha256": "1d0g79mp14ngx5x0f8sc4lri40m3gh0ql6gzyqrl4c94lhq59cn7"
+ "commit": "341b7a1352e4ee1f1119756360ac0714abbaf460",
+ "sha256": "15lqiknl7ilskpy1s9qdfi0qjvrkvmj8nw110cf8ifwvvyxyqbhb"
}
},
{
@@ -43414,11 +43523,11 @@
"url": "https://depp.brause.cc/gotham-theme.git",
"unstable": {
"version": [
- 20200506,
- 1250
+ 20210318,
+ 2207
],
- "commit": "a549cd031859e24fd37a779323e1542aefe86d43",
- "sha256": "0smjajazr86r8f1szw1xdrinfbn455xhl6bbhyhhmrk6sw0pnc6n"
+ "commit": "51876a72dbe5a16aeadde2e885da6bbf75909bd1",
+ "sha256": "042cpdl7srfj1ha3z27xj03bzp3vrz6ql4x0zzvjxsyj08z1q80y"
},
"stable": {
"version": [
@@ -43558,14 +43667,14 @@
"magit-popup",
"s"
],
- "commit": "dc29aa29c61c0013bd00091654cc8ce48e888264",
- "sha256": "1irrli6cx7c1hz53ipwhi87876m789anqpjkfhyii0vk9crq24r8"
+ "commit": "f49dcf5ec6e16562de30674b36b18e6bdcd47411",
+ "sha256": "1slw2pawlcx9zfvsazsir2kj32g30b80c7a0yiqyrd7cv1hjnr8g"
},
"stable": {
"version": [
0,
24,
- 0
+ 1
],
"deps": [
"dash",
@@ -43573,8 +43682,8 @@
"magit-popup",
"s"
],
- "commit": "1ec59a7c0002598c594fb58e03907d7ff0ca84b4",
- "sha256": "0bz01ybpj1lk7g34n6wwy53aaa4jvs3xhsv50y34z5wvxa8ypdsj"
+ "commit": "f49dcf5ec6e16562de30674b36b18e6bdcd47411",
+ "sha256": "1slw2pawlcx9zfvsazsir2kj32g30b80c7a0yiqyrd7cv1hjnr8g"
}
},
{
@@ -45577,16 +45686,16 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20210223,
- 2045
+ 20210318,
+ 1838
],
"deps": [
"async",
"helm-core",
"popup"
],
- "commit": "dbdec633c2816981d7127fe00bcd9778b2c31c51",
- "sha256": "19rppfsiv1642xlz17m877dx6sbzg37nspg6r7nh9b783r4sij6p"
+ "commit": "2ca62b0384727338c2a7dd90a591fcac26d86a03",
+ "sha256": "0k81bp0b8pdmj16hmip849207s8x8g4hy2mg9821fviafss0sk9j"
},
"stable": {
"version": [
@@ -46485,14 +46594,14 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20210211,
- 1417
+ 20210319,
+ 1649
],
"deps": [
"async"
],
- "commit": "dbdec633c2816981d7127fe00bcd9778b2c31c51",
- "sha256": "19rppfsiv1642xlz17m877dx6sbzg37nspg6r7nh9b783r4sij6p"
+ "commit": "2ca62b0384727338c2a7dd90a591fcac26d86a03",
+ "sha256": "0k81bp0b8pdmj16hmip849207s8x8g4hy2mg9821fviafss0sk9j"
},
"stable": {
"version": [
@@ -47784,16 +47893,16 @@
"repo": "yyoncho/helm-icons",
"unstable": {
"version": [
- 20210219,
- 1752
+ 20210315,
+ 1339
],
"deps": [
"dash",
"f",
"treemacs"
],
- "commit": "5a668ef21ba02bf1fce2db18950858c769bf5d05",
- "sha256": "0n759vnymjgpf24kn7704vj8l1phsnjrgllqhcv1c50fsni1fajl"
+ "commit": "7e8d1e213a164aa63b868e610ef8a4fd1ff58769",
+ "sha256": "0g5n9f8vfv3zbylxh6w2xrym4fzd4jqx5n4g6gjp8sscaw5zaxkd"
}
},
{
@@ -48096,14 +48205,14 @@
"repo": "emacs-helm/helm-ls-git",
"unstable": {
"version": [
- 20200519,
- 912
+ 20210317,
+ 1205
],
"deps": [
"helm"
],
- "commit": "4da1a53f2f0a078ee2e896a914a1b19c0bf1d5ed",
- "sha256": "12fi08w20yjsdfkxl1pk9q4w0z9l92va5fa5ghay9w33xlymc8dc"
+ "commit": "58dbeafb184cf6a10a1ae3078b37310dd82ad2ed",
+ "sha256": "1hlqvpb34pq4bmyplm58wsnwfrflp5bf7kzjl8nrsj9fcqr29nbv"
},
"stable": {
"version": [
@@ -50057,16 +50166,16 @@
"repo": "emacs-helm/helm-w3m",
"unstable": {
"version": [
- 20181029,
- 726
+ 20210315,
+ 723
],
"deps": [
"cl-lib",
"helm",
"w3m"
],
- "commit": "c15d926631198d6d759ec8881837bcca5a64963b",
- "sha256": "0qaqcwhwmckfmg3axiad35azn0l74k1niw4ix0v1bn2vqrxanqcw"
+ "commit": "0a25a2b1df9bc660a90d633beb301b3815556e4e",
+ "sha256": "0cdfk1r2rcc5hflwjpmsijss6xf5lwzn7x68jq4b4xdlckkqf9d7"
},
"stable": {
"version": [
@@ -50256,8 +50365,8 @@
"repo": "Wilfred/helpful",
"unstable": {
"version": [
- 20210307,
- 206
+ 20210319,
+ 802
],
"deps": [
"dash",
@@ -50265,8 +50374,8 @@
"f",
"s"
],
- "commit": "88e53d3267e8168e056e96989e9cc8fb50d33c50",
- "sha256": "1gcymjysbba56q7gkn6a9vpvv45az38c4cwsvxlsnb1sa16rbz88"
+ "commit": "7e4b1f0d5572a4e2b8ee7a9b084ef863d0315a73",
+ "sha256": "0qrz3klqs94aj6bxh49qymf9fvpa73xpp6djkxwpypgb2wv8hk6n"
},
"stable": {
"version": [
@@ -50424,11 +50533,11 @@
"repo": "omajid/hgignore-mode",
"unstable": {
"version": [
- 20160501,
- 7
+ 20210314,
+ 431
],
- "commit": "7aa9f3b8a9c610dbd80b952061b40194e1d9c5bd",
- "sha256": "0l22sqi9lmy25idh231p0hgq22b3dxwb9wq60yxk8dck9zlkv7rr"
+ "commit": "2c5aa4c238848f5b4f2955afcfb5f21ea513653b",
+ "sha256": "0jn9rzhrmmv4lf7rdapdjclk6623d1mir2lq3c46428skhzjlph7"
}
},
{
@@ -50826,10 +50935,10 @@
},
{
"ename": "highlight-parentheses",
- "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44",
- "sha256": "1d38wxk5bwblddr74crzwjwpgyr8zgcl5h5ilywg35jpv7n66lp5",
- "fetcher": "github",
- "repo": "tsdh/highlight-parentheses.el",
+ "commit": "40bb1119bea79bb9e91378c99e2aa60936de013a",
+ "sha256": "0ly9d01ja517psf1sqg12wyljykixi5c6qbhahyjy7n331kkpkmr",
+ "fetcher": "git",
+ "url": "https://git.sr.ht/~tsdh/highlight-parentheses.el",
"unstable": {
"version": [
20210104,
@@ -50838,8 +50947,8 @@
"deps": [
"cl-lib"
],
- "commit": "013ac29970d5209c14da0af6c5bb9bbbcca40c02",
- "sha256": "01p8j248vcmbcdskr3146ag979c0m74gddy3yzp3x8hz9a4mgqx0"
+ "commit": "723abf9b6092d7e19548316de1f907ed0d67c780",
+ "sha256": "1kkxxq5cw090vw3cddzdq51f208vxw326hsqb1zi8f6z3vsm2h7s"
},
"stable": {
"version": [
@@ -51374,16 +51483,16 @@
"repo": "thanhvg/emacs-hnreader",
"unstable": {
"version": [
- 20200726,
- 654
+ 20210319,
+ 527
],
"deps": [
"org",
"promise",
"request"
],
- "commit": "7ff808d4728ce4e269b6d99a73604063dd9b374a",
- "sha256": "0kxx8pvl99qdbldsn6lvxj69j1jpmmc33wxcr2aw3h423ibcna3s"
+ "commit": "ae52af1424ccde2b20e88ff8c589eb772162a560",
+ "sha256": "12h1lvm6bwdln7jnl1adl1vqgi603yvsvb4dbg9yvy1np8b6mj7r"
}
},
{
@@ -53486,11 +53595,11 @@
"repo": "QiangF/imbot",
"unstable": {
"version": [
- 20210307,
- 731
+ 20210319,
+ 126
],
- "commit": "0588a5dbb4926e09cd19415eaafb6f79168183d8",
- "sha256": "0bbr5rjxbk1dci31b1y92i9cxy5x90y3awm4678zvmaa3xa7jzxl"
+ "commit": "0fdc71bfa66ecc1f8a54cdcd2458eb47eab41ecd",
+ "sha256": "1ibd9i75x6gb0nprbdi0giklllfwsmvghi3fm19qm7hiw3kg9j3m"
}
},
{
@@ -53555,14 +53664,14 @@
"repo": "bmag/imenu-list",
"unstable": {
"version": [
- 20210305,
- 2206
+ 20210316,
+ 2102
],
"deps": [
"cl-lib"
],
- "commit": "6cded436010a39592175238e4d02263a7cdb44c4",
- "sha256": "09x1n2bgwgximcmnrfn32d5hr6wa0iz8acaj78a93azzx065xxgk"
+ "commit": "b50222378412fbe321622a84cb2b036e084c697a",
+ "sha256": "1936dd41fa05ndzf2bwhllvjz97iz0rflkazjipr7dvz5q072wj2"
},
"stable": {
"version": [
@@ -54055,14 +54164,14 @@
"repo": "clojure-emacs/inf-clojure",
"unstable": {
"version": [
- 20210307,
- 740
+ 20210317,
+ 1221
],
"deps": [
"clojure-mode"
],
- "commit": "f4a279ef5b007c3d43b79e22fecca6a331c5f3f0",
- "sha256": "0aq65zbqrxdcx797wcr537bsp9pvbr9ndwyfbaf4lhl3w03s31x6"
+ "commit": "3e712d9f489313c4097ccc891abedcfb6e1788d3",
+ "sha256": "1bdz8zsv6vixgvq88vc8mlq729rn105wr2mzjl6a2w9b8zkjzs08"
},
"stable": {
"version": [
@@ -54115,11 +54224,11 @@
"repo": "J3RN/inf-elixir",
"unstable": {
"version": [
- 20210226,
- 1653
+ 20210315,
+ 1723
],
- "commit": "9c21ae6d7a1313c856fd508880ee121fbea99f4d",
- "sha256": "0w6fj1sh1pdsrk5sis2zkbdz0ixbpndaizvlqv2riw3sgpnc41f3"
+ "commit": "b526ce852886d1863163e054fcbbcbb83c55b32a",
+ "sha256": "1kmv2j1g299wb8dqq43zk61jigkfl9rnqxbfnclzsqfdlnhvw6ii"
},
"stable": {
"version": [
@@ -54154,11 +54263,11 @@
"repo": "nonsequitur/inf-ruby",
"unstable": {
"version": [
- 20201228,
- 1237
+ 20210314,
+ 123
],
- "commit": "1fc972ecda6a2155806d75d202481327703a0681",
- "sha256": "0kv98g30kgfpyd0ghiclk17ac2y17j7bi77km59gdw5i1b5k1a27"
+ "commit": "c6990a60c740b2d69495e34e95b29f13014b3cde",
+ "sha256": "05nz7hvly47n7d945gdb1x8xgzla5r9k629if81rgjh99w24dpgc"
},
"stable": {
"version": [
@@ -55359,8 +55468,8 @@
20210311,
1638
],
- "commit": "8866138333f92c3d82062c5fa613beba38901504",
- "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8"
+ "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
+ "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
},
"stable": {
"version": [
@@ -55387,8 +55496,8 @@
"avy",
"ivy"
],
- "commit": "8866138333f92c3d82062c5fa613beba38901504",
- "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8"
+ "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
+ "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
},
"stable": {
"version": [
@@ -55755,8 +55864,8 @@
"hydra",
"ivy"
],
- "commit": "8866138333f92c3d82062c5fa613beba38901504",
- "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8"
+ "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
+ "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
},
"stable": {
"version": [
@@ -58522,8 +58631,8 @@
"parseedn",
"s"
],
- "commit": "1376d50f1fc91f9345351aeb4960b54bf83be59e",
- "sha256": "06zp5kshcsxf91d4as0nw1ncxx1a8ii6npzvk485sjrghnldsccm"
+ "commit": "755b0dfb3bd676c769c4b4aeb81c2cd5828bd207",
+ "sha256": "1snrzah6pcxd9vm6crxz85c5nl6zfhfbc0581z765g2vg87qcb12"
},
"stable": {
"version": [
@@ -58548,15 +58657,15 @@
"repo": "ogdenwebb/emacs-kaolin-themes",
"unstable": {
"version": [
- 20210301,
- 1533
+ 20210315,
+ 1754
],
"deps": [
"autothemer",
"cl-lib"
],
- "commit": "1f8204a40ab24cb54f22bc89345d7f603084688a",
- "sha256": "1qfm5wc0rkyxnnm3dzba0q4hxc5s3s0agvsjqwwg1q90zw6q70j2"
+ "commit": "80d0a5824fedb332432d5999af9842316b7dc3f2",
+ "sha256": "0309vmrbw7a4r0gnsdd5jyfql2fl3lbh3gsnagynvq7rzv9ryr1c"
},
"stable": {
"version": [
@@ -59330,11 +59439,11 @@
"repo": "kivy/kivy",
"unstable": {
"version": [
- 20180702,
- 2029
+ 20210318,
+ 2106
],
- "commit": "6b8495e48328af5088a899372d93b6daabc75a02",
- "sha256": "1wp0rqwakdx532lg2gacrarkg86w3d4pp4l2b43ik0343pr6bg00"
+ "commit": "3421cedfd83acb9fd0dd15600811662136faa1c6",
+ "sha256": "103d32iamgharcjnqagm5w63ssj6365mqcxjdrvzarhgsq2gqx6b"
},
"stable": {
"version": [
@@ -59985,8 +60094,8 @@
"highlight",
"math-symbol-lists"
],
- "commit": "08755211c073f4216c34f8dd7864ce3b874415b4",
- "sha256": "0k8gcap4bvqx04wl0ica3bkfxz8j4a42w9lgwacnchffs3l4gbpx"
+ "commit": "3f2d0e95362c3ea9ed78f32fcb3d310c2366df12",
+ "sha256": "1898ixkcgmcwzfxl4cpjdc9kim5s2a5n2s7hi6xqzccqx2mf4brd"
}
},
{
@@ -60474,11 +60583,11 @@
"repo": "conao3/leaf.el",
"unstable": {
"version": [
- 20210303,
- 1613
+ 20210316,
+ 1822
],
- "commit": "b1fe4f20efa713b8beca97a27643456061c0fb3f",
- "sha256": "16mzwr91k6bg8nfh2f2y9hzr6vlnx56afqh4795apzylqvwm8zd4"
+ "commit": "ab5cc26b56a6a53a3338ebfde17b746522c2c14c",
+ "sha256": "1ds545sh8hg2vg5l7fm4v6z31lzax14ivdni3a37278jfx82xxrx"
},
"stable": {
"version": [
@@ -60734,11 +60843,11 @@
"repo": "ledger/ledger-mode",
"unstable": {
"version": [
- 20210221,
- 1315
+ 20210318,
+ 26
],
- "commit": "3495d1224ee73aa96c1d5bd131dc3a7f23d46336",
- "sha256": "137z70baylzv6bm6y2wyl1p3f47hzkvjzqcmwmwjmlkpc0p5j4ac"
+ "commit": "3c53ecc4fd27736560db7a64587e516b26521d61",
+ "sha256": "176h5n3azjqyp63map0224m01jrqzmjy4g9cdh00mna5p2n1lbwr"
},
"stable": {
"version": [
@@ -61025,15 +61134,15 @@
"repo": "tecosaur/lexic",
"unstable": {
"version": [
- 20210203,
- 358
+ 20210318,
+ 1315
],
"deps": [
"dash",
"visual-fill-column"
],
- "commit": "e59224cd5808af50e8b9ba8cce0a687cf09aacc1",
- "sha256": "1si5ndfs8xbk96iiwcwlhi57k914jnsq3zdgvlb7xm3y8zjy2l6x"
+ "commit": "4ded6be2ce3e8dadc5635a534827181a8c8ab602",
+ "sha256": "116qjizqa83zy6xas5cah58sf22ha05pps2004wfgng487ln9n59"
}
},
{
@@ -61047,8 +61156,8 @@
20201007,
2214
],
- "commit": "7be14cb23a72b2c445519281e4e2fb9b607f9a8b",
- "sha256": "0scq5bmsw7smgn7pkfnw98zcn6by1iqn6qds24zrxl7fmgcvwjk7"
+ "commit": "339021e29a50c71045736f322e961efbfc37bd99",
+ "sha256": "0416fcd1jnvhfj1bm3x60yi8n9cbxyyz11ri5k1g7b454pw54yb5"
},
"stable": {
"version": [
@@ -61294,17 +61403,17 @@
20210303,
1751
],
- "commit": "4eb0953dc58193a945cfe77e532b2c4fc36cc78d",
- "sha256": "0lklnwdbi8rnvia3a0xjyrgdlsm515j9v3y899hz7f05n6fplp7f"
+ "commit": "46827603dc28320c359ca30364778f24f66ea6f4",
+ "sha256": "1jf6cfp26n7k2hr30sh16x7ijd1pig0g4krzmv5dpgw0m5v1ba6f"
},
"stable": {
"version": [
0,
- 11,
+ 12,
0
],
- "commit": "a9a0badd79d0d3d7077feaf8bb646154783d5b36",
- "sha256": "0h5kzavv7r8w4kzqas8nnpyssal1rh8ax8jh4av5pjp67hcjnq94"
+ "commit": "70d42b3922d152e8be946c2415151d0551b591d4",
+ "sha256": "17k0v1nfcsq5kdfk05cdkh8nbbi5bqniydqcr6whzw3aawnjryyc"
}
},
{
@@ -61981,11 +62090,11 @@
"repo": "jingtaozf/literate-elisp",
"unstable": {
"version": [
- 20210130,
- 107
+ 20210318,
+ 350
],
- "commit": "de73de9e8060574cb0c85be4ec3b5d8ff8a92b7b",
- "sha256": "19kyrvpkmbgiygcxr3hyrba9smz33y0adz5fwh1kb5qhcyrq8jw7"
+ "commit": "6979fc6369d55519d52ca1e8f7d80d73ce54c383",
+ "sha256": "180lsghxcjrn21c79jl7g9kkvd4lf4xabgbwbqlck7barfj256jv"
},
"stable": {
"version": [
@@ -62710,8 +62819,8 @@
"repo": "emacs-lsp/lsp-dart",
"unstable": {
"version": [
- 20210307,
- 1805
+ 20210313,
+ 1940
],
"deps": [
"dap-mode",
@@ -62722,14 +62831,14 @@
"lsp-treemacs",
"pkg-info"
],
- "commit": "31847020aa512019f542b566ed42a938a6325b32",
- "sha256": "1pvw5if54mja9z4xxja7024izb67yvfmj0f36jad1lipz0ydy7mg"
+ "commit": "f3b70ec0e6adf3a51e15f9a3effb182c2363493d",
+ "sha256": "0iyp844wnvxjrp860dgkr10qrfsaj2rcssj8dv93hhv8pg91fhsk"
},
"stable": {
"version": [
1,
- 17,
- 14
+ 18,
+ 0
],
"deps": [
"dap-mode",
@@ -62740,8 +62849,8 @@
"lsp-treemacs",
"pkg-info"
],
- "commit": "31847020aa512019f542b566ed42a938a6325b32",
- "sha256": "1pvw5if54mja9z4xxja7024izb67yvfmj0f36jad1lipz0ydy7mg"
+ "commit": "f3b70ec0e6adf3a51e15f9a3effb182c2363493d",
+ "sha256": "0iyp844wnvxjrp860dgkr10qrfsaj2rcssj8dv93hhv8pg91fhsk"
}
},
{
@@ -62803,28 +62912,36 @@
"repo": "emacs-grammarly/lsp-grammarly",
"unstable": {
"version": [
- 20210309,
- 650
+ 20210317,
+ 538
],
"deps": [
+ "grammarly",
"ht",
- "lsp-mode"
+ "keytar",
+ "lsp-mode",
+ "request",
+ "s"
],
- "commit": "c89b8c44cb0738b04432120d9faf062aebed6fde",
- "sha256": "1jms97aa10w2p9gz3d26q62725dp0n38kg9ydk18ffvj97vd8x50"
+ "commit": "f5675c58ba80258331dda99072c5bfac524dbf48",
+ "sha256": "0ziv51c9fq4yv8ll7087cd2bwqkl309b1a0gds67d160pj9swwhh"
},
"stable": {
"version": [
0,
- 1,
- 2
+ 2,
+ 1
],
"deps": [
+ "grammarly",
"ht",
- "lsp-mode"
+ "keytar",
+ "lsp-mode",
+ "request",
+ "s"
],
- "commit": "c89b8c44cb0738b04432120d9faf062aebed6fde",
- "sha256": "1jms97aa10w2p9gz3d26q62725dp0n38kg9ydk18ffvj97vd8x50"
+ "commit": "739a7efc7de6e2b0eca9e72268790431a0fb3185",
+ "sha256": "1ksa685ggp9z0zndscwy9azxjibxd9l79qzvh50i7mz4x9xzdjbd"
}
},
{
@@ -63102,8 +63219,8 @@
"repo": "emacs-lsp/lsp-mode",
"unstable": {
"version": [
- 20210312,
- 1745
+ 20210319,
+ 1818
],
"deps": [
"dash",
@@ -63113,8 +63230,8 @@
"markdown-mode",
"spinner"
],
- "commit": "63fac21fa222403972cf16734bd4f2d8b0297b7c",
- "sha256": "0zggkz864p9pz9hjg9f3bfia6wcplyviq5p7qbn97w5x0vp63f6q"
+ "commit": "726ba9b174be01ca84b850428c41b6f3b3dfc9c9",
+ "sha256": "15wmb3bapmkvg21dqhv6v3xjx1iaxbzbjxf0las6a87dyb8qz1gn"
},
"stable": {
"version": [
@@ -63364,14 +63481,14 @@
"repo": "merrickluo/lsp-tailwindcss",
"unstable": {
"version": [
- 20210208,
- 1458
+ 20210315,
+ 624
],
"deps": [
"lsp-mode"
],
- "commit": "0558fd1cdbc31c48ca02308bee1b65c77f3fce3a",
- "sha256": "0lbpwcf6vnk99rk3mzq3mbh4nxgl6prjrrak2aq9c789n7qainfr"
+ "commit": "d11cdc25be8e20400a1f9005f716648dd2ce4a3f",
+ "sha256": "1gls3c2ai2axnsl2dh4vy8l6hr1fyzv4hxi6yss5fw0xs8rqq7c5"
}
},
{
@@ -63420,16 +63537,16 @@
"repo": "emacs-lsp/lsp-ui",
"unstable": {
"version": [
- 20210220,
- 703
+ 20210317,
+ 1358
],
"deps": [
"dash",
"lsp-mode",
"markdown-mode"
],
- "commit": "0ac3e12138a7eeaf764845d1e7e61b02769003ec",
- "sha256": "1xqdmbfvn3i7lpk287jslgc9j6zlfxxw6hamqhb25y22bkqjgxsp"
+ "commit": "784e6d4bb72c6ad1338f3c62d88e2e95056f236f",
+ "sha256": "04xv0v8l6x57d66rlk4ibs9m59hvliv35ikmiz1dygpdn3ili9zh"
},
"stable": {
"version": [
@@ -65193,19 +65310,19 @@
"repo": "minad/marginalia",
"unstable": {
"version": [
- 20210310,
- 1539
+ 20210317,
+ 1054
],
- "commit": "e54aa0c4974905cc4da114c3bbcfb084486aa6e1",
- "sha256": "1z6qcjbzm6r859fxspsm45cjfirrc68jwn729dvk1zz1h61l3xlv"
+ "commit": "e741b243b30f6cfe85e568cc551acff9a1e5e74f",
+ "sha256": "0piwzxp1zmwp876kyca0xcgyxgn8bn4wh5fnn88dkvdzi8mcgmkh"
},
"stable": {
"version": [
0,
- 3
+ 4
],
- "commit": "62ed158ff588900b9d3e56f3f05f659763c8c2ba",
- "sha256": "1qihw1vq9sysrl6ha23ggycp0n2n1dx1ajkaqfm5vmv8480al07i"
+ "commit": "e741b243b30f6cfe85e568cc551acff9a1e5e74f",
+ "sha256": "0piwzxp1zmwp876kyca0xcgyxgn8bn4wh5fnn88dkvdzi8mcgmkh"
}
},
{
@@ -66263,16 +66380,16 @@
"repo": "DogLooksGood/meow",
"unstable": {
"version": [
- 20210312,
- 135
+ 20210319,
+ 1657
],
"deps": [
"cl-lib",
"dash",
"s"
],
- "commit": "3eaefd6653d6cb1d1fa593a01f7c01354012bf5b",
- "sha256": "1k2z72fn0i5knwifp8v8gm8m6fhwrk173l3r3jg0kd6mcxian3l7"
+ "commit": "a3dbefc07f897fb09124d8568272a31791657898",
+ "sha256": "15969wbd9wqryi2q1f3n21c732m0my5rp9lc3v4xa4w288s1m21a"
}
},
{
@@ -66286,8 +66403,8 @@
20210129,
1443
],
- "commit": "6ede379616fbbe295a2368cc9813e5e24290ea02",
- "sha256": "1nfmw48jhf9hgrgrf189x88qcyff72vaimpzaw971k65lbjj3kcy"
+ "commit": "5dae97414e4e4f68a9d71d79362e03416bb6e6ce",
+ "sha256": "09c430k88kwvcni1v68ncvnf5pdpp236ij8k6vf5rnm5khki6vj3"
},
"stable": {
"version": [
@@ -67473,11 +67590,11 @@
"repo": "mrkkrp/modalka",
"unstable": {
"version": [
- 20190713,
- 1335
+ 20210318,
+ 1748
],
- "commit": "4b2b92b14ed0b64fb0a0fa80a374ec9f87fbfeb6",
- "sha256": "18dbnicaqryq4xhv4d7hds61k85kj3bnpcqv7rippvlyrqm2r6wx"
+ "commit": "0accefac11451b9c9196a56223b5fe1e26d75e6e",
+ "sha256": "04i776arnyg2gzzhiifarb73dr4w3sg38kw9cwp1bl1x5w49x47x"
},
"stable": {
"version": [
@@ -67685,11 +67802,11 @@
"repo": "protesilaos/modus-themes",
"unstable": {
"version": [
- 20210312,
- 2029
+ 20210319,
+ 543
],
- "commit": "ccca6b3369dd6c1ce90dac60d5b090c04f2ed885",
- "sha256": "1vmq9477a3inq6qdafkwl21v1jxdh8lsnlbzkbd5cqhbbrflr621"
+ "commit": "121aa48cadd9ab3fd64f5cddc057bdcc94dd7383",
+ "sha256": "1aqsh0qbk0rkcfznbbhhja3whl6xygij89kdqlzc4az0kj43l2jq"
},
"stable": {
"version": [
@@ -68041,11 +68158,11 @@
"repo": "takaxp/moom",
"unstable": {
"version": [
- 20210308,
- 1721
+ 20210318,
+ 1137
],
- "commit": "8e0fbcbe0c190cd98925d9cb5d5cad606c983a1c",
- "sha256": "1wd5hm25d94s9s1wwdxjc1hm77rybbl4s80ialcmg4mr1jyba0vz"
+ "commit": "9d3170f60dd188bac2d0304daf2a94bec9bfbbd3",
+ "sha256": "1fc20zglhv48aiy5vl8y6vlk3nimwgfzajx8pq4n7jga3k7cp0q5"
},
"stable": {
"version": [
@@ -68376,8 +68493,8 @@
20210306,
1053
],
- "commit": "884d9f4b64fe97597643247f1bed1d4fc9ca5bbf",
- "sha256": "116l18wgp1xqdcn4rzscnah8qn6xvnqjbmaf5grvbf2g1gglcipg"
+ "commit": "8ad7b19d89e65ec81c78204986088154d8702309",
+ "sha256": "1m4vnwfr04cr3rbg7cny49spz08c09sgm8zpq99r510xn8xxs7vg"
},
"stable": {
"version": [
@@ -68644,14 +68761,14 @@
"repo": "andrmuel/mqtt-mode",
"unstable": {
"version": [
- 20180605,
- 1731
+ 20180611,
+ 1735
],
"deps": [
"dash"
],
- "commit": "36d1d4296d79e17b8f35e8e14f2708980eb502db",
- "sha256": "1116xvwpavg7icm263s0clgxhw3qqm4aqiw4ky94w9a8ydazx51l"
+ "commit": "613e70e9b9940e635e779994b5c83f86eb62c8e6",
+ "sha256": "1ci1w4yma6axiigz55b2ip0r7zy8v215532jc0rkb3wyn14nsrh7"
},
"stable": {
"version": [
@@ -70000,11 +70117,11 @@
"repo": "CeleritasCelery/emacs-native-shell-complete",
"unstable": {
"version": [
- 20200814,
- 2301
+ 20210315,
+ 2048
],
- "commit": "be7ced29c5a86e29c364f19d248634b8b54d0e52",
- "sha256": "1lyad89byq54fva58njf7wiq2rw3767fxif1ykijirzx7q14ahxd"
+ "commit": "cf142e84eaa4dd91bc75d96a5d26dab5e38eba4c",
+ "sha256": "01li6c271v5j35chg3a8nl9az3bwq4hk1j8lfjq5a27p91iszpc0"
}
},
{
@@ -70662,11 +70779,11 @@
"repo": "m-cat/nimbus-theme",
"unstable": {
"version": [
- 20210115,
- 2034
+ 20210318,
+ 1654
],
- "commit": "ca504e4387641b648e7bc6037fe515b03a90b801",
- "sha256": "0gz2qrkr4gvy5wh44wiy7mhqwlxgfa8fyg0bincnba89161fnymk"
+ "commit": "a4d9d69442c9edac3f2cacabd2a7401dbefe7ff3",
+ "sha256": "1h828cxjacfqlhm719w2kwh91i0r1lai6wswpp7wp21wvvp28v5r"
}
},
{
@@ -71385,8 +71502,8 @@
20210205,
1412
],
- "commit": "97fadd0645e908ff8322577a983dc710bfda33d6",
- "sha256": "0gigvw5awwmy87vm07l73va321lrsilihfa4k33sw542svqvmwjk"
+ "commit": "13efbd0e1c88fcbdb48b4c30c7852c5bf1fbd0b7",
+ "sha256": "0xc06vqyqpkbq6hd00vdcwxk74mraxmbswin3j716iyx5j7hk7wc"
},
"stable": {
"version": [
@@ -72100,8 +72217,8 @@
"deps": [
"axiom-environment"
],
- "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f",
- "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218"
+ "commit": "ac8228a702290732ba12c5d13b38576a57afb0d6",
+ "sha256": "1nrlgrckvh2fiwis9bmr95h2bpxfkz1nknxdz61380f2caqwwhw7"
}
},
{
@@ -73125,8 +73242,8 @@
20201204,
945
],
- "commit": "02ea48f0d09a48fb2a25fdba75a8bf20872dadb5",
- "sha256": "08klrrndkb961979wcp133swl2rckbm5z708zxgzsqf9lamqjc73"
+ "commit": "585b139f3dee1f801edbbf6545891232119c9087",
+ "sha256": "15gfvnkqzixwvq4jq8w6y7v7lyd2j8gca62hap3rsh6c41b8ls1p"
},
"stable": {
"version": [
@@ -73666,8 +73783,8 @@
"popup",
"s"
],
- "commit": "8ec59296b2e2a12d8ea146fb7056091fbb7bdd10",
- "sha256": "02kx5gx1hk5r3lks3y9myq3x90zcz0snhckyf7sx45ydgnjxm5j4"
+ "commit": "5fad6835bee15792774183164dd423ba18cf1e01",
+ "sha256": "1ww202j6bh8ycw2wfngy9rw1hv5qrjg66bgp2yj28j12ag1qxn2r"
},
"stable": {
"version": [
@@ -74191,6 +74308,21 @@
"sha256": "009n23gcgyfylp4q6igj67r606syq2r43s86g12xkl3vmc14929b"
}
},
+ {
+ "ename": "org-appear",
+ "commit": "d4c5bea920593d5da72b4208c0727b5ced0a588a",
+ "sha256": "1b88r4nsvm1ndicwc2rgkznmfcyb6bz7fb05fw667dw6mzmlpxk1",
+ "fetcher": "github",
+ "repo": "awth13/org-appear",
+ "unstable": {
+ "version": [
+ 20210307,
+ 1335
+ ],
+ "commit": "0b3b029d5851c77ee792727b280f062eaf2c22c7",
+ "sha256": "136z40r0i9q9wqbj4yxa8d4c2ygx7dzp9i126ra56sm6cdkvz0cj"
+ }
+ },
{
"ename": "org-attach-screenshot",
"commit": "f545cd8d1da39e7fbd61020e178de30053ba774b",
@@ -75132,8 +75264,8 @@
"repo": "kidd/org-gcal.el",
"unstable": {
"version": [
- 20210304,
- 803
+ 20210313,
+ 420
],
"deps": [
"alert",
@@ -75141,8 +75273,8 @@
"request",
"request-deferred"
],
- "commit": "ff55b2117c074288633c35bc38f21db13b476bbd",
- "sha256": "01wr33ra6h254r123zy677bwf98jzgkb4qpsy90rgf0kjq7wb142"
+ "commit": "d38acdad70883dc3fe34a4cd41024e5a8099ddb2",
+ "sha256": "17lnsn045l99w787mbrq623div40w3c59rgryvx04px085bb2i5g"
},
"stable": {
"version": [
@@ -75504,30 +75636,30 @@
"repo": "gizmomogwai/org-kanban",
"unstable": {
"version": [
- 20200729,
- 2120
+ 20210315,
+ 28
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "70b4c9823b32ae299f3da521966b6c5abacf73e2",
- "sha256": "159g13m1zpc1b2ggs9iw2l51pj0h433y1x00bgznhc9fvamysasd"
+ "commit": "198ffa2066aadcdd9530dcc9b82cb5626c49e257",
+ "sha256": "1lh7hgzbkmhv7hqc0fvgvivkihg96c41ms1v7rcknnp3f1kj195h"
},
"stable": {
"version": [
0,
6,
- 1
+ 3
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "fbb27c3983ad735a333c766815642a6615cea2ed",
- "sha256": "0xclk323hq4lszqmvba4v8785v57bxfxln5n1hy0vaf0f45hfkjw"
+ "commit": "198ffa2066aadcdd9530dcc9b82cb5626c49e257",
+ "sha256": "1lh7hgzbkmhv7hqc0fvgvivkihg96c41ms1v7rcknnp3f1kj195h"
}
},
{
@@ -75557,8 +75689,8 @@
"repo": "yangsheng6810/org-latex-impatient",
"unstable": {
"version": [
- 20201123,
- 845
+ 20210312,
+ 2250
],
"deps": [
"dash",
@@ -75566,8 +75698,8 @@
"posframe",
"s"
],
- "commit": "d8be05fd6857c72a1766e3fa9dafa1602ccf88e3",
- "sha256": "0vidxcv07brz4adik1826g0v7zyyz80r84kzz01rcxcc471fl957"
+ "commit": "a27ec1491c7d897904e84d9b9db380e1a4c7914a",
+ "sha256": "0r0yn0z4d5y5mzc8awg8wcb3lvb058c7gk7v5mghnwln50zvqqia"
}
},
{
@@ -76640,8 +76772,8 @@
"repo": "jkitchin/org-ref",
"unstable": {
"version": [
- 20210310,
- 1855
+ 20210315,
+ 1730
],
"deps": [
"bibtex-completion",
@@ -76656,8 +76788,8 @@
"pdf-tools",
"s"
],
- "commit": "0a46b63a8233374c8873cb0cd99b8b67244f8166",
- "sha256": "1vv50h1zmr52pqmx900ia267flv2xfak3zphsnc43inf0c6jf4xb"
+ "commit": "7b0ebdd2e34b3a509c7f043cb9d919a0069491c2",
+ "sha256": "1r1p2k9x5sddxr8cf5ds3hqz2xn4zvy9zabgyr63s16cl7hhn2lg"
},
"stable": {
"version": [
@@ -76823,28 +76955,28 @@
"repo": "org-roam/org-roam-bibtex",
"unstable": {
"version": [
- 20210302,
- 805
+ 20210316,
+ 840
],
"deps": [
"bibtex-completion",
"org-roam"
],
- "commit": "068d9c27650207447ecf7a41fcd5b7abc40f4c3c",
- "sha256": "1jbg5cwp0yf36fv2w695m091m8ylkgg831bmgwvscrdhx1zq4lsi"
+ "commit": "81b6fedf99996a78199067e61935964dea9389ee",
+ "sha256": "1xb7nskz73dfa2rgwmf4s3iq10f43zagggia3ddhx109wmy2m9a9"
},
"stable": {
"version": [
0,
- 4,
+ 5,
0
],
"deps": [
"bibtex-completion",
"org-roam"
],
- "commit": "71da772469bcb49d4a93ee9d9704fbee9488aa28",
- "sha256": "13pll793khyfncpwm2dg24w747sqp7kgf7m3fqw2xzhv9cx2g7nq"
+ "commit": "81b6fedf99996a78199067e61935964dea9389ee",
+ "sha256": "1xb7nskz73dfa2rgwmf4s3iq10f43zagggia3ddhx109wmy2m9a9"
}
},
{
@@ -77140,14 +77272,14 @@
"repo": "akirak/org-starter",
"unstable": {
"version": [
- 20210219,
- 1622
+ 20210314,
+ 1558
],
"deps": [
"dash"
],
- "commit": "5f9e1d225b216d76e4955f394e0387ce015361b2",
- "sha256": "0yipahcq3rl395b16fb2fzfrxq0mnc4paqm06zjiz5i8qpb1w1cf"
+ "commit": "786257e682bf147022d5b19e6df6e7c9939193af",
+ "sha256": "1vfw06c08yhpc1dbqb4gprh9l3j0rgsyvhhgmvcv3y5cq2yaibhb"
},
"stable": {
"version": [
@@ -77178,8 +77310,8 @@
"org-starter",
"swiper"
],
- "commit": "5f9e1d225b216d76e4955f394e0387ce015361b2",
- "sha256": "0yipahcq3rl395b16fb2fzfrxq0mnc4paqm06zjiz5i8qpb1w1cf"
+ "commit": "786257e682bf147022d5b19e6df6e7c9939193af",
+ "sha256": "1vfw06c08yhpc1dbqb4gprh9l3j0rgsyvhhgmvcv3y5cq2yaibhb"
},
"stable": {
"version": [
@@ -77769,8 +77901,8 @@
"repo": "org-trello/org-trello",
"unstable": {
"version": [
- 20200508,
- 1705
+ 20210314,
+ 1856
],
"deps": [
"dash",
@@ -77779,8 +77911,8 @@
"request-deferred",
"s"
],
- "commit": "56c519a00c6e3c8f6923cd0460342089d58c41c9",
- "sha256": "09028167pi9pzgcb8fpvqgvzviq1fxvgby5lb99wvyy94vjxwnk2"
+ "commit": "0435d77cd32cf475ce71b81cda4bb48066c44f31",
+ "sha256": "1nnii5d5qf0bgfpywmhzprh6f1hk39k2wnhnjl0ahqm99bl46fps"
},
"stable": {
"version": [
@@ -77810,8 +77942,8 @@
20200919,
1348
],
- "commit": "e086c59a14701cd041641b51c952fa704ee963df",
- "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p"
+ "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f",
+ "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q"
}
},
{
@@ -78402,11 +78534,11 @@
"repo": "tbanel/orgaggregate",
"unstable": {
"version": [
- 20210225,
- 915
+ 20210315,
+ 1415
],
- "commit": "bcb38ada8469a7f6f9a915c36760a05b2c68ad88",
- "sha256": "1db0wm7dlx1yqnfhbw4m3q3a8x4wk02j1c276qazhff4n03mbhf8"
+ "commit": "639ec296ccca4e2f7405e9ef72506fad609f2167",
+ "sha256": "0nkm6y851sm1bp8ch9d7dxi1z07qs1254ab8zjv16hvq8arp0s6c"
}
},
{
@@ -80099,14 +80231,14 @@
"repo": "melpa/package-build",
"unstable": {
"version": [
- 20210209,
- 1639
+ 20210318,
+ 1411
],
"deps": [
"cl-lib"
],
- "commit": "d8ec8ddf5e39b61e9338de9a778633b7e01854cd",
- "sha256": "1wdii6hlvd4pbgf7bp9d8ay0kd34nyxz2w7gyq2kx43hlcgxhyp1"
+ "commit": "af4f87beb48afc3fb455c58648749e5bfdda1d03",
+ "sha256": "1cn61si2dn60pm3q0d0yjlrsfbns2v51zsdfl52rnfmnrhnl3qjl"
},
"stable": {
"version": [
@@ -80553,15 +80685,15 @@
"repo": "joostkremers/pandoc-mode",
"unstable": {
"version": [
- 20210308,
- 2211
+ 20210317,
+ 2340
],
"deps": [
"dash",
"hydra"
],
- "commit": "500e80666fb779457be8771c5613c177187ba0cc",
- "sha256": "1c3gay9fkikg7h46djw1nf86fzckmv7w1zbz5fbar20klcr12pbm"
+ "commit": "2ad3cfa3045e0a3bcbdee02819c6fd356a8bc40c",
+ "sha256": "1m6c5y95asrw7fkn9sah6a38glr66vb35d3g6gc8lcvh2ikmgjn1"
},
"stable": {
"version": [
@@ -80610,8 +80742,8 @@
20200510,
5
],
- "commit": "e086c59a14701cd041641b51c952fa704ee963df",
- "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p"
+ "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f",
+ "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q"
}
},
{
@@ -81789,8 +81921,8 @@
20160321,
2237
],
- "commit": "1d410a4e48db07a942e54d3b83a85c7a7ec0aab3",
- "sha256": "1b7csqypqkalkzq6vrbq5ry1gdk0qnhnk43rlj514mph0s1nywdd"
+ "commit": "29f6e7058f635b0084880a1f890a6c92501e8c29",
+ "sha256": "06lzb3mzrf2hqbdj4m8vfayf1xar9dgkwznzsqkbj6gjwxbz6xvd"
}
},
{
@@ -84552,6 +84684,21 @@
"sha256": "1ymqhy0sqd54z154s3cm6q1m4xnr9wkx9dl5f93845k11ay3kvln"
}
},
+ {
+ "ename": "popper",
+ "commit": "fd5bfc5df356ea6c91f2fd120b8f912d093a0de6",
+ "sha256": "0iz784hzrhmxr7zv1jx13fk0k9h1c15rbgakry0nyjm4x366rmhj",
+ "fetcher": "github",
+ "repo": "karthink/popper",
+ "unstable": {
+ "version": [
+ 20210319,
+ 31
+ ],
+ "commit": "89ed8ab2da330ffefa0d32ac34491467fc6be228",
+ "sha256": "1n9raivjdsh0nrn0npw2357j72ccqb19mpnmg4cq5qj5q1if2f8v"
+ }
+ },
{
"ename": "popup",
"commit": "083fb071191bccd6feb3fb84569373a597440fb1",
@@ -84560,14 +84707,11 @@
"repo": "auto-complete/popup-el",
"unstable": {
"version": [
- 20210108,
- 1821
+ 20210317,
+ 138
],
- "deps": [
- "cl-lib"
- ],
- "commit": "bd5a0df7e5bc68af46eef37afe9e80764a1d4fd8",
- "sha256": "1y9wv5c9x1rsfdhh3r7mah7yyx2cs7asjzhgsn1pbq7zdjpv5p0p"
+ "commit": "866a091b83369873b4d1c5d62a590fbb0a150bd0",
+ "sha256": "059x15zlc6c17yg5ahdca3bryr10nh9xbb61dv0gdc2wg2c0pzzi"
},
"stable": {
"version": [
@@ -84901,14 +85045,14 @@
"repo": "milkypostman/powerline",
"unstable": {
"version": [
- 20201129,
- 2306
+ 20210317,
+ 110
],
"deps": [
"cl-lib"
],
- "commit": "b293abf83c0a2b2988af19dd0ef0426c3b1d1501",
- "sha256": "01nqff1pg9nxv49g2mmapnrjl8978wwyr6afkr3rm7zlnjz1cjas"
+ "commit": "cfff1cfe63793ea1a8bcfcae50c296558384cf08",
+ "sha256": "12s3mp2dyslq1ilah64gpz7a2j0ca9yls7wvj9kcmjca1931s8s3"
},
"stable": {
"version": [
@@ -85157,15 +85301,15 @@
"repo": "jscheid/prettier.el",
"unstable": {
"version": [
- 20210303,
- 2119
+ 20210313,
+ 1047
],
"deps": [
"iter2",
"nvm"
],
- "commit": "b4c23d108f10d6693c3e2766220fb7dd9c8de7b3",
- "sha256": "1s1asp755ywkl6myk2rvr5xj5405w43p8fqzfm9zn51l4zdq5lg5"
+ "commit": "5232b886bb6a4fb3848d63db1bcfcb30487a180f",
+ "sha256": "0sbka039sccqip36y98s1b5z6rd5w5q0jzl5kbdq4wmzi7j823ri"
},
"stable": {
"version": [
@@ -86133,11 +86277,11 @@
"repo": "ProofGeneral/PG",
"unstable": {
"version": [
- 20210227,
- 1942
+ 20210317,
+ 510
],
- "commit": "7844e312b2a192c4245d0d05c12908efc5730e3b",
- "sha256": "0ky8ivcwkjdclh1vh9hi8wc5zljamby10fd4m73nnkdi2lr6x5nr"
+ "commit": "56ee4ebc97e77da7d61eaa7b00580bf4ef5b87d9",
+ "sha256": "0hqmsqb6q2m0gq52lfm64xh8sc9kc48jbqr2w0vd6mp2467afj42"
},
"stable": {
"version": [
@@ -86240,8 +86384,8 @@
20200619,
1742
],
- "commit": "9ad97629be72eeecf8bc9fe8145e55ceaeab6b78",
- "sha256": "0li6vyr87vspya07j9rkj3m82s9qww6zrnx78yhkn1mznlf73v48"
+ "commit": "617e2556171d5db4f0c13bed56a5010d08fc3b4c",
+ "sha256": "0blmqy1jh2c536lwrksrbndmy0za6dxafkww28wkfhs64s9dqwdm"
},
"stable": {
"version": [
@@ -87096,15 +87240,15 @@
"repo": "tumashu/pyim",
"unstable": {
"version": [
- 20210312,
- 545
+ 20210319,
+ 1102
],
"deps": [
"async",
"xr"
],
- "commit": "a65a5c26a5e39420bf7bba54cb9e42d9ce32c90d",
- "sha256": "1hjmk0jilqp61wskv4vlxagql5mx7yqqybs3kfd36dr88cg20pyx"
+ "commit": "f48c3edee78ba5f020bcb42830db99a14761f176",
+ "sha256": "1ld3bqvfrda6fa4dv3g0wilznrdrsv544sr370sn3a9xlmy4fwp9"
},
"stable": {
"version": [
@@ -87248,8 +87392,8 @@
20200503,
1624
],
- "commit": "890a9b91fbac1fbc8f40fc48a78b8cd6855dbbaa",
- "sha256": "1p7ki0ww12vf14l2ccxax40032vhyf21vjkmdr0qbmgdqzwvpjgc"
+ "commit": "cdfc8374b1b0ee88af0463bdbe58299186244d53",
+ "sha256": "0657491d55x4r4fir357l372pxz7palj60plsk7hinir3db9q7ri"
}
},
{
@@ -87806,11 +87950,11 @@
"repo": "quelpa/quelpa",
"unstable": {
"version": [
- 20210208,
- 716
+ 20210317,
+ 1221
],
- "commit": "8c25a40d07c08a6a9754b3ae12174664e8ed7871",
- "sha256": "05yl7ivr6rq6gry0ik4qg2pxsw07byqwz9sn58hpsx8v7blxwxln"
+ "commit": "ec61039dfd50967ca545cb955bf1dd349682dcf3",
+ "sha256": "0hlcckp9vc5rpxp7w30l25ncz7wxywx5jkr12836zcz2mzc8jbhp"
},
"stable": {
"version": [
@@ -90865,8 +91009,8 @@
"deps": [
"inf-ruby"
],
- "commit": "3ef165c5c99aebfd811a0f18ea7f8c983d4ab152",
- "sha256": "1vwwchgd45a0lin4n04ffwz021889ps4vcj787iy5ijw34pi8zrj"
+ "commit": "126650a06224f1a616b10c02bd9ad8a763a512ef",
+ "sha256": "11yhl9dpf7ni4l9qpr8akpzr2y6j99n3w5hx4yp8v9gppgb1q37w"
},
"stable": {
"version": [
@@ -91669,8 +91813,8 @@
"repo": "brotzeit/rustic",
"unstable": {
"version": [
- 20210308,
- 2135
+ 20210315,
+ 1728
],
"deps": [
"dash",
@@ -91683,8 +91827,8 @@
"spinner",
"xterm-color"
],
- "commit": "270bc5afda080ed656ad53aa132e8b1fb05083e6",
- "sha256": "0f4ff3mpdkqxyi3dv5gm5987nlaaf0gb5k95likjm8i5n9qkk4x5"
+ "commit": "d97ec8623c4c7e7ad3bb32e3d3773ba29a34bb0d",
+ "sha256": "1mimrn4aaplmdrwmgp6wax489vp0njd7j95abdnjf0ggc7qbgzcv"
}
},
{
@@ -92154,8 +92298,8 @@
20200830,
301
],
- "commit": "4546119f2d0582cb03e772a785e5ff93829f2f68",
- "sha256": "19g33m15b4rzf16acsiaf7rh9ck0dhyc4kj5zvzd9h21ihyg5sh7"
+ "commit": "4ebebdaf0dec2f7aaebb6a1c1f6163f503caaa63",
+ "sha256": "1vj4rd5mq93sg10cbdcr2yx5i954ng9s369dghw35h9dasblz1pl"
}
},
{
@@ -92958,11 +93102,11 @@
"repo": "raxod502/selectrum",
"unstable": {
"version": [
- 20210311,
- 2257
+ 20210316,
+ 835
],
- "commit": "a8806f71f9cc07daa0149c89a4dbdae0aa5aebff",
- "sha256": "04q0blmgbwn9jhp4y3jn5vj1h5m1bip6hwa9rf1sywkdbj153n3s"
+ "commit": "a72109ab3eb3a06d1d8e01629bed06871b2c94d2",
+ "sha256": "19z3hicdkr11112snalp657f28wb1n6l1kky7qffd01a71pmd8ia"
},
"stable": {
"version": [
@@ -93166,16 +93310,15 @@
"repo": "twlz0ne/separedit.el",
"unstable": {
"version": [
- 20210210,
- 1411
+ 20210316,
+ 1434
],
"deps": [
"dash",
- "dash-functional",
"edit-indirect"
],
- "commit": "cc1145bde8b1868322ea799a90e38a1295089ada",
- "sha256": "0m429i3zy5aik0q91r6sbr5xpqh4fgx984szp01p8fmbyb7wsh67"
+ "commit": "12db61458b053cee2d57dbf04f725f03487bb895",
+ "sha256": "1h7mr10agkvx8v6pvki8klz6b33lls201wn10q1fgg42djcw2skk"
}
},
{
@@ -93186,11 +93329,11 @@
"repo": "brannala/sequed",
"unstable": {
"version": [
- 20210307,
- 939
+ 20210315,
+ 2012
],
- "commit": "bfd9109a4fe5625554a87988564403031e57f5d9",
- "sha256": "1h2qqd39lj5kqn5yy7c93r5zh6ajbrnr0c5nmxfjb2llra6hlc1y"
+ "commit": "50c5dca413a12fe2d8a89eae833f10967c2f38d2",
+ "sha256": "16hsjk04xw88ddr2gbwlb4v8didqmk7ffwphp1iqy3a02wf4kif6"
}
},
{
@@ -97229,11 +97372,11 @@
"repo": "ideasman42/emacs-spell-fu",
"unstable": {
"version": [
- 20201006,
- 1441
+ 20210317,
+ 909
],
- "commit": "a7db58747131dca2eee0e0757c3d254d391ddd1c",
- "sha256": "05f58nz2bhb5bzy06glpv7pjfqpalv5pyggm43zsh1kl2pxwzb9a"
+ "commit": "ca8f409788964daeabdeff9c8beb36109900f996",
+ "sha256": "1hkzhjnnz1m5lsh2alphr3d234zpbxw44xxhb47l2ws0vr64w50x"
}
},
{
@@ -97817,11 +97960,11 @@
"repo": "srfi-explorations/emacs-srfi",
"unstable": {
"version": [
- 20210306,
- 18
+ 20210318,
+ 2242
],
- "commit": "78d65e571a811088d726858f8f60b9c55f26cfcb",
- "sha256": "1wrzpzp98blwzbgfgfkz5kzc1chcbpgdl23zvs90m01yhhldmmnj"
+ "commit": "512d51e8b6f912857d484095defd7b89535edfbb",
+ "sha256": "0nww5hhzajj4vhps9n1hlyrgj3lifr9lg2dm1s04f2hy84pn9jm1"
},
"stable": {
"version": [
@@ -99319,8 +99462,8 @@
"deps": [
"ivy"
],
- "commit": "8866138333f92c3d82062c5fa613beba38901504",
- "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8"
+ "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
+ "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
},
"stable": {
"version": [
@@ -99635,11 +99778,10 @@
"repo": "countvajhula/symex.el",
"unstable": {
"version": [
- 20210310,
- 214
+ 20210319,
+ 329
],
"deps": [
- "dash",
"evil",
"evil-cleverparens",
"evil-surround",
@@ -99650,16 +99792,15 @@
"smartparens",
"undo-tree"
],
- "commit": "5c95dc5b19b6762b5541da784dbb24e8c9b662d7",
- "sha256": "1gyisadxsx8a6dw3xncmzxhpc1m2qw08m2wzsqj78cp7m1waxicj"
+ "commit": "d37532a9dcff8ec5a2fdc54f27b517890f972bfb",
+ "sha256": "19ffgdvmnys2hby1iwb85kwr74iadnp8mfd0816jlaafjsga7inf"
},
"stable": {
"version": [
- 0,
- 9
+ 1,
+ 0
],
"deps": [
- "dash",
"evil",
"evil-cleverparens",
"evil-surround",
@@ -99670,8 +99811,8 @@
"smartparens",
"undo-tree"
],
- "commit": "741eee5f69af575e6dfd584baa78c37241f61646",
- "sha256": "0l25vds6qjx36bxgy0iwfjqsgcasslhywl8gvb2wv7jpsmjdqg4q"
+ "commit": "d37532a9dcff8ec5a2fdc54f27b517890f972bfb",
+ "sha256": "19ffgdvmnys2hby1iwb85kwr74iadnp8mfd0816jlaafjsga7inf"
}
},
{
@@ -100030,11 +100171,11 @@
"repo": "fritzgrabo/tab-bar-echo-area",
"unstable": {
"version": [
- 20210221,
- 2336
+ 20210315,
+ 1609
],
- "commit": "7fe200bf2c7397abe5623d1b05983eaccc467320",
- "sha256": "16rf0b33adj780ix3x7xhp74dbx6f2044dzihpl77ar1yd48dhc7"
+ "commit": "d2ff6b1acb553bf1546e730640397b9e33ca5279",
+ "sha256": "1agjb68bjfjzgacrip2mjwzfdbvj3xn8cs3f6q5kdjg5v7lg9c9h"
}
},
{
@@ -100045,14 +100186,14 @@
"repo": "fritzgrabo/tab-bar-groups",
"unstable": {
"version": [
- 20210213,
- 2138
+ 20210319,
+ 2222
],
"deps": [
"s"
],
- "commit": "930a86edcfe7c0e33e16bfe2501dbe285a443df9",
- "sha256": "14vpwh2yh1626jlc1ifyl7lfyv2lsczcgsbjs4flbpv83c9biq8s"
+ "commit": "09f2049d5fac5c046e517108ac527d087a7352d8",
+ "sha256": "024yxwb40jpfk5bfb3achf0vkbkblnkidy7rymvln2mzym85g77s"
}
},
{
@@ -100514,15 +100655,15 @@
"repo": "zevlg/telega.el",
"unstable": {
"version": [
- 20210312,
- 1754
+ 20210319,
+ 2200
],
"deps": [
"rainbow-identifiers",
"visual-fill-column"
],
- "commit": "d803588c9e845706f982b8e996343e1d627ce422",
- "sha256": "0ihdkdhcn7pqlj329mis5akjrh9jd4hggnm6f9n3fdqjbcj63sdz"
+ "commit": "de153b575d0a6470314efb3cba9b48b14b5f6d57",
+ "sha256": "014hzm2dlvzrx15557zhd3h8d0dn6akyprxc81ijc6wfczj8bv6m"
},
"stable": {
"version": [
@@ -100653,11 +100794,11 @@
"repo": "clarete/templatel",
"unstable": {
"version": [
- 20210304,
- 1358
+ 20210319,
+ 2222
],
- "commit": "d29c794e1648b4d862a3f48b9de713dd2d972519",
- "sha256": "1yy1n4df7k49c5fvflq1myrxw88qk39rjcsm9p0pgd4akxbd3klj"
+ "commit": "ef93f4190c785166b49a310bf2d8695d3227ab40",
+ "sha256": "13hwa7v5yyji98g9rz2m4ql89nx2wi0hhhikm9y552l25qayrgxz"
},
"stable": {
"version": [
@@ -101590,18 +101731,18 @@
20200212,
1903
],
- "commit": "492a049c23cb86bfc2dc38762a95c6da41fcc7d8",
- "sha256": "1v37lz2gqyb5jrmhkrxdyp3xxdz4a37n7638ql4jrvrvq31b8x9b"
+ "commit": "c6b9113fbe9d3510eb49d24f10cd47a249260e01",
+ "sha256": "0r7k57lpazrz65ix53cflc94msvw7j68myg6y8x0bz44hf8m5irs"
},
"stable": {
"version": [
2021,
3,
- 8,
+ 15,
0
],
- "commit": "e2b61c2a165b8fda48c43f02c6e9e78ec5b3cb37",
- "sha256": "1miv1jgxk2vip63vwnsb9k6x1kp6rz9kj62y8asr0sszf6y1h8jk"
+ "commit": "6d68811e7ee75f8e0b450b9b1778bfad2c44c715",
+ "sha256": "16yixl9qq6zh47zjnad9rv2vbjq936ms212j0wfdax7qhg094af8"
}
},
{
@@ -101681,8 +101822,8 @@
"repo": "ananthakumaran/tide",
"unstable": {
"version": [
- 20210211,
- 1055
+ 20210313,
+ 1524
],
"deps": [
"cl-lib",
@@ -101691,8 +101832,8 @@
"s",
"typescript-mode"
],
- "commit": "7f7334b42a40dd3093b830e887c36cdb4ef40858",
- "sha256": "0krixylc58lglpi6kgwlxfd47c90vmck3cml0h3awplbyyr8b5vg"
+ "commit": "f6ad5e591c4a21a8ed252444cbc0cf6b079d2449",
+ "sha256": "1vkvlkgbk1mlfk31gdf13w4lq3nj7pskp5xd40hivirgmck18wd4"
},
"stable": {
"version": [
@@ -102008,8 +102149,8 @@
"deps": [
"request"
],
- "commit": "269bda7001613c0b70c0662d2a74d200765c1dcb",
- "sha256": "0z8hkp15sdb0x0g67v6xa8ds28awz4i2vcbryj5zfpl15d0fiqc2"
+ "commit": "d59405bd72f3379417b9e73f06e8848b43cb021d",
+ "sha256": "19yb4cxcaif73yvf62d4891l5rvp8ynhxl0f2wc9lvssg0lpx5y0"
}
},
{
@@ -102640,11 +102781,11 @@
"repo": "magit/transient",
"unstable": {
"version": [
- 20210311,
- 1549
+ 20210315,
+ 1902
],
- "commit": "eff65f1d8515df3dc41fb628d54950990a30dbb0",
- "sha256": "0zqicpbijvp2crmwk6c6ipkc6nlh2mkidxda7dc82ilyb9562fhk"
+ "commit": "cc16a5eaa73617a281b0bbf71b24432c38994e30",
+ "sha256": "15ah0h7i96wn4w5321gydr6pxahb8mc8dk58b9paqv06klp5q2cd"
},
"stable": {
"version": [
@@ -102887,26 +103028,26 @@
"repo": "ubolonton/emacs-tree-sitter",
"unstable": {
"version": [
- 20210310,
- 1533
+ 20210315,
+ 238
],
"deps": [
"tsc"
],
- "commit": "e1052cb562a178061538397531be8ca6b11e7d15",
- "sha256": "1m83kg4s0gibdq1kq43l9b2yaf35k203qx5bm32n0gi3b5l03qi3"
+ "commit": "174200858b4192b9d5be3f5bcd1b62995151245b",
+ "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh"
},
"stable": {
"version": [
0,
- 14,
+ 15,
0
],
"deps": [
"tsc"
],
- "commit": "e1052cb562a178061538397531be8ca6b11e7d15",
- "sha256": "1m83kg4s0gibdq1kq43l9b2yaf35k203qx5bm32n0gi3b5l03qi3"
+ "commit": "174200858b4192b9d5be3f5bcd1b62995151245b",
+ "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh"
}
},
{
@@ -102948,26 +103089,26 @@
"repo": "ubolonton/tree-sitter-langs",
"unstable": {
"version": [
- 20210305,
- 1109
+ 20210314,
+ 1704
],
"deps": [
"tree-sitter"
],
- "commit": "8f1f22dc5923ef4b8e594a556acd0a3c878b0855",
- "sha256": "1y5g9fp05zlnklflgkbibs64ypbrixcq591pw6fpg5lklij6h1r2"
+ "commit": "5d362ce98dcf656d7a55fcad6ae21c0a2caca861",
+ "sha256": "11nfyyzyz9x4w4l4hpz0y27awknlwx3kn9dwvkzdn174jk2kxp9a"
},
"stable": {
"version": [
0,
- 9,
- 2
+ 10,
+ 0
],
"deps": [
"tree-sitter"
],
- "commit": "d13a43e286e9e20daf6c6dd29357ac4992208747",
- "sha256": "11ap8rwsa83pq8850sbn9w46imdi3w8zncqp56g57gwgkkq11l6h"
+ "commit": "5d362ce98dcf656d7a55fcad6ae21c0a2caca861",
+ "sha256": "11nfyyzyz9x4w4l4hpz0y27awknlwx3kn9dwvkzdn174jk2kxp9a"
}
},
{
@@ -103027,8 +103168,8 @@
"pfuture",
"s"
],
- "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e",
- "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
},
"stable": {
"version": [
@@ -103064,8 +103205,8 @@
"all-the-icons",
"treemacs"
],
- "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e",
- "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
}
},
{
@@ -103083,8 +103224,8 @@
"evil",
"treemacs"
],
- "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e",
- "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
},
"stable": {
"version": [
@@ -103113,8 +103254,8 @@
"deps": [
"treemacs"
],
- "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e",
- "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
},
"stable": {
"version": [
@@ -103145,8 +103286,8 @@
"pfuture",
"treemacs"
],
- "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e",
- "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
},
"stable": {
"version": [
@@ -103178,8 +103319,8 @@
"persp-mode",
"treemacs"
],
- "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e",
- "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
},
"stable": {
"version": [
@@ -103211,8 +103352,8 @@
"perspective",
"treemacs"
],
- "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e",
- "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
}
},
{
@@ -103230,8 +103371,8 @@
"projectile",
"treemacs"
],
- "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e",
- "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk"
+ "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
+ "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
},
"stable": {
"version": [
@@ -103337,11 +103478,11 @@
"repo": "ianpan870102/tron-legacy-emacs-theme",
"unstable": {
"version": [
- 20200601,
- 533
+ 20210315,
+ 712
],
- "commit": "af17842821400a6fd466bb2769d13606e98550c0",
- "sha256": "19pabaiza0lrvqa8yi0p83rffm9g44n6789m395iayfcxq49lylq"
+ "commit": "4d543fbb9cb2098af1be0f5b10e1e4cd5245a9d0",
+ "sha256": "0fyprvi4s331r6a54xa4dljw0k330kiyhzcfnnjhbsqxc86264pz"
},
"stable": {
"version": [
@@ -103485,20 +103626,20 @@
"repo": "ubolonton/emacs-tree-sitter",
"unstable": {
"version": [
- 20210310,
- 1533
+ 20210315,
+ 238
],
- "commit": "e1052cb562a178061538397531be8ca6b11e7d15",
- "sha256": "1m83kg4s0gibdq1kq43l9b2yaf35k203qx5bm32n0gi3b5l03qi3"
+ "commit": "174200858b4192b9d5be3f5bcd1b62995151245b",
+ "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh"
},
"stable": {
"version": [
0,
- 14,
+ 15,
0
],
- "commit": "e1052cb562a178061538397531be8ca6b11e7d15",
- "sha256": "1m83kg4s0gibdq1kq43l9b2yaf35k203qx5bm32n0gi3b5l03qi3"
+ "commit": "174200858b4192b9d5be3f5bcd1b62995151245b",
+ "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh"
}
},
{
@@ -103867,15 +104008,15 @@
"repo": "mrkkrp/typit",
"unstable": {
"version": [
- 20200217,
- 2059
+ 20210318,
+ 1747
],
"deps": [
"f",
"mmt"
],
- "commit": "f567867a0a519e17ad3552837b48d3d45fb73aa5",
- "sha256": "0a5xds0mhfnq6kyc13s385vf4x4cqqpk2jiw1in7qg382fl8w2p0"
+ "commit": "fa125bf43757737fbcf91958b76c38b440d54b4c",
+ "sha256": "1l0qb8gjgsmjjdvxlma7g6fn2z6rj246p2kczrikq8ajg1xh61sr"
},
"stable": {
"version": [
@@ -105819,11 +105960,11 @@
"repo": "federicotdn/verb",
"unstable": {
"version": [
- 20210303,
- 2314
+ 20210315,
+ 1753
],
- "commit": "b8d2ecbf84b2a9b6a31124e7e4fc22f13e48e18e",
- "sha256": "1hgs61gg75712d6q0sd51xlvmrpn8r6x9nnca8v5f7qnxhnyxv6p"
+ "commit": "9c5e9baf43388d5a69ea2fb216d9936628b36a84",
+ "sha256": "1jl4b1ka1xaavfm4gpqgg01f76mlvy0g0rdifmwwz9w8apw306j0"
},
"stable": {
"version": [
@@ -106582,11 +106723,11 @@
"repo": "ianpan870102/vscode-dark-plus-emacs-theme",
"unstable": {
"version": [
- 20201116,
- 749
+ 20210317,
+ 930
],
- "commit": "4a4c7502ceda44d189a5fb09018ef2bc3f3c8d5f",
- "sha256": "0vgg301za0bgdgcj8kfniysvjq1iyia3jk6lvi6vwrzc8sy9hx6z"
+ "commit": "d54fc120f0c0b363a8bef159da58786fb51e7b0f",
+ "sha256": "1imz2fr9164lsc8f1qji439iz4a643qslmxd9526alxa8gwx2yiz"
},
"stable": {
"version": [
@@ -106621,11 +106762,11 @@
"repo": "akermu/emacs-libvterm",
"unstable": {
"version": [
- 20210308,
- 1505
+ 20210313,
+ 1359
],
- "commit": "21c0c0fe8baddf69043d3173f9fdcf790187f570",
- "sha256": "0caqcvs5ba5796isnvqmvrn81lpkqk11jybx1lhizcl23jv060jc"
+ "commit": "98179e129544bdee7d78fc095098971eeb72428d",
+ "sha256": "0abh1ydq4rzisgy1wf591r5jj606wh0w9jza7pjzwy30s19qd7bl"
}
},
{
@@ -106636,14 +106777,14 @@
"repo": "jixiuf/vterm-toggle",
"unstable": {
"version": [
- 20210226,
- 1800
+ 20210313,
+ 305
],
"deps": [
"vterm"
],
- "commit": "91f788e90b12dd940e3bc9c7b24108be37b99c03",
- "sha256": "1gdf27b89d47js89wi1amicrm49qryi0d3qyjzav4ryf8m7xx54m"
+ "commit": "d10239b7bb89b78dddb82f66ac2286bc0b02747b",
+ "sha256": "0r9n23wg9cfy10h5f9zqr8jpkvw34f9rylri3nxq870awjab7rqi"
}
},
{
@@ -106764,16 +106905,16 @@
"repo": "d12frosted/vulpea",
"unstable": {
"version": [
- 20210308,
- 751
+ 20210314,
+ 1818
],
"deps": [
"org",
"org-roam",
"s"
],
- "commit": "39c514f307f70b5baa6d65163ec7140c9189e662",
- "sha256": "1fxy0n1kv7lrqq4k58wpbbdi4m2rd93k5n66v7bz77qjxzsvpssf"
+ "commit": "ee35c562768a3a46b9d2c2f28dd2def105c05446",
+ "sha256": "19gx5i6jdb8dgpwaw0vmmla1v451svixahyf1pnfk6615rsb3m08"
},
"stable": {
"version": [
@@ -107659,11 +107800,11 @@
"repo": "jstaursky/weyland-yutani-theme",
"unstable": {
"version": [
- 20210227,
- 1749
+ 20210318,
+ 1726
],
- "commit": "831005d21ac373d5d12a1ef2d524e83a6b114c56",
- "sha256": "1grqvy901bkx0pqfy2zfyqzmk5wdarihg27lyjlz1hpiyl74y3sp"
+ "commit": "1441ff884092de03fa7be97fcfd03eefd4dd4b07",
+ "sha256": "0i2idvcck5605miyc938h2y85jvbmd1nky20nmyhrs9q155lifxv"
}
},
{
@@ -108344,15 +108485,15 @@
"repo": "bmag/emacs-purpose",
"unstable": {
"version": [
- 20210309,
- 1531
+ 20210315,
+ 1848
],
"deps": [
"imenu-list",
"let-alist"
],
- "commit": "655df549deb1a5895851c2b989a27bb281db00f4",
- "sha256": "162w8isgpyma4wqgvznvvfdp8kyv5z4p8jfm57dgc8vb9aa1p2zp"
+ "commit": "aa4e7376ab72b7f67cf8ad46b67a2eaec2f8cd61",
+ "sha256": "1l7nrms211jslxibq18wxxdx7rv6i18by8lzhk692fp6s5af2fi3"
},
"stable": {
"version": [
@@ -108570,11 +108711,11 @@
"repo": "magit/with-editor",
"unstable": {
"version": [
- 20210117,
- 2008
+ 20210319,
+ 1930
],
- "commit": "36e163ca80f74905ba3c1cf7b596a0ccc8bc5cac",
- "sha256": "0sq1kpc1ia0vjqylfqi6g2d24fcz5a3yvc5m8x3knhyx8qj5nz5y"
+ "commit": "ebcbd3b137154e6c5a2b976bacbb89d48ddfa242",
+ "sha256": "0qir7kzvnlchpvmpl8gj11yqly6j5m260mmxny9xxwx0dzwaya4k"
},
"stable": {
"version": [
@@ -109187,11 +109328,11 @@
"repo": "redguardtoo/wucuo",
"unstable": {
"version": [
- 20210129,
- 407
+ 20210316,
+ 156
],
- "commit": "4f1a63bf990c06942c5c290d5d146f8545f43b95",
- "sha256": "0awa2zhnmm49sdvxwzhbnzcynk4qsbpsrmqmh9xi9rw20711iwjr"
+ "commit": "d66e6808367048b7694383cf545102e7cad6ba8c",
+ "sha256": "0ahz85n49x2579hpzir2xsqwm0mwlv9x2h91haq0w0l73llnj35q"
},
"stable": {
"version": [
@@ -109356,11 +109497,11 @@
"repo": "xahlee/xah-fly-keys",
"unstable": {
"version": [
- 20210310,
- 1652
+ 20210319,
+ 1553
],
- "commit": "4196c9d06c5da12e9d10b1307e4e6aefb05f4686",
- "sha256": "143j6fwvl6k9gf7m99bmh1y6c6sayr120ndyfbfx34c22wgfgbj4"
+ "commit": "f35ef2e8cb8208c30a7ba02df52f32d915073fe6",
+ "sha256": "13xf12ci1anm6r8j90i6mj8pfmb8ffvhyzinz42046achhpymwnl"
}
},
{
diff --git a/pkgs/applications/editors/gophernotes/default.nix b/pkgs/applications/editors/gophernotes/default.nix
index e48ee4dd13c..161acb54bba 100644
--- a/pkgs/applications/editors/gophernotes/default.nix
+++ b/pkgs/applications/editors/gophernotes/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gophernotes";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "gopherdata";
repo = "gophernotes";
rev = "v${version}";
- sha256 = "0hs92bdrsjqafdkhg2fk3z16h307i32mvbm9f6bb80bgsciysh27";
+ sha256 = "sha256-EEMKV+k5qcep4z7J5r1nSLxmb0fbfpJOPmz5bE91cd8=";
};
- vendorSha256 = "1ylqf1sx0h2kixnq9f3prn3sha43q3ybd5ay57yy5z79qr8zqvxs";
+ vendorSha256 = "sha256-Wy4HcPlrlYUjRQHhw+UPAa+Rn1FvJobWGxgFiJKJTAg=";
meta = with lib; {
description = "Go kernel for Jupyter notebooks";
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 7f36bc35cb5..0901c815f16 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -270,12 +270,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2020.3.2"; /* updated by script */
+ version = "2020.3.3"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "10120y9ccdlhjrpvfnspfj4s7940b3v3yic78r372wj5ns4bsjax"; /* updated by script */
+ sha256 = "10s0jkxi892pg7d2slh7cvrd0ch2223qms3c9v1ax0n6ymfkcw14"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -296,12 +296,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
- version = "2020.3.2"; /* updated by script */
+ version = "2020.3.4"; /* updated by script */
description = "Up and Coming Go IDE";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
- sha256 = "00wbl4g1wgb9c287z6i7a48bm5zyb1gkmyqmhasmj0n2vamaq6sz"; /* updated by script */
+ sha256 = "148rs9w0fqr5xzhnq5bd473j4vnb69kf8yxxjmwdp25z2d7x47ip"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE";
@@ -309,12 +309,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2020.3.2"; /* updated by script */
+ version = "2020.3.3"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "0zkjmvi27b69xrkn4s6f5788n5yn044phgf48kamfqfs37q4xf1d"; /* updated by script */
+ sha256 = "1msfl8qq0aday4ssip73r0y096mrb89mr7z2j4mpqhkzgsmvpjk0"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA RELEASE";
@@ -322,12 +322,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2020.3.2"; /* updated by script */
+ version = "2020.3.3"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
- sha256 = "1vac21d9p52z4k1dl903rc2dbbcf873xbg8rx1fp9nsaaphnc9lq"; /* updated by script */
+ sha256 = "0szq8lqp1h7kci8kqd1bb3g16j3p5f4dfmbccbyrrwsram3hvjgi"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE";
@@ -335,12 +335,12 @@ in
mps = buildMps rec {
name = "mps-${version}";
- version = "2020.3.1"; /* updated by script */
+ version = "2020.3.2"; /* updated by script */
description = "Create your own domain-specific language";
license = lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz";
- sha256 = "0qvl724mm53rxfhafl6561rhpwppcadmwr9sh0hpsfgsprh2xznv"; /* updated by script */
+ sha256 = "0vskzia48jq50bjdqw993gizvvd59f3qlszbsdp7xg5a3afbk7p3"; /* updated by script */
};
wmClass = "jetbrains-mps";
update-channel = "MPS RELEASE";
@@ -348,12 +348,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2020.3.2"; /* updated by script */
+ version = "2020.3.3"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "1dmymlv71syjv8byb9ap9c13fimjl6c3r94dwr9kghdlj3jh7p0k"; /* updated by script */
+ sha256 = "0arff0882xw1azbxpn1n3wbc5ncg8gmfim3jf6rq2dky8kp9ylkm"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@@ -361,12 +361,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2020.3.3"; /* updated by script */
+ version = "2020.3.4"; /* updated by script */
description = "PyCharm Community Edition";
license = lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "0p05pgfmr9515sqbqbjiksg7qzvqxcs119lxfc6dsirdvc1qhnli"; /* updated by script */
+ sha256 = "0xh0hb0v3ilgqjljh22c75hkllqgqbpppplni2dz2pv9rb3r5dv5"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
@@ -374,12 +374,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2020.3.3"; /* updated by script */
+ version = "2020.3.4"; /* updated by script */
description = "PyCharm Professional Edition";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "1yzv1pxpw6pvsjljqvbnf8qgdx34rs5j232zaq4vb5x2ahswf9mm"; /* updated by script */
+ sha256 = "18gkjc52qpghs721rkbsj03kaf6n8c8sxg57b2d82hjckjgm6q10"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
@@ -387,12 +387,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
- version = "2020.3.2"; /* updated by script */
+ version = "2020.3.4"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
- sha256 = "1dkgbd2nqkjcswf7j3pnrsaq9n5wk42abz2c4wgkrh1zrpgihd0j"; /* updated by script */
+ sha256 = "1v99yqj83aw9j400z3v24n7xnyxzw5vm0b3rwd4yb8w3ajl59gq1"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";
@@ -413,12 +413,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2020.3.2"; /* updated by script */
+ version = "2020.3.3"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "1jpa4gfy0xmmscjqca4pvvwvh4h3lg02nbf1m5wcsjdcywbk9y40"; /* updated by script */
+ sha256 = "0szq7qz5p1ksmqdy1rma5rfl0d9dy9qmhz8k5id4zdpyz2jsacfb"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";
diff --git a/pkgs/applications/graphics/eddy/default.nix b/pkgs/applications/graphics/eddy/default.nix
new file mode 100644
index 00000000000..6b8f465a106
--- /dev/null
+++ b/pkgs/applications/graphics/eddy/default.nix
@@ -0,0 +1,47 @@
+{ python3Packages
+, fetchFromGitHub
+, lib
+, jre
+, qt5
+, wrapQtAppsHook
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "eddy";
+ version = "1.2.1";
+
+ src = fetchFromGitHub {
+ owner = "obdasystems";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "12j77bbva5py9bd57c80cmjvf8vll40h19n81h16lvv2r2r7jynh";
+ };
+
+ propagatedBuildInputs = [
+ qt5.qtbase
+ wrapQtAppsHook
+ python3Packages.setuptools
+ python3Packages.rfc3987
+ python3Packages.JPype1
+ python3Packages.pyqt5
+ ];
+
+ # Tests fail with: ImportError: cannot import name 'QtXmlPatterns' from 'PyQt5'
+ doCheck = false;
+
+ preBuild = ''
+ export HOME=/tmp
+ '';
+
+ preFixup = ''
+ wrapQtApp "$out/bin/eddy" --prefix JAVA_HOME : ${jre}
+ '';
+
+ meta = with lib; {
+ homepage = "http://www.obdasystems.com/eddy";
+ description = "Graphical editor for the specification and visualization of Graphol ontologies";
+ license = licenses.gpl3Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ koslambrou ];
+ };
+}
diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix
index d043823a068..dc32cbf2c2a 100644
--- a/pkgs/applications/misc/coolreader/default.nix
+++ b/pkgs/applications/misc/coolreader/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "coolreader";
- version = "3.2.53";
+ version = "3.2.55";
src = fetchFromGitHub {
owner = "buggins";
repo = pname;
rev = "cr${version}";
- sha256 = "sha256-5it70cwRV56OMZI4dny5uwxWgoF42tjcEC4g3MC548s=";
+ sha256 = "sha256-gYAaYGEjw7p6y4h5j6j/4Ld+b37Nv+kt04Wp+qb8gzY=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix
index 23041c2fe37..148553da162 100644
--- a/pkgs/applications/misc/curaengine/stable.nix
+++ b/pkgs/applications/misc/curaengine/stable.nix
@@ -12,7 +12,9 @@ stdenv.mkDerivation {
};
postPatch = ''
- sed -i 's,--static,,g' Makefile
+ substituteInPlace Makefile --replace "--static" ""
+ '' + lib.optionalString stdenv.isi686 ''
+ substituteInPlace Makefile --replace "-flto" ""
'';
installPhase = ''
diff --git a/pkgs/applications/misc/freeplane/default.nix b/pkgs/applications/misc/freeplane/default.nix
new file mode 100644
index 00000000000..0568198f41d
--- /dev/null
+++ b/pkgs/applications/misc/freeplane/default.nix
@@ -0,0 +1,118 @@
+{ stdenv, lib, fetchpatch, fetchFromGitHub, makeWrapper, writeText, runtimeShell, jdk11, perl, gradle_5, which }:
+
+let
+ pname = "freeplane";
+ version = "1.8.11";
+
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "release-${version}";
+ sha256 = "07xjx9pf62dvy8lx6vnbwwcn1zqy89cmdmwy792k7gb12wz81nnc";
+ };
+
+ deps = stdenv.mkDerivation {
+ name = "${pname}-deps";
+ inherit src;
+
+ nativeBuildInputs = [ jdk11 perl gradle_5 ];
+
+ buildPhase = ''
+ GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon jar
+ '';
+
+ # Mavenize dependency paths
+ # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar
+ installPhase = ''
+ find ./caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
+ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
+ | sh
+ '';
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "0r7f6713m0whh5hlk1id7z9j5v9494r41sivn9fzl63q70kzz92g";
+ };
+
+ # Point to our local deps repo
+ gradleInit = writeText "init.gradle" ''
+ logger.lifecycle 'Replacing Maven repositories with ${deps}...'
+ gradle.projectsLoaded {
+ rootProject.allprojects {
+ buildscript {
+ repositories {
+ clear()
+ maven { url '${deps}' }
+ }
+ }
+ repositories {
+ clear()
+ maven { url '${deps}' }
+ }
+ }
+ }
+ settingsEvaluated { settings ->
+ settings.pluginManagement {
+ repositories {
+ maven { url '${deps}' }
+ }
+ }
+ }
+ '';
+
+ # downloaded from unicode.org and twemoji.maxcdn.com by code in freeplane/emoji.gradle
+ # the below hash is for versions of freeplane that use twemoji 12.1.4, and emoji 12.1
+ emoji = stdenv.mkDerivation rec {
+ name = "${pname}-emoji";
+ inherit src;
+
+ nativeBuildInputs = [ jdk11 gradle_5 ];
+
+ buildPhase = ''
+ GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon --offline --init-script ${gradleInit} emojiGraphicsClasses emojiListClasses
+ '';
+
+ installPhase = ''
+ mkdir -p $out/emoji/txt $out/resources/images
+ cp freeplane/build/emoji/txt/emojilist.txt $out/emoji/txt
+ cp -r freeplane/build/emoji/resources/images/emoji/. $out/resources/images/emoji
+ '';
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "0zikbakbr2fhyv4h4h52ajhznjka0hg6hiqfy1528a39i6psipn3";
+ };
+
+in stdenv.mkDerivation rec {
+ inherit pname version src;
+
+ buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ jdk11 gradle_5 ];
+
+ buildPhase = ''
+ mkdir -p -- ./freeplane/build/emoji/{txt,resources/images}
+ cp ${emoji}/emoji/txt/emojilist.txt ./freeplane/build/emoji/txt/emojilist.txt
+ cp -r ${emoji}/resources/images/emoji ./freeplane/build/emoji/resources/images/emoji
+ GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon --offline --init-script ${gradleInit} -x test -x :freeplane:downloadEmoji build
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin $out/share
+
+ cp -a ./BIN/. $out/share/${pname}
+ makeWrapper $out/share/${pname}/${pname}.sh $out/bin/${pname} \
+ --set FREEPLANE_BASE_DIR $out/share/${pname} \
+ --set JAVA_HOME ${jdk11} \
+ --prefix PATH : ${lib.makeBinPath [ jdk11 which ]}
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Mind-mapping software";
+ homepage = "https://freeplane.org/";
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ chaduffy ];
+ };
+}
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index 438d466ab58..ad0970e0fe2 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "gallery_dl";
- version = "1.17.0";
+ version = "1.17.1";
src = fetchPypi {
inherit pname version;
- sha256 = "bf5196b9e18a45d62d7e823894f12def310264a258956882cbac13b5e856bf00";
+ sha256 = "1cfaa3a617d5d222d4b9b41634b1bdede2673a8620d6b0e62fb755ae224ca2ac";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index 08bf01aea61..691ebb4ba68 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,7 +1,6 @@
{ lib
, boost
, fetchFromGitHub
-, fetchpatch
, installShellFiles
, mkDerivationWith
, muparser
@@ -11,36 +10,20 @@
, qtsvg
, qttools
, runtimeShell
-, gcc8Stdenv
+, stdenv
}:
-let
- stdenv = gcc8Stdenv;
-in
-
- # Doesn't build with gcc9
mkDerivationWith stdenv.mkDerivation rec {
pname = "librecad";
- version = "2.2.0-rc1";
+ version = "2.2.0-rc2";
src = fetchFromGitHub {
owner = "LibreCAD";
repo = "LibreCAD";
rev = version;
- sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3";
+ sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE=";
};
- patches = [
- ./fix_qt_5_11_build.patch
- (
- fetchpatch {
- # Fix missing app name and icon on Wayland.
- url = "https://github.com/LibreCAD/LibreCAD/commit/a17f8281093403f0c7c36996232665ed21906688.patch";
- sha256 = "1x46psh4bcx2hxck4l83ki43g1252vb033i2x94h4rpai9hww4d5";
- }
- )
- ];
-
postPatch = ''
substituteInPlace scripts/postprocess-unix.sh \
--replace /bin/sh ${runtimeShell}
@@ -88,16 +71,11 @@ mkDerivationWith stdenv.mkDerivation rec {
qttools
];
- enableParallelBuilding = true;
-
meta = with lib; {
description = "2D CAD package based on Qt";
homepage = "https://librecad.org";
- license = licenses.gpl2;
- maintainers = with maintainers; [
- kiwi
- viric
- ];
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ kiwi viric ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch b/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
deleted file mode 100644
index 04701e5ab1e..00000000000
--- a/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp
-index 835e47d..2c878e8 100644
---- a/librecad/src/ui/forms/qg_commandwidget.cpp
-+++ b/librecad/src/ui/forms/qg_commandwidget.cpp
-@@ -27,6 +27,7 @@
-
- #include
-
-+#include
- #include
- #include
- #include
-diff --git a/librecad/src/ui/generic/colorwizard.cpp b/librecad/src/ui/generic/colorwizard.cpp
-index 2beaceb..84068ad 100644
---- a/librecad/src/ui/generic/colorwizard.cpp
-+++ b/librecad/src/ui/generic/colorwizard.cpp
-@@ -27,6 +27,7 @@
- #include "colorwizard.h"
- #include "ui_colorwizard.h"
-
-+#include
- #include
- #include
- #include
-diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp
-index 7c35144..0e394f2 100644
---- a/librecad/src/ui/generic/widgetcreator.cpp
-+++ b/librecad/src/ui/generic/widgetcreator.cpp
-@@ -27,6 +27,7 @@
- #include "widgetcreator.h"
- #include "ui_widgetcreator.h"
-
-+#include
- #include
- #include
- #include
diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix
new file mode 100644
index 00000000000..6595cb3a913
--- /dev/null
+++ b/pkgs/applications/misc/logseq/default.nix
@@ -0,0 +1,52 @@
+{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }:
+
+stdenv.mkDerivation rec {
+ pname = "logseq";
+ version = "0.0.13";
+
+ src = fetchurl {
+ url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
+ sha256 = "0a7c33f7d5ylcy6lqkpxp78wwyi4n5q4jdy7b8nx7p34sn2jnpf7";
+ name = "${pname}-${version}.AppImage";
+ };
+
+ appimageContents = appimageTools.extract {
+ name = "${pname}-${version}";
+ inherit src;
+ };
+
+ dontUnpack = true;
+ dontConfigure = true;
+ dontBuild = true;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin $out/share/${pname} $out/share/applications
+ cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
+ cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop
+
+ substituteInPlace $out/share/applications/${pname}.desktop \
+ --replace Exec=Logseq Exec=${pname} \
+ --replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ makeWrapper ${electron}/bin/electron $out/bin/${pname} \
+ --add-flags $out/share/${pname}/resources/app
+ '';
+
+ passthru.updateScript = ./update.sh;
+
+ meta = with lib; {
+ description = "A local-first, non-linear, outliner notebook for organizing and sharing your personal knowledge base";
+ homepage = "https://github.com/logseq/logseq";
+ license = licenses.agpl3Plus;
+ maintainers = with maintainers; [ weihua ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/misc/logseq/update.sh b/pkgs/applications/misc/logseq/update.sh
new file mode 100755
index 00000000000..9f83eefad19
--- /dev/null
+++ b/pkgs/applications/misc/logseq/update.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq common-updater-scripts
+
+version="$(curl -sL "https://api.github.com/repos/logseq/logseq/releases" | jq '.[0].tag_name' --raw-output)"
+update-source-version logseq "$version"
diff --git a/pkgs/applications/misc/portfolio-filemanager/default.nix b/pkgs/applications/misc/portfolio-filemanager/default.nix
new file mode 100644
index 00000000000..6b4946976bf
--- /dev/null
+++ b/pkgs/applications/misc/portfolio-filemanager/default.nix
@@ -0,0 +1,71 @@
+{ lib
+, python3
+, fetchFromGitHub
+, appstream-glib
+, desktop-file-utils
+, gettext
+, glib
+, gobject-introspection
+, gtk3
+, libhandy
+, librsvg
+, meson
+, ninja
+, pkg-config
+, wrapGAppsHook
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "portfolio";
+ version = "0.9.10";
+
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "tchx84";
+ repo = "Portfolio";
+ rev = "v${version}";
+ sha256 = "06hk0kx6h8w263qa71bik68rg4r8qs94b6s60pyhzicfc822k0j4";
+ };
+
+ postPatch = ''
+ patchShebangs build-aux/meson
+ '';
+
+ nativeBuildInputs = [
+ appstream-glib
+ desktop-file-utils
+ gettext
+ glib
+ gobject-introspection
+ gtk3
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ gobject-introspection
+ libhandy
+ librsvg
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ pygobject3
+ ];
+
+ postInstall = ''
+ ln -s dev.tchx84.Portfolio "$out/bin/portfolio"
+ '';
+
+ meta = with lib; {
+ description = "A minimalist file manager for those who want to use Linux mobile devices";
+ homepage = "https://github.com/tchx84/Portfolio";
+ changelog = "https://github.com/tchx84/Portfolio/blob/v${version}/CHANGELOG.md";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 840b37351c7..3fb99d5b3d5 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -17,10 +17,10 @@ let
pname = "simplenote";
- version = "2.2.0";
+ version = "2.5.0";
sha256 = {
- x86_64-linux = "123b0fh14068s2z3k6s5mmh46xwlz02qfnpmj838zlm5hckjmifv";
+ x86_64-linux = "sha256-Mn1oie+YHNtYKriIAIHdO+tUQDqaA34dkAJgZvQy76I=";
}.${system} or throwSystem;
meta = with lib; {
diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix
index 2c5db1fe15a..7904af3e7e1 100644
--- a/pkgs/applications/misc/surface-control/default.nix
+++ b/pkgs/applications/misc/surface-control/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "surface-control";
- version = "0.3.1-1";
+ version = "0.3.1-2";
src = fetchFromGitHub {
owner = "linux-surface";
repo = pname;
rev = "v${version}";
- sha256 = "0wclzlix0a2naxbdg3wym7yw19p2wqpcjmkf7gn8cs00shrmzjld";
+ sha256 = "sha256-SLJ4mwBafLGL5pneMTHLc4S4Tgds2xLqByWFH95TK1k=";
};
- cargoSha256 = "0vi26v9mvx298kx6k5g7h8dnn7r208an9knadc23vxcrrxjr6pn5";
+ cargoSha256 = "sha256-a+4oOkO90TObfYnq9NZsWy5RmYFYN1BKvUKxpvjiJc8=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 57a4155e179..96355789eb3 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon
+{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence
, libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
, alsaLib, dbus, cups, libexif, ffmpeg_3, systemd
, freetype, fontconfig, libXft, libXrender, libxcb, expat
@@ -18,11 +18,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
- version = "3.6.2165.36-1";
+ version = "3.7.2218.45-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
- sha256 = "1wgxzggy5sg98k4lzd34k4hyw2jgc14db41z7s7j3c5whlnifh08";
+ sha256 = "11q3whw01nbwvzccgn55b4lkr7dzlql961406r6by8xqvf8zgmp4";
};
unpackPhase = ''
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ patchelf makeWrapper ];
buildInputs = [
- stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon
+ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg_3 systemd
freetype fontconfig libXrender libuuid expat glib nss nspr
diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix
index ae9380c5139..577e52ed49d 100644
--- a/pkgs/applications/networking/cluster/kpt/default.nix
+++ b/pkgs/applications/networking/cluster/kpt/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kpt";
- version = "0.37.1";
+ version = "0.38.0";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4SGCYkx9U6XNUrJfVPgNEhFA75CF8GOrtS4BSm6f7mM=";
+ sha256 = "sha256-MBZa4LdpCZnVVbjzkYpPi9/CYGqVLeYy2N/AS1PSYBE=";
};
- vendorSha256 = "sha256-y/l9k3oTrN+9OGgyiVzCyYi+6lJpcKaEygirytbn9aI=";
+ vendorSha256 = "sha256-P0cN8aw62nPD1OlUAw1E36YxptxtPqqruZfDDG4Ag2w=";
subPackages = [ "." ];
diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index ca6537fdfb5..23a4aebb026 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -88,8 +88,6 @@ stdenv.mkDerivation rec {
description = "Matrix group messaging app";
homepage = "https://gitlab.gnome.org/GNOME/fractal";
license = licenses.gpl3;
- # couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2)
- broken = true;
maintainers = with maintainers; [ dtzWill worldofpeace ];
};
}
diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix
index 7242a1a7ff7..b8789c4c417 100644
--- a/pkgs/applications/networking/seaweedfs/default.nix
+++ b/pkgs/applications/networking/seaweedfs/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "seaweedfs";
- version = "2.31";
+ version = "2.32";
src = fetchFromGitHub {
owner = "chrislusf";
repo = "seaweedfs";
rev = version;
- sha256 = "sha256-0s/hcRUuskU4TZqk5h4A51mkEJ6uUZS42mKDQvSx3I4=";
+ sha256 = "sha256-0VryhH0ELBLVZL2vLuAcjZ0a5otk/etr3riRyc+7YTk=";
};
- vendorSha256 = "sha256-QpGRQQbNchj0T9USRnALjvOGd2cV+JUgJeRgfjK8n5o=";
+ vendorSha256 = "sha256-besXzqlmhFbWfnlacGildBbNATVrtMthf+BA/pL7R5I=";
subPackages = [ "weed" ];
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 17c72e8a330..a586cea47ab 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
, libsoup, gnome3 }:
stdenv.mkDerivation rec {
- name = "homebank-5.5";
+ name = "homebank-5.5.1";
src = fetchurl {
url = "http://homebank.free.fr/public/${name}.tar.gz";
- sha256 = "sha256-3tqmsCxQXNAsDsLdiyuk4MydH0WgHqsNpgqxvCp+bHU=";
+ sha256 = "sha256-m7OeqtPExo0ry+IeL2xKUnTjo/OFr7Ky/3OuX9mY2gg=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
diff --git a/pkgs/applications/radio/btlejack/default.nix b/pkgs/applications/radio/btlejack/default.nix
new file mode 100644
index 00000000000..198c090b0ea
--- /dev/null
+++ b/pkgs/applications/radio/btlejack/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonApplication, fetchFromGitHub, pyserial, halo }:
+
+buildPythonApplication rec {
+ pname = "btlejack";
+ version = "2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "virtualabs";
+ repo = "btlejack";
+ rev = "v${version}";
+ sha256 = "1r17079kx7dvsrbmw5sgvz3vj5m3pn2543gxj2xmw4s0lcihy378";
+ };
+
+ postPatch = ''
+ sed -i "s|^.*'argparse',$||" setup.py
+ '';
+
+ propagatedBuildInputs = [ pyserial halo ];
+
+ meta = with lib; {
+ homepage = "https://github.com/virtualabs/btlejack";
+ description = "Bluetooth Low Energy Swiss-army knife";
+ license = licenses.mit;
+ maintainers = with maintainers; [ oxzi ];
+ };
+}
diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix
index 8d9ea7a3917..74a6b495587 100644
--- a/pkgs/applications/science/chemistry/gwyddion/default.nix
+++ b/pkgs/applications/science/chemistry/gwyddion/default.nix
@@ -35,10 +35,10 @@ in
stdenv.mkDerivation rec {
pname = "gwyddion";
- version = "2.56";
+ version = "2.57";
src = fetchurl {
url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz";
- sha256 = "0z83p3ifdkv5dds8s6fqqbycql1zmgppdc7ygqmm12z5zlrl9p12";
+ sha256 = "sha256-kx/WqtNDaJQyVehxZ3weddXyaM1knX+fCuv47A9GaH0=";
};
nativeBuildInputs = [ pkg-config file ];
diff --git a/pkgs/applications/science/electronics/gnucap/default.nix b/pkgs/applications/science/electronics/gnucap/default.nix
new file mode 100644
index 00000000000..c51e5de93d6
--- /dev/null
+++ b/pkgs/applications/science/electronics/gnucap/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ pname = "gnucap";
+ version = "20210107";
+
+ src = fetchurl {
+ url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/${pname}-${version}.tar.gz";
+ sha256 = "12rlwd4mfc54qq1wrx5k8qk578xls5z4isf94ybkf2z6qxk4mhnj";
+ };
+
+ doCheck = true;
+
+ meta = with lib; {
+ description = "Gnu Circuit Analysis Package";
+ longDescription = ''
+Gnucap is a modern general purpose circuit simulator with several advantages over Spice derivatives.
+It performs nonlinear dc and transient analyses, fourier analysis, and ac analysis.
+ '';
+ homepage = "http://www.gnucap.org/";
+ changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}";
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
+ maintainers = [ maintainers.raboof ];
+ };
+}
diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix
index 63642af708f..2631bae57e5 100644
--- a/pkgs/applications/terminal-emulators/foot/default.nix
+++ b/pkgs/applications/terminal-emulators/foot/default.nix
@@ -21,19 +21,21 @@
}:
let
- version = "1.6.4";
+ version = "1.7.0";
# build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result
# and avoid unnecessary rebuilds as it can take relatively long
# to generate
+ #
+ # For every bump, make sure that the hash is still accurate.
stimulusGenerator = stdenv.mkDerivation {
pname = "foot-generate-alt-random-writes";
inherit version;
src = fetchurl {
url = "https://codeberg.org/dnkl/foot/raw/tag/${version}/scripts/generate-alt-random-writes.py";
- sha256 = "0pnc5nvqrbgx5618ylrkrs9fyxjh4jcsbryfk6vlnk8x4wyyaibz";
+ sha256 = "019bdiqfi3wx2lwrv3nhq83knc1r3lmqd5zgisa33wwshm2kyv7p";
};
dontUnpack = true;
@@ -87,7 +89,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz";
- sha256 = "0awv53l3039s1rnkhdkzc0gwawlnd1m8cl4qhaijhxzzq68w0dfb";
+ sha256 = "0w07fw7y31g891335ji3fm783r4dsk5py82qp0zx6z3rfr07paby";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index cec6468c43b..817daf31d0a 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -13,21 +13,21 @@
}:
let
- version = "1.15.4";
+ version = "1.16.3";
# Using two URLs as the first one will break as soon as a new version is released
src_bin = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
];
- hash = "sha256-Reun5hp7Rnsf6N5yL6iQ1Vbhnz/AKnt/jYRqyOK625o=";
+ hash = "sha256-G2XceMwiFu4fWT4L3HJzDB/rD3eSX6ko6RdVw72QLzg=";
};
src_oss = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
];
- hash = "sha256-gtBi1IRNF5ASk/ZdzkDmOuEIT9gazNaRNCftqbLEP+M=";
+ hash = "sha256-YUGozP9B6vmWQ4WxctSbezzu+0yLJXNKQk9TwnQF8F0=";
};
in mkDerivation {
pname = "makemkv";
diff --git a/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix
new file mode 100644
index 00000000000..cda15b2674c
--- /dev/null
+++ b/pkgs/applications/video/mpv/scripts/thumbnail.nix
@@ -0,0 +1,36 @@
+{ fetchFromGitHub, lib, python3, stdenv }:
+
+stdenv.mkDerivation rec {
+ pname = "mpv_thumbnail_script";
+ version = "unstable-2020-01-16";
+
+ src = fetchFromGitHub {
+ owner = "theamm";
+ repo = pname;
+ rev = "682becf5b5115c2a206b4f0bdee413d4be8b5bef";
+ sha256 = "0dgfrb8ypc5vlq35kzn423fm6l6348ivl85vb6j3ccc9a51xprw3";
+ };
+
+ nativeBuildInputs = [ python3 ];
+
+ postPatch = ''
+ patchShebangs concat_files.py
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/share/mpv/scripts
+ cp mpv_thumbnail_script_{client_osc,server}.lua $out/share/mpv/scripts
+ runHook postInstall
+ '';
+
+ passthru.scriptName = "mpv_thumbnail_script_{client_osc,server}.lua";
+
+ meta = with lib; {
+ description = "A lua script to show preview thumbnails in mpv's OSC seekbar";
+ homepage = "https://github.com/theamm/mpv_thumbnail_script";
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index 4c2d82ce630..bd54401e235 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -3,7 +3,7 @@
{ name ? "debian-build"
, diskImage
-, src, lib, stdenv, vmTools, checkinstall
+, src, stdenv, vmTools, checkinstall
, fsTranslation ? false
, # Features provided by this package.
debProvides ? []
@@ -21,7 +21,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
prePhases = "installExtraDebsPhase sysInfoPhase";
}
- // removeAttrs args ["vmTools"] //
+ // removeAttrs args ["vmTools" "lib"] //
{
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix
new file mode 100644
index 00000000000..e71a0bd0230
--- /dev/null
+++ b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix
@@ -0,0 +1,40 @@
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, extra-cmake-modules
+, kwindowsystem
+, plasma-framework
+, qtx11extras
+}:
+
+mkDerivation rec {
+ pname = "plasma-applet-virtual-desktop-bar";
+ version = "unstable-2021-02-20";
+
+ src = fetchFromGitHub {
+ owner = "wsdfhjxc";
+ repo = "virtual-desktop-bar";
+ rev = "3e9bbddb8def8da65071a1c325eaa06598e8a473";
+ sha256 = "192ns6c2brzq46pg385n0v1ydbz52aaa8f5dgfw5251hrw9c7bxg";
+ };
+
+ buildInputs = [
+ kwindowsystem plasma-framework qtx11extras
+ ];
+
+ nativeBuildInputs = [
+ extra-cmake-modules
+ ];
+
+ cmakeFlags = [
+ "-Wno-dev"
+ ];
+
+ meta = with lib; {
+ description = "Manage virtual desktops dynamically in a convenient way";
+ homepage = "https://github.com/wsdfhjxc/virtual-desktop-bar";
+ license = licenses.gpl3Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+}
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index c4cbc44b375..71826e730b5 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -143,6 +143,7 @@ let
thirdParty = let inherit (libsForQt5) callPackage; in {
plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { };
+ plasma-applet-virtual-desktop-bar = callPackage ./3rdparty/addons/virtual-desktop-bar.nix { };
kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { };
kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { };
krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { };
diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix
index 37632ab2f76..cf815b80824 100644
--- a/pkgs/desktops/plasma-5/discover.nix
+++ b/pkgs/desktops/plasma-5/discover.nix
@@ -1,10 +1,34 @@
-{
- mkDerivation, lib,
- extra-cmake-modules, gettext, kdoctools, python,
- appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, util-linux,
- qtbase, qtquickcontrols2,
- karchive, kconfig, kcrash, kdbusaddons, kdeclarative, kio, kirigami2, kitemmodels,
- knewstuff, kwindowsystem, kxmlgui, plasma-framework
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, gettext
+, kdoctools
+, python
+, appstream-qt
+, discount
+, flatpak
+, fwupd
+, ostree
+, packagekit-qt
+, pcre
+, util-linux
+, qtbase
+, qtquickcontrols2
+, qtx11extras
+, karchive
+, kcmutils
+, kconfig
+, kcrash
+, kdbusaddons
+, kdeclarative
+, kidletime
+, kio
+, kirigami2
+, kitemmodels
+, knewstuff
+, kwindowsystem
+, kxmlgui
+, plasma-framework
}:
mkDerivation {
@@ -13,9 +37,29 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
buildInputs = [
# discount is needed for libmarkdown
- appstream-qt discount flatpak fwupd ostree packagekit-qt pcre util-linux
+ appstream-qt
+ discount
+ flatpak
+ fwupd
+ ostree
+ packagekit-qt
+ pcre
+ util-linux
qtquickcontrols2
- karchive kconfig kcrash kdbusaddons kdeclarative kio kirigami2 kitemmodels knewstuff kwindowsystem kxmlgui
+ qtx11extras
+ karchive
+ kcmutils
+ kconfig
+ kcrash
+ kdbusaddons
+ kdeclarative
+ kidletime
+ kio
+ kirigami2
+ kitemmodels
+ knewstuff
+ kwindowsystem
+ kxmlgui
plasma-framework
];
}
diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix
index a9f51e50a26..9e3776e8e29 100644
--- a/pkgs/desktops/plasma-5/sddm-kcm.nix
+++ b/pkgs/desktops/plasma-5/sddm-kcm.nix
@@ -1,8 +1,19 @@
-{
- mkDerivation, lib, extra-cmake-modules, shared-mime-info,
- libpthreadstubs, libXcursor, libXdmcp,
- qtbase, qtquickcontrols2, qtx11extras,
- karchive, ki18n, kio, knewstuff
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, shared-mime-info
+, libpthreadstubs
+, libXcursor
+, libXdmcp
+, qtbase
+, qtquickcontrols2
+, qtx11extras
+, karchive
+, kcmutils
+, kdeclarative
+, ki18n
+, kio
+, knewstuff
}:
mkDerivation {
@@ -10,8 +21,16 @@ mkDerivation {
meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
- libpthreadstubs libXcursor libXdmcp
- qtquickcontrols2 qtx11extras
- karchive ki18n kio knewstuff
+ libpthreadstubs
+ libXcursor
+ libXdmcp
+ qtquickcontrols2
+ qtx11extras
+ karchive
+ kcmutils
+ kdeclarative
+ ki18n
+ kio
+ knewstuff
];
}
diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix
index 09169019a12..a4201d0aa2a 100644
--- a/pkgs/development/libraries/notcurses/default.nix
+++ b/pkgs/development/libraries/notcurses/default.nix
@@ -3,7 +3,7 @@
multimediaSupport ? true
}:
let
- version = "2.1.5";
+ version = "2.2.2";
in
stdenv.mkDerivation {
pname = "notcurses";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
owner = "dankamongmen";
repo = "notcurses";
rev = "v${version}";
- sha256 = "02x9a0z7mbgry2wsfai1l3jwb2zpcg4gq6a2w5d920ap2fixzy8b";
+ sha256 = "sha256-PzSstz5jODWbMLSClm3yZSHJKMXuDfxwj/h9Qo6kAVg=";
};
meta = {
diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix
index 4587bf46162..85468bd4f18 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/pkgs/development/libraries/qtstyleplugins/default.nix
@@ -1,7 +1,8 @@
-{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }:
+{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, pkg-config, gtk2 }:
mkDerivation {
- name = "qtstyleplugins-2017-03-11";
+ pname = "qtstyleplugins";
+ version = "unstable-2017-03-11";
src = fetchFromGitHub {
owner = "qt";
@@ -10,7 +11,18 @@ mkDerivation {
sha256 = "085wyn85nrmzr8nv5zv7fi2kqf8rp1gnd30h72s30j55xvhmxvmy";
};
- patches = [ ./fix-build-against-Qt-5.15.patch ];
+ patches = [
+ (fetchpatch rec {
+ name = "0001-fix-build-against-Qt-5.15.patch";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=qt5-styleplugins";
+ sha256 = "j0CgfutqFawy11IqFnlrkfMsMD01NjX/MkfVEVxj1QM=";
+ })
+ (fetchpatch rec {
+ name = "0002-fix-gtk2-background.patch";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=qt5-styleplugins";
+ sha256 = "qUOkNckrSUEzXY1PUZKfbiCjhNyB5ZBw2IN/j32GKM4=";
+ })
+ ];
nativeBuildInputs = [ pkg-config qmake ];
buildInputs = [ gtk2 ];
diff --git a/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch b/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch
deleted file mode 100644
index 7eb74415820..00000000000
--- a/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 335dbece103e2cbf6c7cf819ab6672c2956b17b3 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt
-Date: Thu, 28 May 2020 12:35:42 +0200
-Subject: [PATCH] fix build against Qt 5.15
-
-With 0a93db4d82c051164923a10e4382b12de9049b45 ("Unify application
-palette handling between QGuiApplication and QApplication")
-QApplicationPrivate::setSystemPalette is no longer used and necessary.
----
- src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++
- src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp
-index 36169c9..2544593 100644
---- a/src/plugins/styles/gtk2/qgtkstyle.cpp
-+++ b/src/plugins/styles/gtk2/qgtkstyle.cpp
-@@ -440,7 +440,9 @@ void QGtkStyle::polish(QApplication *app)
- // not supported as these should be entirely determined by
- // current Gtk settings
- if (app->desktopSettingsAware() && d->isThemeAvailable()) {
-+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
- QApplicationPrivate::setSystemPalette(standardPalette());
-+#endif
- QApplicationPrivate::setSystemFont(d->getThemeFont());
- d->applyCustomPaletteHash();
- if (!d->isKDE4Session())
-diff --git a/src/plugins/styles/gtk2/qgtkstyle_p.cpp b/src/plugins/styles/gtk2/qgtkstyle_p.cpp
-index e57b3d8..e71beb0 100644
---- a/src/plugins/styles/gtk2/qgtkstyle_p.cpp
-+++ b/src/plugins/styles/gtk2/qgtkstyle_p.cpp
-@@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateTheme()
- if (oldTheme != QGtkStylePrivate::getThemeName()) {
- oldTheme = QGtkStylePrivate::getThemeName();
- QPalette newPalette = qApp->style()->standardPalette();
-+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
- QApplicationPrivate::setSystemPalette(newPalette);
-+#endif
- QApplication::setPalette(newPalette);
- if (!QGtkStylePrivate::instances.isEmpty()) {
- QGtkStylePrivate::instances.last()->initGtkWidgets();
---
-2.26.2
-
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index e4ee3c47307..6ab2fe9f6cb 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "rocksdb";
- version = "6.15.5";
+ version = "6.17.3";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-o7bi0xcWaH5DXcEJgfY7MxhYfntqhzGoko6EqgrKyY8=";
+ sha256 = "sha256-mfONfYMxZ3CT7Bk3OYSwg0UChmk4mQ1+cHN94gEDZcM=";
};
nativeBuildInputs = [ cmake ninja ];
diff --git a/pkgs/development/ocaml-modules/graphics/default.nix b/pkgs/development/ocaml-modules/graphics/default.nix
index 6a3217431b4..10d0b4ea6fc 100644
--- a/pkgs/development/ocaml-modules/graphics/default.nix
+++ b/pkgs/development/ocaml-modules/graphics/default.nix
@@ -3,13 +3,13 @@
buildDunePackage rec {
pname = "graphics";
- version = "5.1.0";
+ version = "5.1.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/ocaml/graphics/releases/download/${version}/graphics-${version}.tbz";
- sha256 = "16z997mp0ccilaqqvmz3wp7vx0ghaf4ik9qklgd4piklcl1yv5n5";
+ sha256 = "sha256-KGyD497ZKHA2xeXHezmh3P1zoSlre1h5N9zjkAFmMo4=";
};
buildInputs = [ dune-configurator ];
diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix
new file mode 100644
index 00000000000..078184275eb
--- /dev/null
+++ b/pkgs/development/python-modules/aionotion/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, aiohttp
+, aresponses
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytest-aiohttp
+, pytest-asyncio
+, pytest-cov
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "aionotion";
+ version = "3.0.1";
+ format = "pyproject";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "bachya";
+ repo = pname;
+ rev = version;
+ sha256 = "1ydrazg7gcwf53006n1fvxh9zm77by6zi36haq1bmy5skqccyiki";
+ };
+
+ nativeBuildInputs = [ poetry-core ];
+
+ propagatedBuildInputs = [
+ aiohttp
+ ];
+
+ checkInputs = [
+ aresponses
+ pytest-aiohttp
+ pytest-asyncio
+ pytest-cov
+ pytestCheckHook
+ ];
+
+ disabledTestPaths = [ "examples" ];
+
+ pythonImportsCheck = [ "aionotion" ];
+
+ meta = with lib; {
+ description = "Python library for Notion Home Monitoring";
+ homepage = "https://github.com/bachya/aionotion";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix
index e0294246fb2..fb51b698ed8 100644
--- a/pkgs/development/python-modules/avro-python3/default.nix
+++ b/pkgs/development/python-modules/avro-python3/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "avro-python3";
- version = "1.10.1";
+ version = "1.10.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "9027abeab63dd9b66bd3c564fa0670c70f78027ecb1978d96c6af7ed415b626b";
+ sha256 = "3b63f24e6b04368c3e4a6f923f484be0230d821aad65ac36108edbff29e9aaab";
};
buildInputs = [ pycodestyle isort ];
diff --git a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
index 9538ed2a234..628d0bbcac0 100644
--- a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-marketplaceordering";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "85103080f9e59215036bdfb8f806d91ea182d72c46a13f55c3acc479849351e3";
+ sha256 = "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix
index 5d0f098b8a3..95bb22ce2cb 100644
--- a/pkgs/development/python-modules/bayespy/default.nix
+++ b/pkgs/development/python-modules/bayespy/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "bayespy";
- version = "0.5.21";
+ version = "0.5.22";
# Python 2 not supported and not some old Python 3 because MPL doesn't support
# them properly.
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0d86e9ae73e6472c26aeb4de7abd9bf99492fedcbb0485ed7fa23609d2673b42";
+ sha256 = "ed0057dc22bd392df4b3bba23536117e1b2866e3201b12c5a37428d23421a5ba";
};
checkInputs = [ pytest nose glibcLocales ];
diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix
index 2c4f495a7ff..88369f41872 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -16,14 +16,14 @@
}:
buildPythonPackage rec {
- version = "2.3.3";
+ version = "2.3.4";
pname = "beancount";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0767ap2n9vk9dz40njndfhaprajr75fvzx7igbd1szc6x8wri8nr";
+ sha256 = "sha256-K/CM5qldmAAPTXM5WYXNHeuBwNUu1aduYQusd9gvhsA=";
};
# Tests require files not included in the PyPI archive.
diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix
index 120fd5df124..a160c5ea94c 100644
--- a/pkgs/development/python-modules/cachetools/default.nix
+++ b/pkgs/development/python-modules/cachetools/default.nix
@@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
+, isPy27
, fetchFromGitHub
, pytestCheckHook
}:
@@ -8,6 +9,8 @@ buildPythonPackage rec {
pname = "cachetools";
version = "4.2.1";
+ disabled = isPy27;
+
src = fetchFromGitHub {
owner = "tkem";
repo = pname;
diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix
index 6057a770e0a..ea6e2ed079a 100644
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "casbin";
- version = "0.18.4";
+ version = "0.19.1";
disabled = isPy27;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
- sha256 = "16yhl1xgrgkyqnmbw9in3y7ypcxvvy21h32v50cd73a3iw4x27d0";
+ sha256 = "0fkkz5k3h4pkxacrbacamnh4yfghxgajdzzmdlck7i4v5x06vz8f";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix
index 859fb091ec9..e15a062a893 100644
--- a/pkgs/development/python-modules/ckcc-protocol/default.nix
+++ b/pkgs/development/python-modules/ckcc-protocol/default.nix
@@ -4,19 +4,18 @@
, ecdsa
, hidapi
, fetchPypi
-, pytest
, pyaes
, pythonOlder
}:
buildPythonPackage rec {
pname = "ckcc-protocol";
- version = "1.0.3";
+ version = "1.1.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "d83a77d94e9563c3fb0e982d847ec88ba6ac45e3e008e5e53729c0b9800097fc";
+ sha256 = "b660225ac06fc06ad17b33ece428126eef785388450e14313f72d25d4082c5ab";
};
propagatedBuildInputs = [ click ecdsa hidapi pyaes ];
diff --git a/pkgs/development/python-modules/cmigemo/default.nix b/pkgs/development/python-modules/cmigemo/default.nix
new file mode 100644
index 00000000000..907e144c86e
--- /dev/null
+++ b/pkgs/development/python-modules/cmigemo/default.nix
@@ -0,0 +1,36 @@
+{ lib, buildPythonPackage, fetchPypi, six, cmigemo, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "cmigemo";
+ version = "0.1.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "09j68kvcskav2cqb7pj12caksmj4wh2lhjp0csq00xpn0wqal4vk";
+ };
+
+ propagatedBuildInputs = [ six ];
+
+ preConfigure = ''
+ export LDFLAGS="-L${cmigemo}/lib"
+ export CPPFLAGS="-I${cmigemo}/include"
+ export LD_LIBRARY_PATH="${cmigemo}/lib"
+ '';
+
+ postPatch = ''
+ sed -i 's~dict_path_base = "/usr/share/cmigemo"~dict_path_base = "/${cmigemo}/share/migemo"~g' test/test_cmigemo.py
+ '';
+
+ checkInputs = [ pytestCheckHook ];
+
+ pytestFlagsArray = [ "test/" ];
+
+ pythonImportsCheck = [ "cmigemo" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/mooz/python-cmigemo";
+ description = "A pure python binding for C/Migemo";
+ license = licenses.mit;
+ maintainers = with maintainers; [ illustris ];
+ };
+}
diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix
index 4ea08c8a7b0..8bfe8ea2948 100644
--- a/pkgs/development/python-modules/cssutils/default.nix
+++ b/pkgs/development/python-modules/cssutils/default.nix
@@ -1,29 +1,43 @@
{ lib
, buildPythonPackage
-, isPy27
+, pythonOlder
, fetchPypi
+, setuptools-scm
+, toml
+, importlib-metadata
, mock
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "cssutils";
- version = "2.0.0";
+ version = "2.2.0";
- disabled = isPy27;
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "984b5dbe3a2a0483d7cb131609a17f4cbaa34dda306c419924858a88588fed7c";
+ sha256 = "5bef59f6b59bdccbea8e36cb292d2be1b6be1b485fc4a9f5886616f19eb31aaf";
};
+ nativeBuildInputs = [
+ setuptools-scm
+ toml
+ ];
+
+ propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
+ importlib-metadata
+ ];
+
checkInputs = [
mock
pytestCheckHook
];
disabledTests = [
- "test_parseUrl" # accesses network
+ # access network
+ "test_parseUrl"
+ "encutils"
];
pythonImportsCheck = [ "cssutils" ];
diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix
index d5f1445a677..025939f2db2 100644
--- a/pkgs/development/python-modules/digi-xbee/default.nix
+++ b/pkgs/development/python-modules/digi-xbee/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "digi-xbee";
- version = "1.3.0";
+ version = "1.4.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "2ed798faee0853bf7ae9ca5aa4bdcbab496e3c2d56c9f0719a8e3e0d13270891";
+ sha256 = "664737d1aab453ea40b9745f1ee1e88920acff1cce2e07c42e7f5aa64a16e6aa";
};
propagatedBuildInputs = [ pyserial srp ];
@@ -15,6 +15,24 @@ buildPythonPackage rec {
# Upstream doesn't contain unit tests, only functional tests which require specific hardware
doCheck = false;
+ pythonImportsCheck = [
+ "digi.xbee.models"
+ "digi.xbee.packets"
+ "digi.xbee.util"
+ "digi.xbee.comm_interface"
+ "digi.xbee.devices"
+ "digi.xbee.exception"
+ "digi.xbee.filesystem"
+ "digi.xbee.firmware"
+ "digi.xbee.io"
+ "digi.xbee.profile"
+ "digi.xbee.reader"
+ "digi.xbee.recovery"
+ "digi.xbee.sender"
+ "digi.xbee.serial"
+ "digi.xbee.xsocket"
+ ];
+
meta = with lib; {
description = "Python library to interact with Digi International's XBee radio frequency modules";
homepage = "https://github.com/digidotcom/xbee-python";
diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix
new file mode 100644
index 00000000000..c9344d3bd01
--- /dev/null
+++ b/pkgs/development/python-modules/django-cacheops/default.nix
@@ -0,0 +1,36 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, django
+, funcy
+, redis
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "django-cacheops";
+ version = "5.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-1YUc178whzhKH87PqN3bj1UDDu39b98SciW3W8oPmd0=";
+ };
+
+ propagatedBuildInputs = [
+ django
+ funcy
+ redis
+ six
+ ];
+
+ # tests need a redis server
+ # pythonImportsCheck not possible since DJANGO_SETTINGS_MODULE needs to be set
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A slick ORM cache with automatic granular event-driven invalidation for Django";
+ homepage = "https://github.com/Suor/django-cacheops";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ petabyteboy ];
+ };
+}
diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/pkgs/development/python-modules/django-simple-captcha/default.nix
index 0724bf27b31..2a7f1e1da26 100644
--- a/pkgs/development/python-modules/django-simple-captcha/default.nix
+++ b/pkgs/development/python-modules/django-simple-captcha/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "django-simple-captcha";
- version = "0.5.13";
+ version = "0.5.14";
src = fetchPypi {
inherit pname version;
- sha256 = "5e43ba3b61daf690ac0319157837bb57e31df8bddbdc9a59ef42ef1a99e21fa2";
+ sha256 = "84b5c188e6ae50e9ecec5e5d734c5bc4d2a50fbbca7f59d2c12da9a3bbee5051";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix
index d69ece809bb..ab1d551fea3 100644
--- a/pkgs/development/python-modules/drf-yasg/default.nix
+++ b/pkgs/development/python-modules/drf-yasg/default.nix
@@ -1,13 +1,15 @@
-{
- lib,
- buildPythonPackage,
- fetchPypi,
- inflection,
- ruamel_yaml,
- setuptools_scm,
- six,
- coreapi,
- djangorestframework,
+{ lib
+, buildPythonPackage
+, fetchPypi
+, inflection
+, ruamel_yaml
+, setuptools_scm
+, six
+, coreapi
+, djangorestframework
+, pytestCheckHook
+, pytest-django
+, datadiff
}:
buildPythonPackage rec {
@@ -19,6 +21,11 @@ buildPythonPackage rec {
sha256 = "d50f197c7f02545d0b736df88c6d5cf874f8fea2507ad85ad7de6ae5bf2d9e5a";
};
+ postPatch = ''
+ # https://github.com/axnsan12/drf-yasg/pull/710
+ substituteInPlace requirements/base.txt --replace packaging ""
+ '';
+
nativeBuildInputs = [
setuptools_scm
];
@@ -31,6 +38,17 @@ buildPythonPackage rec {
djangorestframework
];
+ checkInputs = [
+ pytestCheckHook
+ pytest-django
+ datadiff
+ ];
+
+ # ImportError: No module named 'testproj.settings'
+ doCheck = false;
+
+ pythonImportsCheck = [ "drf_yasg" ];
+
meta = with lib; {
description = "Generation of Swagger/OpenAPI schemas for Django REST Framework";
homepage = "https://github.com/axnsan12/drf-yasg";
diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix
index ed677466580..6d84aa9ae60 100644
--- a/pkgs/development/python-modules/ftputil/default.nix
+++ b/pkgs/development/python-modules/ftputil/default.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, freezegun }:
buildPythonPackage rec {
- version = "5.0.0";
+ version = "5.0.1";
pname = "ftputil";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "0dc82fa0a8ea385e8222b72bedb1ec31caac07822b6a1a9139adc98b0b051d06";
+ sha256 = "394997ccb3cd4825c6e22b5e349c62cf5016c35db4d60940f3513db66d205561";
};
checkInputs = [ pytest freezegun ];
diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix
index 2f5a1416e41..1ec6ce33420 100644
--- a/pkgs/development/python-modules/glances-api/default.nix
+++ b/pkgs/development/python-modules/glances-api/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "glances-api";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "home-assistant-ecosystem";
repo = "python-glances-api";
rev = version;
- sha256 = "0rgv77n0lvr7d3vk4qc8svipxafmm6s4lfxrl976hsygrhaqidch";
+ sha256 = "sha256-mbkZZg2fmus4kOXFxHE/UV/nxemFAsoEZu8IUa7SPsg=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index d583de9c074..cf456317f8c 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -13,6 +13,7 @@
, responses
, rsa
, six
+, pyopenssl
}:
buildPythonPackage rec {
@@ -24,7 +25,13 @@ buildPythonPackage rec {
sha256 = "0bmdqkyv8k8n6s8dss4zpbcq1cdxwicpb42kwybd02ia85mh43hb";
};
- propagatedBuildInputs = [ pyasn1-modules cachetools rsa six ];
+ propagatedBuildInputs = [
+ cachetools
+ pyasn1-modules
+ rsa
+ six
+ pyopenssl
+ ];
checkInputs = [
flask
diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix
new file mode 100644
index 00000000000..fdc28f08ef4
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-packaging/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, packaging
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "jupyter-packaging";
+ version = "0.7.12";
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-sUAyV3GIGn33t/LRSZe2GQY/51rnVrkCWFLkNGAAu7g=";
+ };
+
+ propagatedBuildInputs = [ packaging ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ # disable tests depending on network connection
+ disabledTests = [ "test_develop" "test_install" ];
+
+ pythonImportsCheck = [ "jupyter_packaging" ];
+
+ meta = with lib; {
+ description = "Jupyter Packaging Utilities";
+ homepage = "https://github.com/jupyter/jupyter-packaging";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.elohmeier ];
+ };
+}
diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix
index 372698744cf..712117d5011 100644
--- a/pkgs/development/python-modules/jupyter_console/default.nix
+++ b/pkgs/development/python-modules/jupyter_console/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "jupyter_console";
- version = "6.2.0";
+ version = "6.3.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "7f6194f4f4692d292da3f501c7f343ccd5e36c6a1becf7b7515e23e66d6bf1e9";
+ sha256 = "947f66bbdeee2221b4fb3a6b78225d337b8f10832f14cecf7932183635abe1d9";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix
new file mode 100644
index 00000000000..a9f98781b4f
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter_server/default.nix
@@ -0,0 +1,75 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, pytestCheckHook
+, pytest-tornasync
+, jinja2
+, tornado
+, pyzmq
+, ipython_genutils
+, traitlets
+, jupyter_core
+, jupyter_client
+, nbformat
+, nbconvert
+, send2trash
+, terminado
+, prometheus_client
+, anyio
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "jupyter_server";
+ version = "1.4.1";
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-sBJvI39nlTPuxGJEz8ZtYeOh+OwPrS1HNS+hnT51Tkc=";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "anyio>=2.0.2" "anyio"
+ '';
+
+ propagatedBuildInputs = [
+ jinja2
+ tornado
+ pyzmq
+ ipython_genutils
+ traitlets
+ jupyter_core
+ jupyter_client
+ nbformat
+ nbconvert
+ send2trash
+ terminado
+ prometheus_client
+ anyio
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-tornasync
+ requests
+ ];
+
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ pytestFlagsArray = [ "jupyter_server/tests/" ];
+
+ # disabled failing tests
+ disabledTests = [ "test_server_extension_list" "test_list_formats" "test_base_url" ];
+
+ meta = with lib; {
+ description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications.";
+ homepage = "https://github.com/jupyter-server/jupyter_server";
+ license = licenses.bsdOriginal;
+ maintainers = [ maintainers.elohmeier ];
+ };
+}
diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index ff725ce1829..81ad668db08 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -4,19 +4,21 @@
, jupyterlab_server
, notebook
, pythonOlder
+, jupyter-packaging
+, nbclassic
}:
buildPythonPackage rec {
pname = "jupyterlab";
- version = "2.2.9";
+ version = "3.0.11";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "3be8f8edea173753dd838c1b6d3bbcb6f5c801121f824a477025c1b6a1d33dc6";
+ sha256 = "sha256-zkz08xFjzlGu0BPAGoV8BdQ6k8Ru1pAWbkhkT255R94=";
};
- propagatedBuildInputs = [ jupyterlab_server notebook ];
+ propagatedBuildInputs = [ jupyterlab_server notebook jupyter-packaging nbclassic ];
makeWrapperArgs = [
"--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab"
diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix
index 3d9b5b9f831..c110cc0590f 100644
--- a/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_server/default.nix
@@ -1,34 +1,45 @@
{ lib
, buildPythonPackage
, fetchPypi
-, notebook
, jsonschema
, pythonOlder
, requests
-, pytest
+, pytestCheckHook
, pyjson5
+, Babel
+, jupyter_server
+, pytest-tornasync
+, pytestcov
+, strict-rfc3339
}:
buildPythonPackage rec {
pname = "jupyterlab_server";
- version = "1.2.0";
+ version = "2.3.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "5431d9dde96659364b7cc877693d5d21e7b80cea7ae3959ecc2b87518e5f5d8c";
+ sha256 = "sha256-56AkWqPeI6GAPeLv9AHkykWUU42fWYBhNPMEGabYtqM=";
};
- checkInputs = [ requests pytest ];
- propagatedBuildInputs = [ notebook jsonschema pyjson5 ];
+ propagatedBuildInputs = [ requests jsonschema pyjson5 Babel jupyter_server ];
- # test_listing test fails
- # this is a new package and not all tests pass
- doCheck = false;
+ checkInputs = [
+ pytestCheckHook
+ pytest-tornasync
+ pytestcov
+ strict-rfc3339
+ ];
- checkPhase = ''
- pytest
- '';
+ disabledTests = [
+ "test_get_locale"
+ "test_get_installed_language_pack_locales_passes"
+ "test_get_installed_package_locales"
+ "test_get_installed_packages_locale"
+ "test_get_language_packs"
+ "test_get_language_pack"
+ ];
meta = with lib; {
description = "JupyterLab Server";
diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix
index dbbe3d25212..71daa4bdbfa 100644
--- a/pkgs/development/python-modules/luftdaten/default.nix
+++ b/pkgs/development/python-modules/luftdaten/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "luftdaten";
- version = "0.6.4";
+ version = "0.6.5";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1w1f0kmiwslg1dxn7gq0ak8f5wajlwl03r5zklshjc11j34b4d5i";
+ sha256 = "sha256-5SFb+psULyg9UKVY3oJPNLF3TGS/W+Bxoj79iTzReL4=";
};
propagatedBuildInputs = [ aiohttp async-timeout ];
@@ -16,9 +16,11 @@ buildPythonPackage rec {
# No tests implemented
doCheck = false;
+ pythonImportsCheck = [ "luftdaten" ];
+
meta = with lib; {
description = "Python API for interacting with luftdaten.info";
- homepage = "https://github.com/fabaff/python-luftdaten";
+ homepage = "https://github.com/home-assistant-ecosystem/python-luftdaten";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
index 2e720f8ba7e..0b097024a55 100644
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "mat2";
- version = "0.12.0";
+ version = "0.12.1";
disabled = pythonOlder "3.5";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "jvoisin";
repo = "mat2";
rev = version;
- sha256 = "0amxwwmcf47dakfm6zvsksv6ja7rz7dpmd1z2rsspy8yds6zgxs7";
+ sha256 = "sha256-TxHelOr7ygp4R+dW+oJ034l2w9zrB4gn0QLs5Pa4EFE=";
};
patches = [
diff --git a/pkgs/development/python-modules/mplfinance/default.nix b/pkgs/development/python-modules/mplfinance/default.nix
new file mode 100644
index 00000000000..b1d0bf2b9aa
--- /dev/null
+++ b/pkgs/development/python-modules/mplfinance/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, matplotlib, pandas }:
+
+buildPythonPackage rec {
+ pname = "mplfinance";
+ version = "0.12.7a7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-pATiprTELt8GrEkeKjILPfpdNDVoex5t+Mc+6Gg7cPY=";
+ };
+
+ propagatedBuildInputs = [ matplotlib pandas ];
+
+ # tests are only included on GitHub where this version misses a tag
+ # and half of them fail
+ doCheck = false;
+
+ pythonImportsCheck = [ "mplfinance" ];
+
+ meta = with lib; {
+ description = "Matplotlib utilities for the visualization, and visual analysis, of financial data";
+ homepage = "https://github.com/matplotlib/mplfinance";
+ license = [ licenses.bsd3 ];
+ maintainers = [ maintainers.ehmry ];
+ };
+}
diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix
new file mode 100644
index 00000000000..3644b4e48dd
--- /dev/null
+++ b/pkgs/development/python-modules/nbclassic/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, notebook
+, pythonOlder
+, jupyter_server
+, pytestCheckHook
+, pytest-tornasync
+}:
+
+buildPythonPackage rec {
+ pname = "nbclassic";
+ version = "0.2.6";
+ disabled = pythonOlder "3.5";
+
+ # tests only on github
+ src = fetchFromGitHub {
+ owner = "jupyterlab";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-stp0LZJAOCrnObvJIPEVt8mMb8yL29nlHECypbTg3ec=";
+ };
+
+ propagatedBuildInputs = [ jupyter_server notebook ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-tornasync
+ ];
+
+ meta = with lib; {
+ description = "Jupyter lab environment notebook server extension.";
+ license = with licenses; [ bsd3 ];
+ homepage = "https://github.com/jupyterlab/nbclassic";
+ maintainers = [ maintainers.elohmeier ];
+ };
+}
diff --git a/pkgs/development/python-modules/netdata/default.nix b/pkgs/development/python-modules/netdata/default.nix
index f4e625b12b4..3b1ccbb73f7 100644
--- a/pkgs/development/python-modules/netdata/default.nix
+++ b/pkgs/development/python-modules/netdata/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "netdata";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "14kyjp1q3clizs1bqx4rp31d2awjmi5v65z8sarr2ycgwqqmkrzw";
+ sha256 = "sha256-oGOT4RvftI/2Ri2icM/AtglNZXt10jkFh/rlr6A46YE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index 17537be82b4..b3fd0384ef4 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -1,9 +1,11 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, fetchpatch
, pythonOlder
, pytestCheckHook
, setuptools
+, packaging
, toml
, structlog
, appdirs
@@ -19,18 +21,26 @@
buildPythonPackage rec {
pname = "nvchecker";
- version = "2.2";
+ version = "2.3";
# Tests not included in PyPI tarball
src = fetchFromGitHub {
owner = "lilydjwg";
repo = pname;
rev = "v${version}";
- sha256 = "0b17pikqyxcsid69lwnjl44n8z46ydjmxxdnbzasfdl7r83l7ijr";
+ sha256 = "0ikqjlw6v7va69i8qskj1lf07ik84q4n3qgsb7khk520gv2ks3sx";
};
+ patches = [
+ # Fix test that fail in sandbox build. See https://github.com/lilydjwg/nvchecker/pull/179
+ (fetchpatch {
+ url = "https://github.com/lilydjwg/nvchecker/commit/7366d82bfc3dcf231f7908e259bf2437cf7dafd5.patch";
+ sha256 = "0pwrwa2wyy4i668lk2mqzzy6y3xi08mq3w520b4954kfm07g75a9";
+ })
+ ];
+
nativeBuildInputs = [ installShellFiles docutils ];
- propagatedBuildInputs = [ setuptools toml structlog appdirs tornado pycurl aiohttp ];
+ propagatedBuildInputs = [ setuptools packaging toml structlog appdirs tornado pycurl aiohttp ];
checkInputs = [ pytestCheckHook pytest-asyncio flaky pytest-httpbin ];
disabled = pythonOlder "3.7";
diff --git a/pkgs/development/python-modules/opensensemap-api/default.nix b/pkgs/development/python-modules/opensensemap-api/default.nix
index d9f4cb6b1ad..8311cb6c57e 100644
--- a/pkgs/development/python-modules/opensensemap-api/default.nix
+++ b/pkgs/development/python-modules/opensensemap-api/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "opensensemap-api";
- version = "0.1.5";
+ version = "0.1.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1f3iqwl8ynvrkdd961v2hjsbldwbr217pv5pay2m5f0m974bhblx";
+ sha256 = "sha256-e60aVIoKFqo++WJHUYGutugkjB8YgyNQgJbILgAyOOY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix
new file mode 100644
index 00000000000..afca46ec8a8
--- /dev/null
+++ b/pkgs/development/python-modules/packageurl-python/default.nix
@@ -0,0 +1,22 @@
+{ buildPythonPackage, fetchPypi, lib, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "packageurl-python";
+ version = "0.9.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0mpvj8imsaqhrgfq1cxx16flc5201y78kqa7bh2i5zxsc29843mx";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "packageurl" ];
+
+ meta = with lib; {
+ description = "Python parser and builder for package URLs";
+ homepage = "https://github.com/package-url/packageurl-python";
+ license = licenses.mit;
+ maintainers = with maintainers; [ armijnhemel ];
+ };
+}
diff --git a/pkgs/development/python-modules/percol/default.nix b/pkgs/development/python-modules/percol/default.nix
index eddf58e559d..58e7aff5601 100644
--- a/pkgs/development/python-modules/percol/default.nix
+++ b/pkgs/development/python-modules/percol/default.nix
@@ -1,25 +1,26 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k
-, six
-}:
+{ lib, buildPythonPackage, fetchFromGitHub, cmigemo }:
buildPythonPackage rec {
pname = "percol";
- version = "0.2.1";
- disabled = isPy3k;
+ version = "unstable-2019-07-24";
- src = fetchPypi {
- inherit pname version;
- sha256 = "7a649c6fae61635519d12a6bcacc742241aad1bff3230baef2cedd693ed9cfe8";
+ src = fetchFromGitHub {
+ owner = "mooz";
+ repo = "percol";
+ rev = "4b28037e328da3d0fe8165c11b800cbaddcb525e";
+ sha256 = "07sq3517wzn04j2dzlmczmcvx3w6r7xnzz3634zgf1zi6dbr2a3g";
};
- propagatedBuildInputs = [ six ];
+ propagatedBuildInputs = [ cmigemo ];
+
+ # package has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "percol" ];
meta = with lib; {
homepage = "https://github.com/mooz/percol";
description = "Adds flavor of interactive filtering to the traditional pipe concept of shell";
license = licenses.mit;
maintainers = with maintainers; [ koral ];
- broken = true; # missing cmigemo package which is missing libmigemo.so
- # also doesn't support python3
};
}
diff --git a/pkgs/development/python-modules/privacyidea/default.nix b/pkgs/development/python-modules/privacyidea/default.nix
index 84cc4530b34..37f0a135993 100644
--- a/pkgs/development/python-modules/privacyidea/default.nix
+++ b/pkgs/development/python-modules/privacyidea/default.nix
@@ -1,22 +1,24 @@
-{ lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python
+{ lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python, nixosTests
, cryptography, pyrad, pymysql, python-dateutil, flask-versioned, flask_script
, defusedxml, croniter, flask_migrate, pyjwt, configobj, sqlsoup, pillow
, python-gnupg, passlib, pyopenssl, beautifulsoup4, smpplib, flask-babel
, ldap3, huey, pyyaml, qrcode, oauth2client, requests, lxml, cbor2, psycopg2
+, pydash
-, mock, pytest, responses, testfixtures
+, mock, pytestCheckHook, responses, testfixtures
}:
buildPythonPackage rec {
pname = "privacyIDEA";
- version = "3.3";
+ version = "3.5.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "188ki924dig899wlih45xfsm0s7mjkya56vii26bg02h91izrb4b";
+ sha256 = "sha256-XJnrrpU0x2Axu7W4G3oDTjSJuqEyh3C/0Aga5D0gw9k=";
+ fetchSubmodules = true;
};
propagatedBuildInputs = [
@@ -24,11 +26,24 @@ buildPythonPackage rec {
defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow
python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel
ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2
+ pydash
];
- checkInputs = [ openssl mock pytest responses testfixtures ];
- # issues with hardware token tests
- doCheck = false;
+ passthru.tests = { inherit (nixosTests) privacyidea; };
+
+ checkInputs = [ openssl mock pytestCheckHook responses testfixtures ];
+ disabledTests = [
+ "AESHardwareSecurityModuleTestCase"
+ "test_01_cert_request"
+ "test_01_loading_scripts"
+ "test_02_cert_enrolled"
+ "test_02_enroll_rights"
+ "test_02_get_resolvers"
+ "test_02_success"
+ "test_03_get_identifiers"
+ "test_04_remote_user_auth"
+ "test_14_convert_timestamp_to_utc"
+ ];
pythonImportsCheck = [ "privacyidea" ];
@@ -46,6 +61,6 @@ buildPythonPackage rec {
description = "Multi factor authentication system (2FA, MFA, OTP Server)";
license = licenses.agpl3Plus;
homepage = "http://www.privacyidea.org";
- maintainers = [ maintainers.globin ];
+ maintainers = with maintainers; [ globin ma27 ];
};
}
diff --git a/pkgs/development/python-modules/pydash/0001-Only-build-unit-tests.patch b/pkgs/development/python-modules/pydash/0001-Only-build-unit-tests.patch
new file mode 100644
index 00000000000..56a5ff39119
--- /dev/null
+++ b/pkgs/development/python-modules/pydash/0001-Only-build-unit-tests.patch
@@ -0,0 +1,30 @@
+From 2fe7a445bafedee2c43050e40697d8b0fd7f7b30 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch
+Date: Fri, 19 Mar 2021 19:37:34 +0100
+Subject: [PATCH] Only build unit-tests
+
+---
+ setup.cfg | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 2c2f49f..a5ec152 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -83,13 +83,6 @@ force_sort_within_sections = true
+ junit_family = xunit2
+ addopts =
+ --verbose
+- --doctest-modules
+- --no-cov-on-fail
+- --cov-fail-under=100
+- --cov-report=term-missing
+- --cov-report=xml:build/coverage/coverage.xml
+- --cov-report=html:build/coverage
+- --junitxml=build/testresults/junit.xml
+
+ [coverage:run]
+ omit =
+--
+2.29.3
+
diff --git a/pkgs/development/python-modules/pydash/default.nix b/pkgs/development/python-modules/pydash/default.nix
new file mode 100644
index 00000000000..7d75896397f
--- /dev/null
+++ b/pkgs/development/python-modules/pydash/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchFromGitHub, mock, pytestCheckHook, invoke }:
+
+buildPythonPackage rec {
+ pname = "pydash";
+ version = "4.9.3";
+
+ src = fetchFromGitHub {
+ owner = "dgilland";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-BAyiSnILvujUOFOAkiXSgyozs2Q809pYihHwa+6BHcQ=";
+ };
+
+ patches = [ ./0001-Only-build-unit-tests.patch ];
+
+ checkInputs = [ mock pytestCheckHook invoke ];
+
+ meta = with lib; {
+ homepage = "https://github.com/dgilland/pydash";
+ description = "The kitchen sink of Python utility libraries for doing \"stuff\" in a functional way. Based on the Lo-Dash Javascript library.";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ma27 ];
+ };
+}
diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix
index 01550080d74..fc6b716397d 100644
--- a/pkgs/development/python-modules/pytest-dependency/default.nix
+++ b/pkgs/development/python-modules/pytest-dependency/default.nix
@@ -9,6 +9,14 @@ buildPythonPackage rec {
sha256 = "c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b";
};
+ patches = [
+ # Fix build with pytest ≥ 6.2.0, https://github.com/RKrahl/pytest-dependency/pull/51
+ (fetchpatch {
+ url = "https://github.com/RKrahl/pytest-dependency/commit/0930889a13e2b9baa7617f05dc9b55abede5209d.patch";
+ sha256 = "0ka892j0rrlnfvk900fcph0f6lsnr9dy06q5k2s2byzwijhdw6n5";
+ })
+ ];
+
buildInputs = [ pytest ];
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/python-opendata-transport/default.nix b/pkgs/development/python-modules/python-opendata-transport/default.nix
index 634ccea371e..906f0843980 100644
--- a/pkgs/development/python-modules/python-opendata-transport/default.nix
+++ b/pkgs/development/python-modules/python-opendata-transport/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "python-opendata-transport";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchPypi {
pname = "python_opendata_transport";
inherit version;
- sha256 = "0pxs9zqk00vn1s74cx1416mqmixrr74wb0jb0j6b1c3xpvzlfbks";
+ sha256 = "sha256-Z0VHkKYHpwbBwwFrMtA5JRy0m7f0566IjCmGizoKEoo=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-prctl/default.nix b/pkgs/development/python-modules/python-prctl/default.nix
index 2fd88858de7..dc967b54305 100644
--- a/pkgs/development/python-modules/python-prctl/default.nix
+++ b/pkgs/development/python-modules/python-prctl/default.nix
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, libcap
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -13,9 +14,25 @@ buildPythonPackage rec {
sha256 = "b4ca9a25a7d4f1ace4fffd1f3a2e64ef5208fe05f929f3edd5e27081ca7e67ce";
};
- patches = [ ./skip_bad_tests.patch ];
buildInputs = [ libcap ];
+ checkInputs = [ pytestCheckHook ];
+
+ disabledTests = [
+ # Intel MPX support was removed in GCC 9.1 & Linux kernel 5.6
+ "test_mpx"
+
+ # The Nix build sandbox has no_new_privs already enabled
+ "test_no_new_privs"
+
+ # The Nix build sandbox has seccomp already enabled
+ "test_seccomp"
+
+ # This will fail if prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_FORCE_DISABLE)
+ # has been set system-wide, even outside the sandbox
+ "test_speculation_ctrl"
+ ];
+
meta = {
description = "Python(ic) interface to the linux prctl syscall";
homepage = "https://github.com/seveas/python-prctl";
diff --git a/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch b/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch
deleted file mode 100644
index 19d70f234a9..00000000000
--- a/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./test_prctl.py 2018-01-26 16:02:52.000000000 -0500
-+++ ./test_prctl.py 2018-06-21 18:26:43.370065009 -0400
-@@ -154,6 +154,7 @@
- prctl.set_keepcaps(False)
- self.assertEqual(prctl.get_keepcaps(), False)
-
-+ @unittest.skip("No access to /proc in the Nix build sandbox")
- @require('set_mce_kill')
- def test_mce_kill(self):
- """Test the MCE_KILL setting"""
-@@ -173,6 +174,7 @@
- prctl.set_name(name)
- self.assertEqual(prctl.get_name(), name[:15])
-
-+ @unittest.skip("The Nix build sandbox has no_new_privs already enabled")
- @require('get_no_new_privs')
- def test_no_new_privs(self):
- """Test the no_new_privs function"""
-@@ -189,6 +191,7 @@
- self.assertNotEqual(sp.returncode, 0)
- os._exit(0)
-
-+ @unittest.skip("No access to /proc in the Nix build sandbox")
- def test_proctitle(self):
- """Test setting the process title, including too long titles"""
- title = "This is a test!"
-@@ -225,6 +228,7 @@
- os._exit(0)
- self.assertRaises(OSError, prctl.set_ptracer, new_pid)
-
-+ @unittest.skip("The Nix build sandbox has seccomp already enabled")
- @require('get_seccomp')
- def test_seccomp(self):
- """Test manipulation of the seccomp setting"""
diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix
new file mode 100644
index 00000000000..5b8925b0a4c
--- /dev/null
+++ b/pkgs/development/python-modules/simplisafe-python/default.nix
@@ -0,0 +1,61 @@
+{ lib
+, aiohttp
+, aresponses
+, asynctest
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytest-asyncio
+, pytest-cov
+, pytestCheckHook
+, python-engineio
+, python-socketio
+, pythonOlder
+, pytz
+, voluptuous
+, websockets
+}:
+
+buildPythonPackage rec {
+ pname = "simplisafe-python";
+ version = "9.6.9";
+ format = "pyproject";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "bachya";
+ repo = pname;
+ rev = version;
+ sha256 = "1q5w5pvrgj94bzd5wig79l4hipkfrcdah54rvwyi7b8q46gw77sg";
+ };
+
+ nativeBuildInputs = [ poetry-core ];
+
+ propagatedBuildInputs = [
+ aiohttp
+ python-engineio
+ python-socketio
+ pytz
+ voluptuous
+ websockets
+ ];
+
+ checkInputs = [
+ aresponses
+ asynctest
+ pytest-asyncio
+ pytest-cov
+ pytestCheckHook
+ ];
+
+ disabledTestPaths = [ "examples/" ];
+
+ pythonImportsCheck = [ "simplipy" ];
+
+ meta = with lib; {
+ description = "Python library the SimpliSafe API";
+ homepage = "https://simplisafe-python.readthedocs.io/";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/volkszaehler/default.nix b/pkgs/development/python-modules/volkszaehler/default.nix
index b86394bc2b6..6bd509d7cd4 100644
--- a/pkgs/development/python-modules/volkszaehler/default.nix
+++ b/pkgs/development/python-modules/volkszaehler/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "volkszaehler";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "13zhxq08wn5y9yn6xbazfl0gxxysmirwpc26wcnr6jk2va1kpc4l";
+ sha256 = "sha256-1oqzhC3Yq2V30F3ilr80vKFnTmI/CdIVLuzMlIr40xI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix
index db876ea09f2..a65a9276add 100644
--- a/pkgs/development/tools/go-mockery/default.nix
+++ b/pkgs/development/tools/go-mockery/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-mockery";
- version = "2.5.1";
+ version = "2.7.4";
src = fetchFromGitHub {
owner = "vektra";
repo = "mockery";
rev = "v${version}";
- sha256 = "5W5WGWqxpZzOqk1VOlLeggIqfneRb7s7ZT5faNEhDos=";
+ sha256 = "sha256-St8QgUZUU7THM9H8i7Z+bgKu9LhXhUqH/B14LGmDCn0=";
};
- vendorSha256 = "//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA=";
+ vendorSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA=";
meta = with lib; {
homepage = "https://github.com/vektra/mockery";
diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix
index 37763c72609..1e1e3b66101 100644
--- a/pkgs/development/tools/jbang/default.nix
+++ b/pkgs/development/tools/jbang/default.nix
@@ -1,12 +1,12 @@
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
stdenv.mkDerivation rec {
- version = "0.67.1";
+ version = "0.67.3";
pname = "jbang";
src = fetchzip {
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
- sha256 = "sha256-ZwjgdOmpLl2kTpQU1mqfwq0nBLmK/Ej5ckDItQWeDKY=";
+ sha256 = "sha256-/3kQnHshmf3ZnA4xQNJaXeThFvk/SKq0/B6BaTv5Yws=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix
new file mode 100644
index 00000000000..d31c030edac
--- /dev/null
+++ b/pkgs/development/tools/trunk/default.nix
@@ -0,0 +1,25 @@
+{ rustPlatform, fetchFromGitHub, pkg-config, openssl, lib }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "trunk";
+ version = "0.10.0";
+
+ src = fetchFromGitHub {
+ owner = "thedodd";
+ repo = "trunk";
+ rev = "v${version}";
+ sha256 = "W6d05MKquG1QFkvofqWk94+6j5q8yuAjNgZFG3Z3kNo=";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ openssl ];
+
+ cargoSha256 = "Qv7knTmNYtw0tbyWhFIV7tYkQiwFxcNPAeNiGCyeV8s=";
+
+ meta = with lib; {
+ homepage = "https://github.com/thedodd/trunk";
+ description = "Build, bundle & ship your Rust WASM application to the web";
+ maintainers = with maintainers; [ freezeboy ];
+ license = with licenses; [ asl20 ];
+ };
+}
diff --git a/pkgs/development/tools/xcode-install/Gemfile b/pkgs/development/tools/xcode-install/Gemfile
new file mode 100644
index 00000000000..b9d313ce14f
--- /dev/null
+++ b/pkgs/development/tools/xcode-install/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'xcode-install'
diff --git a/pkgs/development/tools/xcode-install/Gemfile.lock b/pkgs/development/tools/xcode-install/Gemfile.lock
new file mode 100644
index 00000000000..589543fe47d
--- /dev/null
+++ b/pkgs/development/tools/xcode-install/Gemfile.lock
@@ -0,0 +1,204 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ CFPropertyList (3.0.3)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
+ artifactory (3.0.15)
+ atomos (0.1.3)
+ aws-eventstream (1.1.0)
+ aws-partitions (1.419.0)
+ aws-sdk-core (3.111.2)
+ aws-eventstream (~> 1, >= 1.0.2)
+ aws-partitions (~> 1, >= 1.239.0)
+ aws-sigv4 (~> 1.1)
+ jmespath (~> 1.0)
+ aws-sdk-kms (1.41.0)
+ aws-sdk-core (~> 3, >= 3.109.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-s3 (1.87.0)
+ aws-sdk-core (~> 3, >= 3.109.0)
+ aws-sdk-kms (~> 1)
+ aws-sigv4 (~> 1.1)
+ aws-sigv4 (1.2.2)
+ aws-eventstream (~> 1, >= 1.0.2)
+ babosa (1.0.4)
+ claide (1.0.3)
+ colored (1.2)
+ colored2 (3.1.2)
+ commander-fastlane (4.4.6)
+ highline (~> 1.7.2)
+ declarative (0.0.20)
+ declarative-option (0.1.0)
+ digest-crc (0.6.3)
+ rake (>= 12.0.0, < 14.0.0)
+ domain_name (0.5.20190701)
+ unf (>= 0.0.5, < 1.0.0)
+ dotenv (2.7.6)
+ emoji_regex (3.2.1)
+ excon (0.78.1)
+ faraday (1.3.0)
+ faraday-net_http (~> 1.0)
+ multipart-post (>= 1.2, < 3)
+ ruby2_keywords
+ faraday-cookie_jar (0.0.7)
+ faraday (>= 0.8.0)
+ http-cookie (~> 1.0.0)
+ faraday-net_http (1.0.1)
+ faraday_middleware (1.0.0)
+ faraday (~> 1.0)
+ fastimage (2.2.1)
+ fastlane (2.172.0)
+ CFPropertyList (>= 2.3, < 4.0.0)
+ addressable (>= 2.3, < 3.0.0)
+ artifactory (~> 3.0)
+ aws-sdk-s3 (~> 1.0)
+ babosa (>= 1.0.3, < 2.0.0)
+ bundler (>= 1.12.0, < 3.0.0)
+ colored
+ commander-fastlane (>= 4.4.6, < 5.0.0)
+ dotenv (>= 2.1.1, < 3.0.0)
+ emoji_regex (>= 0.1, < 4.0)
+ excon (>= 0.71.0, < 1.0.0)
+ faraday (~> 1.0)
+ faraday-cookie_jar (~> 0.0.6)
+ faraday_middleware (~> 1.0)
+ fastimage (>= 2.1.0, < 3.0.0)
+ gh_inspector (>= 1.1.2, < 2.0.0)
+ google-api-client (>= 0.37.0, < 0.39.0)
+ google-cloud-storage (>= 1.15.0, < 2.0.0)
+ highline (>= 1.7.2, < 2.0.0)
+ json (< 3.0.0)
+ jwt (>= 2.1.0, < 3)
+ mini_magick (>= 4.9.4, < 5.0.0)
+ multipart-post (~> 2.0.0)
+ plist (>= 3.1.0, < 4.0.0)
+ rubyzip (>= 2.0.0, < 3.0.0)
+ security (= 0.1.3)
+ simctl (~> 1.6.3)
+ slack-notifier (>= 2.0.0, < 3.0.0)
+ terminal-notifier (>= 2.0.0, < 3.0.0)
+ terminal-table (>= 1.4.5, < 2.0.0)
+ tty-screen (>= 0.6.3, < 1.0.0)
+ tty-spinner (>= 0.8.0, < 1.0.0)
+ word_wrap (~> 1.0.0)
+ xcodeproj (>= 1.13.0, < 2.0.0)
+ xcpretty (~> 0.3.0)
+ xcpretty-travis-formatter (>= 0.0.3)
+ gh_inspector (1.1.3)
+ google-api-client (0.38.0)
+ addressable (~> 2.5, >= 2.5.1)
+ googleauth (~> 0.9)
+ httpclient (>= 2.8.1, < 3.0)
+ mini_mime (~> 1.0)
+ representable (~> 3.0)
+ retriable (>= 2.0, < 4.0)
+ signet (~> 0.12)
+ google-apis-core (0.2.1)
+ addressable (~> 2.5, >= 2.5.1)
+ googleauth (~> 0.14)
+ httpclient (>= 2.8.1, < 3.0)
+ mini_mime (~> 1.0)
+ representable (~> 3.0)
+ retriable (>= 2.0, < 4.0)
+ rexml
+ signet (~> 0.14)
+ webrick
+ google-apis-iamcredentials_v1 (0.1.0)
+ google-apis-core (~> 0.1)
+ google-apis-storage_v1 (0.1.0)
+ google-apis-core (~> 0.1)
+ google-cloud-core (1.5.0)
+ google-cloud-env (~> 1.0)
+ google-cloud-errors (~> 1.0)
+ google-cloud-env (1.4.0)
+ faraday (>= 0.17.3, < 2.0)
+ google-cloud-errors (1.0.1)
+ google-cloud-storage (1.30.0)
+ addressable (~> 2.5)
+ digest-crc (~> 0.4)
+ google-apis-iamcredentials_v1 (~> 0.1)
+ google-apis-storage_v1 (~> 0.1)
+ google-cloud-core (~> 1.2)
+ googleauth (~> 0.9)
+ mini_mime (~> 1.0)
+ googleauth (0.15.0)
+ faraday (>= 0.17.3, < 2.0)
+ jwt (>= 1.4, < 3.0)
+ memoist (~> 0.16)
+ multi_json (~> 1.11)
+ os (>= 0.9, < 2.0)
+ signet (~> 0.14)
+ highline (1.7.10)
+ http-cookie (1.0.3)
+ domain_name (~> 0.5)
+ httpclient (2.8.3)
+ jmespath (1.4.0)
+ json (2.5.1)
+ jwt (2.2.2)
+ memoist (0.16.2)
+ mini_magick (4.11.0)
+ mini_mime (1.0.2)
+ multi_json (1.15.0)
+ multipart-post (2.0.0)
+ nanaimo (0.3.0)
+ naturally (2.2.1)
+ os (1.1.1)
+ plist (3.6.0)
+ public_suffix (4.0.6)
+ rake (13.0.3)
+ representable (3.0.4)
+ declarative (< 0.1.0)
+ declarative-option (< 0.2.0)
+ uber (< 0.2.0)
+ retriable (3.1.2)
+ rexml (3.2.4)
+ rouge (2.0.7)
+ ruby2_keywords (0.0.4)
+ rubyzip (2.3.0)
+ security (0.1.3)
+ signet (0.14.0)
+ addressable (~> 2.3)
+ faraday (>= 0.17.3, < 2.0)
+ jwt (>= 1.5, < 3.0)
+ multi_json (~> 1.10)
+ simctl (1.6.8)
+ CFPropertyList
+ naturally
+ slack-notifier (2.3.2)
+ terminal-notifier (2.0.0)
+ terminal-table (1.8.0)
+ unicode-display_width (~> 1.1, >= 1.1.1)
+ tty-cursor (0.7.1)
+ tty-screen (0.8.1)
+ tty-spinner (0.9.3)
+ tty-cursor (~> 0.7)
+ uber (0.1.0)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.7.7)
+ unicode-display_width (1.7.0)
+ webrick (1.7.0)
+ word_wrap (1.0.0)
+ xcode-install (2.6.8)
+ claide (>= 0.9.1, < 1.1.0)
+ fastlane (>= 2.1.0, < 3.0.0)
+ xcodeproj (1.19.0)
+ CFPropertyList (>= 2.3.3, < 4.0)
+ atomos (~> 0.1.3)
+ claide (>= 1.0.2, < 2.0)
+ colored2 (~> 3.1)
+ nanaimo (~> 0.3.0)
+ xcpretty (0.3.0)
+ rouge (~> 2.0.7)
+ xcpretty-travis-formatter (1.0.1)
+ xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ xcode-install
+
+BUNDLED WITH
+ 1.17.2
diff --git a/pkgs/development/tools/xcode-install/default.nix b/pkgs/development/tools/xcode-install/default.nix
new file mode 100644
index 00000000000..677217b5c81
--- /dev/null
+++ b/pkgs/development/tools/xcode-install/default.nix
@@ -0,0 +1,17 @@
+{ lib
+, bundlerApp
+}:
+
+bundlerApp {
+ pname = "xcode-install";
+ gemdir = ./.;
+ exes = [ "xcversion" ];
+
+ meta = with lib; {
+ description = "Install and update your Xcodes automatically";
+ homepage = "https://github.com/xcpretty/xcode-install";
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ q3k ];
+ license = with licenses; [ mit ];
+ };
+}
diff --git a/pkgs/development/tools/xcode-install/gemset.nix b/pkgs/development/tools/xcode-install/gemset.nix
new file mode 100644
index 00000000000..c6355de34a2
--- /dev/null
+++ b/pkgs/development/tools/xcode-install/gemset.nix
@@ -0,0 +1,833 @@
+{
+ addressable = {
+ dependencies = ["public_suffix"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+ type = "gem";
+ };
+ version = "2.7.0";
+ };
+ artifactory = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wify8rhjwr5bw5y6ary61vba290vk766cxw9a9mg05yswmaisls";
+ type = "gem";
+ };
+ version = "3.0.15";
+ };
+ atomos = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17vq6sjyswr5jfzwdccw748kgph6bdw30bakwnn6p8sl4hpv4hvx";
+ type = "gem";
+ };
+ version = "0.1.3";
+ };
+ aws-eventstream = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ aws-partitions = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vz0djj8w3ns0sz5gvkla5jml8xzx6skbcfj255m81fyww1x6ws8";
+ type = "gem";
+ };
+ version = "1.419.0";
+ };
+ aws-sdk-core = {
+ dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4";
+ type = "gem";
+ };
+ version = "3.111.2";
+ };
+ aws-sdk-kms = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm";
+ type = "gem";
+ };
+ version = "1.41.0";
+ };
+ aws-sdk-s3 = {
+ dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7";
+ type = "gem";
+ };
+ version = "1.87.0";
+ };
+ aws-sigv4 = {
+ dependencies = ["aws-eventstream"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5";
+ type = "gem";
+ };
+ version = "1.2.2";
+ };
+ babosa = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "16dwqn33kmxkqkv51cwiikdkbrdjfsymlnc0rgbjwilmym8a9phq";
+ type = "gem";
+ };
+ version = "1.0.4";
+ };
+ CFPropertyList = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4";
+ type = "gem";
+ };
+ version = "3.0.3";
+ };
+ claide = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
+ colored = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx";
+ type = "gem";
+ };
+ version = "1.2";
+ };
+ colored2 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i";
+ type = "gem";
+ };
+ version = "3.1.2";
+ };
+ commander-fastlane = {
+ dependencies = ["highline"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65";
+ type = "gem";
+ };
+ version = "4.4.6";
+ };
+ declarative = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0";
+ type = "gem";
+ };
+ version = "0.0.20";
+ };
+ declarative-option = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ digest-crc = {
+ dependencies = ["rake"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "118d5p02kdw6a5pi8af12dxma7q3b77zz5q5xjjf5kgp8qh1930a";
+ type = "gem";
+ };
+ version = "0.6.3";
+ };
+ domain_name = {
+ dependencies = ["unf"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
+ type = "gem";
+ };
+ version = "0.5.20190701";
+ };
+ dotenv = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94";
+ type = "gem";
+ };
+ version = "2.7.6";
+ };
+ emoji_regex = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qbzlracxw4xwyvrgr0qcl1alk4ijk6pv53ni6f43csi649y3n3s";
+ type = "gem";
+ };
+ version = "3.2.1";
+ };
+ excon = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "16ij8617v3js03yj1zd32mmrf7kpi9l96bid5mpqk30c4mzai55r";
+ type = "gem";
+ };
+ version = "0.78.1";
+ };
+ faraday = {
+ dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
+ faraday-cookie_jar = {
+ dependencies = ["faraday" "http-cookie"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk";
+ type = "gem";
+ };
+ version = "0.0.7";
+ };
+ faraday-net_http = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ faraday_middleware = {
+ dependencies = ["faraday"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ fastimage = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vqp53s9vgd28f4l17q0vs7xv32y64af0ny3wb1fgg4i534rzg6j";
+ type = "gem";
+ };
+ version = "2.2.1";
+ };
+ fastlane = {
+ dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "plist" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0crr42qdgy9l409pffpfs7nq8ha18lp1nxngny2dc9hiq1xx4r5d";
+ type = "gem";
+ };
+ version = "2.172.0";
+ };
+ gh_inspector = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04";
+ type = "gem";
+ };
+ version = "1.1.3";
+ };
+ google-api-client = {
+ dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1jybks8i00rxrxx9mkx90dbdk6pczh2w757wchlavmrkrk0dp9s1";
+ type = "gem";
+ };
+ version = "0.38.0";
+ };
+ google-apis-core = {
+ dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet" "webrick"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "184pqw7z7s8mc1r5gj8f76xvp8z650xq50vdfj5gjwsbmzd99z2f";
+ type = "gem";
+ };
+ version = "0.2.1";
+ };
+ google-apis-iamcredentials_v1 = {
+ dependencies = ["google-apis-core"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xjlzq2fxpwvp9b6ajs8cpyjv8vs2d2npg9v23yj181hj2fnn82c";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ google-apis-storage_v1 = {
+ dependencies = ["google-apis-core"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0axycds5q20fqm6vqxa5r922021p0f8jhwvlgw8r1vq600ljribi";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ google-cloud-core = {
+ dependencies = ["google-cloud-env" "google-cloud-errors"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1qjn7vs8f85vxi1nkikbjfja6bv9snrj26vzscjii0cm8n4dy0i1";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ google-cloud-env = {
+ dependencies = ["faraday"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ google-cloud-errors = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hvs1x39g77hbdqjxmzcl6gq8160pv3kskvzbbch0ww1np6qwm67";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+ google-cloud-storage = {
+ dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17axi5gmy0g04801v11lww5mvqzffqdc3w6k1j7f95v90hy4yn6m";
+ type = "gem";
+ };
+ version = "1.30.0";
+ };
+ googleauth = {
+ dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1pwm0mzb5zffhk6yw4v3n1yj8qr6jla6f78vsv4g0bxh9z0ikc2z";
+ type = "gem";
+ };
+ version = "0.15.0";
+ };
+ highline = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
+ type = "gem";
+ };
+ version = "1.7.10";
+ };
+ http-cookie = {
+ dependencies = ["domain_name"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
+ httpclient = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
+ type = "gem";
+ };
+ version = "2.8.3";
+ };
+ jmespath = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
+ type = "gem";
+ };
+ version = "1.4.0";
+ };
+ json = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
+ type = "gem";
+ };
+ version = "2.5.1";
+ };
+ jwt = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n";
+ type = "gem";
+ };
+ version = "2.2.2";
+ };
+ memoist = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55";
+ type = "gem";
+ };
+ version = "0.16.2";
+ };
+ mini_magick = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs";
+ type = "gem";
+ };
+ version = "4.11.0";
+ };
+ mini_mime = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
+ type = "gem";
+ };
+ version = "1.0.2";
+ };
+ multi_json = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+ type = "gem";
+ };
+ version = "1.15.0";
+ };
+ multipart-post = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+ type = "gem";
+ };
+ version = "2.0.0";
+ };
+ nanaimo = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma";
+ type = "gem";
+ };
+ version = "0.3.0";
+ };
+ naturally = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04x1nkx6gkqzlc4phdvq05v3vjds6mgqhjqzqpcs6vdh5xyqrf59";
+ type = "gem";
+ };
+ version = "2.2.1";
+ };
+ os = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x";
+ type = "gem";
+ };
+ version = "1.1.1";
+ };
+ plist = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l";
+ type = "gem";
+ };
+ version = "3.6.0";
+ };
+ public_suffix = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
+ type = "gem";
+ };
+ version = "4.0.6";
+ };
+ rake = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
+ type = "gem";
+ };
+ version = "13.0.3";
+ };
+ representable = {
+ dependencies = ["declarative" "declarative-option" "uber"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07";
+ type = "gem";
+ };
+ version = "3.0.4";
+ };
+ retriable = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha";
+ type = "gem";
+ };
+ version = "3.1.2";
+ };
+ rexml = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
+ type = "gem";
+ };
+ version = "3.2.4";
+ };
+ rouge = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d";
+ type = "gem";
+ };
+ version = "2.0.7";
+ };
+ ruby2_keywords = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
+ type = "gem";
+ };
+ version = "0.0.4";
+ };
+ rubyzip = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";
+ type = "gem";
+ };
+ version = "2.3.0";
+ };
+ security = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ryjxs0j66wrbky2c08yf0mllwalvpg12rpxzbdx2rdhj3cbrlxa";
+ type = "gem";
+ };
+ version = "0.1.3";
+ };
+ signet = {
+ dependencies = ["addressable" "faraday" "jwt" "multi_json"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10g2667fvxnc50hcd1aywgsbf8j7nrckg3n7zjvywmyz82pwmpqp";
+ type = "gem";
+ };
+ version = "0.14.0";
+ };
+ simctl = {
+ dependencies = ["CFPropertyList" "naturally"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1v9rsdmg5c5kkf8ps47xnrfbvjnq11sbaifr186jwkh4npawz00x";
+ type = "gem";
+ };
+ version = "1.6.8";
+ };
+ slack-notifier = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv";
+ type = "gem";
+ };
+ version = "2.3.2";
+ };
+ terminal-notifier = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1slc0y8pjpw30hy21v8ypafi8r7z9jlj4bjbgz03b65b28i2n3bs";
+ type = "gem";
+ };
+ version = "2.0.0";
+ };
+ terminal-table = {
+ dependencies = ["unicode-display_width"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
+ type = "gem";
+ };
+ version = "1.8.0";
+ };
+ tty-cursor = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr";
+ type = "gem";
+ };
+ version = "0.7.1";
+ };
+ tty-screen = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235";
+ type = "gem";
+ };
+ version = "0.8.1";
+ };
+ tty-spinner = {
+ dependencies = ["tty-cursor"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf";
+ type = "gem";
+ };
+ version = "0.9.3";
+ };
+ uber = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ unf = {
+ dependencies = ["unf_ext"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+ type = "gem";
+ };
+ version = "0.1.4";
+ };
+ unf_ext = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
+ type = "gem";
+ };
+ version = "0.0.7.7";
+ };
+ unicode-display_width = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
+ type = "gem";
+ };
+ version = "1.7.0";
+ };
+ webrick = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7";
+ type = "gem";
+ };
+ version = "1.7.0";
+ };
+ word_wrap = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1iyc5bc7dbgsd8j3yk1i99ral39f23l6wapi0083fbl19hid8mpm";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ xcode-install = {
+ dependencies = ["claide" "fastlane"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1yhslanqw8r0mhls2hira05c8xjzzr7mnz1ab9p5qwg4z45ddjj8";
+ type = "gem";
+ };
+ version = "2.6.8";
+ };
+ xcodeproj = {
+ dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn";
+ type = "gem";
+ };
+ version = "1.19.0";
+ };
+ xcpretty = {
+ dependencies = ["rouge"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm";
+ type = "gem";
+ };
+ version = "0.3.0";
+ };
+ xcpretty-travis-formatter = {
+ dependencies = ["xcpretty"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14rg4f70klrs910n7rsgfa4dn8s2qyny55194ax2qyyb2wpk7k5a";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
+}
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 1bebf922c48..5cb28b3f3bd 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
- sha256 = "04x7729hk6zw1xj3n4s4lvaviijsnbjf5rhzvjxlr5fygvg4l6z1";
+ sha256 = "0b53jzl64i49rk3n3c3x0hibwbl7vih2xym8jq5s56klg61qdxa1";
};
installPhase = ''
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 1ba975aa885..bb3b7c0138a 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -1,29 +1,45 @@
-{ stdenv, lib, perl, fetchurl, python2
-, pkg-config, spidermonkey_38, boost, icu, libxml2, libpng, libsodium
+{ stdenv, lib, perl, fetchurl, python2, fmt, libidn
+, pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2
-, gloox, nvidia-texture-tools
-, withEditor ? true, wxGTK ? null
+, gloox, nvidia-texture-tools, zeroad-data
+, withEditor ? true, wxGTK
}:
-assert withEditor -> wxGTK != null;
+# You can find more instructions on how to build 0ad here:
+# https://trac.wildfiregames.com/wiki/BuildInstructions
+let
+ # the game requires a special version 78.6.0 of spidermonkey, otherwise
+ # we get compilation errors. We override the src attribute of spidermonkey_78
+ # in order to reuse that declartion, while giving it a different source input.
+ spidermonkey_78_6 = spidermonkey_78.overrideAttrs(old: rec {
+ version = "78.6.0";
+ src = fetchurl {
+ url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
+ sha256 = "0lyg65v380j8i2lrylwz8a5ya80822l8vcnlx3dfqpd3s6zzjsay";
+ };
+ patches = (old.patches or []) ++ [
+ ./spidermonkey-cargo-toml.patch
+ ];
+ });
+in
stdenv.mkDerivation rec {
pname = "0ad";
- version = "0.0.23b";
+ version = "0.0.24b";
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
- sha256 = "0draa53xg69i5qhqym85658m45xhwkbiimaldj4sr3703rjgggq1";
+ sha256 = "1a1py45hkh2cswi09vbf9chikgxdv9xplsmg6sv6xhdznv4j6p1j";
};
nativeBuildInputs = [ python2 perl pkg-config ];
buildInputs = [
- spidermonkey_38 boost icu libxml2 libpng libjpeg
- zlib curl libogg libvorbis enet miniupnpc openal
+ spidermonkey_78_6 boost icu libxml2 libpng libjpeg
+ zlib curl libogg libvorbis enet miniupnpc openal libidn
libGLU libGL xorgproto libX11 libXcursor nspr SDL2 gloox
- nvidia-texture-tools libsodium
+ nvidia-texture-tools libsodium fmt
] ++ lib.optional withEditor wxGTK;
NIX_CFLAGS_COMPILE = toString [
@@ -31,35 +47,22 @@ stdenv.mkDerivation rec {
"-I${libX11.dev}/include/X11"
"-I${libXcursor.dev}/include/X11"
"-I${SDL2}/include/SDL2"
- ];
-
- patches = [
- ./rootdir_env.patch
- # Fixes build with spidermonkey-38.8.0, includes the minor version check:
- # https://src.fedoraproject.org/rpms/0ad/c/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b
- (fetchurl {
- url = "https://src.fedoraproject.org/rpms/0ad/raw/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b/f/0ad-mozjs-incompatible.patch";
- sha256 = "1rzpaalcrzihsgvlk3nqd87n2kxjldlwvb3qp5fcd5ffzr6k90wa";
- })
+ "-I${fmt.dev}/include"
];
configurePhase = ''
# Delete shipped libraries which we don't need.
rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey}
- # Workaround invalid pkg-config name for mozjs
- mkdir pkg-config
- ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc
- PKG_CONFIG_PATH="$PWD/pkg-config:$PKG_CONFIG_PATH"
-
# Update Makefiles
pushd build/workspaces
./update-workspaces.sh \
--with-system-nvtt \
- --with-system-mozjs38 \
+ --with-system-mozjs \
${lib.optionalString withEditor "--enable-atlas"} \
--bindir="$out"/bin \
--libdir="$out"/lib/0ad \
+ --datadir="$out"/share/0ad/data \
--without-tests \
-j $NIX_BUILD_CORES
popd
@@ -82,6 +85,11 @@ stdenv.mkDerivation rec {
# Copy l10n data.
install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/*
+ # Link in game data from package
+ ln -s ${zeroad-data}/share/0ad/data/config $out/share/0ad/data/config
+ ln -s ${zeroad-data}/share/0ad/data/mods $out/share/0ad/data/mods
+ ln -s ${zeroad-data}/share/0ad/data/tools $out/share/0ad/data/tools
+
# Copy libraries.
install -Dm644 -t $out/lib/0ad binaries/system/*.so
diff --git a/pkgs/games/0ad/rootdir_env.patch b/pkgs/games/0ad/rootdir_env.patch
deleted file mode 100644
index c001473e510..00000000000
--- a/pkgs/games/0ad/rootdir_env.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ru3 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp
---- 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 2015-02-14 04:45:13.000000000 +0300
-+++ 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp 2016-11-03 16:23:47.241514876 +0300
-@@ -155,32 +155,8 @@
-
- /*static*/ OsPath Paths::Root(const OsPath& argv0)
- {
--#if OS_ANDROID
-- return OsPath("/sdcard/0ad"); // TODO: this is kind of bogus
--#else
--
-- // get full path to executable
-- OsPath pathname = sys_ExecutablePathname(); // safe, but requires OS-specific implementation
-- if(pathname.empty()) // failed, use argv[0] instead
-- {
-- errno = 0;
-- pathname = wrealpath(argv0);
-- if(pathname.empty())
-- WARN_IF_ERR(StatusFromErrno());
-- }
--
-- // make sure it's valid
-- if(!FileExists(pathname))
-- {
-- LOGERROR("Cannot find executable (expected at '%s')", pathname.string8());
-- WARN_IF_ERR(StatusFromErrno());
-- }
--
-- for(size_t i = 0; i < 2; i++) // remove "system/name.exe"
-- pathname = pathname.Parent();
-- return pathname;
--
--#endif
-+ UNUSED2(argv0);
-+ return getenv("ZEROAD_ROOTDIR");
- }
-
- /*static*/ OsPath Paths::RootData(const OsPath& argv0)
diff --git a/pkgs/games/0ad/spidermonkey-cargo-toml.patch b/pkgs/games/0ad/spidermonkey-cargo-toml.patch
new file mode 100644
index 00000000000..4cb8c3735db
--- /dev/null
+++ b/pkgs/games/0ad/spidermonkey-cargo-toml.patch
@@ -0,0 +1,15 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 6f6199ab26..c3f92db9d8 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -68,8 +68,8 @@ panic = "abort"
+ libudev-sys = { path = "dom/webauthn/libudev-sys" }
+ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
+ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
+-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
++nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1" }
++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
+ # failure's backtrace feature might break our builds, see bug 1608157.
+ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
+ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix
index a7411c331ae..e159ead0f47 100644
--- a/pkgs/games/unciv/default.nix
+++ b/pkgs/games/unciv/default.nix
@@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
- version = "3.13.7-patch2";
+ version = "3.13.8";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
- sha256 = "sha256-5QYUYTnRblWWLYnhR1DBzoAt4d9EiYeXhzJRODmDHUA=";
+ sha256 = "sha256-upT0ZtVYzbrQolik0c/2URNwU2LDLgiMWyFEiOZFijc=";
};
dontUnpack = true;
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index c3c3c755f42..a8a9f8bf1c4 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8 }:
+{ config, lib, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }:
let
inherit (vscode-utils) buildVscodeMarketplaceExtension;
@@ -594,6 +594,20 @@ let
};
};
+ redhat.java = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "java";
+ publisher = "redhat";
+ version = "0.76.0";
+ sha256 = "0xb9brki4s00piv4kqgz6idm16nk6x1j6502jljz7y9pif38z32y";
+ };
+ buildInputs = [ jdk ];
+ meta = {
+ license = lib.licenses.epl20;
+ broken = lib.versionAtLeast "11" jdk.version;
+ };
+ };
+
redhat.vscode-yaml = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-yaml";
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index d994aed6d0f..290e3b56180 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -6,13 +6,13 @@
python.pkgs.buildPythonApplication rec {
pname = "bcc";
- version = "0.18.0";
+ version = "0.19.0";
disabled = !stdenv.isLinux;
src = fetchurl {
url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz";
- sha256 = "sha256-0F8tppVFu7cnuSnlgcEvbEdykxYhGJnTc04I98/yIVs=";
+ sha256 = "sha256-TEH8Gmp+8ghLQ8UsGy5hBCMLqfMeApWEFr8THYSOdOQ=";
};
format = "other";
diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix
index b437bb49888..ed2b5314384 100644
--- a/pkgs/os-specific/linux/kernel/linux-lqx.nix
+++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
- version = "5.11.1";
+ version = "5.11.5";
suffix = "lqx1";
in
@@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
- sha256 = "00cji0dkfsjz6agwvcqpy7771hqbzcxk8awpbhlhpwa5j161r7l4";
+ sha256 = "1rf8x08l7zjwhfwaal8kh2wz2qfbrqrjhr4wh0pj7yayaa10877f";
};
extraMeta = {
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index e54a05c6e8e..87b26120cbf 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
let
- version = "5.11.1";
+ version = "5.11.5";
suffix = "zen1";
in
@@ -14,7 +14,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
- sha256 = "10xpb6r1ccqy2lsndf16dksi40z1cgm3wqjp3yjwzhad8zdjlm5d";
+ sha256 = "1w8cksbxnby4xjmycynmiy9y4q5fsnpsbva1804kgan7mhxrppjc";
};
extraMeta = {
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 98fba35b9f1..45ae821a9b8 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -563,7 +563,7 @@
"norway_air" = ps: with ps; [ pymetno ];
"notify" = ps: with ps; [ ];
"notify_events" = ps: with ps; [ ]; # missing inputs: notify-events
- "notion" = ps: with ps; [ ]; # missing inputs: aionotion
+ "notion" = ps: with ps; [ aionotion ];
"nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client
"nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents
"nuheat" = ps: with ps; [ ]; # missing inputs: nuheat
@@ -741,7 +741,7 @@
"sighthound" = ps: with ps; [ pillow simplehound ];
"signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi
"simplepush" = ps: with ps; [ ]; # missing inputs: simplepush
- "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python
+ "simplisafe" = ps: with ps; [ simplisafe-python ];
"simulated" = ps: with ps; [ ];
"sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms
"sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index dc61317876b..82bb54dd889 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -250,6 +250,7 @@ in with py.pkgs; buildPythonApplication rec {
"mqtt_statestream"
"mullvad"
"notify"
+ "notion"
"number"
"ozw"
"panel_custom"
@@ -274,6 +275,7 @@ in with py.pkgs; buildPythonApplication rec {
"search"
"shell_command"
"shopping_list"
+ "simplisafe"
"simulated"
"sensor"
"smarttub"
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index c5d1f6c058f..a89d4f21625 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
- version = "0.17.668";
+ version = "0.17.699";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
- sha256 = "sha256-+cvUpWVpXEkW+d92aIOli+pNi+ZDHEbxDDQ67O6kOVA=";
+ sha256 = "sha256-dftllucRemUdZjYDLKPJ4XJ031OZpsW4bpJDuWPyses=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix
index 1c2e16f76fc..ae56fed52bd 100644
--- a/pkgs/servers/web-apps/galene/default.nix
+++ b/pkgs/servers/web-apps/galene/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "galene";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "jech";
repo = "galene";
rev = "galene-${version}";
- sha256 = "0hpgqqv8mp1d3sk7dk49m3yv0cv4afa0v3vdd4w8mdnx6pcqdgy1";
+ sha256 = "1pl3mnkmfqykhq55q36kvvnvn9fgsk72pfa7nii3hywzad0bj0ar";
};
- vendorSha256 = "12b7andpzsgzmd56gg4gc5ilkxvjrpwpmwbdmygfzgkd5jncmcgp";
+ vendorSha256 = "0jrc6y5chkj25bnpzn6blvfb0vd09h6fdcz75g54605z8nqd397p";
outputs = [ "out" "static" ];
diff --git a/pkgs/tools/X11/libstrangle/default.nix b/pkgs/tools/X11/libstrangle/default.nix
index 1f0a7a8e3a6..d8c220d0fd7 100644
--- a/pkgs/tools/X11/libstrangle/default.nix
+++ b/pkgs/tools/X11/libstrangle/default.nix
@@ -1,14 +1,16 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitLab, libGL, libX11 }:
stdenv.mkDerivation rec {
pname = "libstrangle";
- version = "2017-02-22";
+ version = "0.1.1";
- src = fetchFromGitHub {
- owner = "milaq";
+ buildInputs = [ libGL libX11 ];
+
+ src = fetchFromGitLab {
+ owner = "torkel104";
repo = pname;
- rev = "6020f9e375ba747c75eb7996b7d5f0214ac3221e";
- sha256 = "04ikacbjcq9phdc8q5y1qjjpa1sxmzfm0idln9ys95prg289zp4h";
+ rev = version;
+ sha256 = "135icr544w5ynlxfnxqgjn794bsm9i703rh9jfnracjb7jgnha4w";
};
makeFlags = [ "prefix=" "DESTDIR=$(out)" ];
@@ -17,10 +19,11 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteAllInPlace src/strangle.sh
+ substituteAllInPlace src/stranglevk.sh
'';
meta = with lib; {
- homepage = "https://github.com/milaq/libstrangle";
+ homepage = "https://gitlab.com/torkel104/libstrangle";
description = "Frame rate limiter for Linux/OpenGL";
license = licenses.gpl3;
platforms = [ "x86_64-linux" ];
diff --git a/pkgs/tools/X11/libstrangle/nixos.patch b/pkgs/tools/X11/libstrangle/nixos.patch
index 03c8c19b54c..05364028e3e 100644
--- a/pkgs/tools/X11/libstrangle/nixos.patch
+++ b/pkgs/tools/X11/libstrangle/nixos.patch
@@ -1,29 +1,43 @@
diff --git a/makefile b/makefile
-index eb13054..a3a1125 100644
--- a/makefile
+++ b/makefile
-@@ -27,12 +27,10 @@ $(BUILDDIR)libstrangle32.so: $(BUILDDIR)
- $(CC) $(CFLAGS) $(LDFLAGS) -m32 -o $(BUILDDIR)libstrangle32.so $(SOURCES)
+@@ -86,10 +86,6 @@ install-common:
+ install -m 0755 -D -T $(SOURCEDIR)/stranglevk.sh $(DESTDIR)$(bindir)/stranglevk
+ install -m 0644 -D -T $(SOURCEDIR)/vulkan/libstrangle_vk.json $(DESTDIR)$(datarootdir)/vulkan/implicit_layer.d/libstrangle_vk.json
- install: all
-- install -m 0644 -D -T $(BUILDDIR)libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf
- install -m 0755 -D -T $(BUILDDIR)libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so
- install -m 0755 -D -T $(BUILDDIR)libstrangle64.so $(DESTDIR)$(LIB64_PATH)/libstrangle.so
- install -m 0755 -D -T $(SOURCEDIR)strangle.sh $(DESTDIR)$(bindir)/strangle
- install -m 0644 -D -T COPYING $(DESTDIR)$(DOC_PATH)/LICENSE
+-install-ld: ld
+- install -m 0644 -D -T $(BUILDDIR)/libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf
- ldconfig
+-
+ install-32: 32-bit
+ install -m 0755 -D -T $(BUILDDIR)/libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so
+ install -m 0755 -D -T $(BUILDDIR)/libstrangle32_nodlsym.so $(DESTDIR)$(LIB32_PATH)/libstrangle_nodlsym.so
+@@ -109,8 +105,7 @@ install: \
+ all \
+ install-common \
+ install-32 \
+- install-64 \
+- install-ld
++ install-64
clean:
- rm -f $(BUILDDIR)libstrangle64.so
+ rm -f $(BUILDDIR)/libstrangle64.so
diff --git a/src/strangle.sh b/src/strangle.sh
-index e280e86..b2dd42b 100755
--- a/src/strangle.sh
+++ b/src/strangle.sh
-@@ -31,6 +31,5 @@ if [ "$#" -eq 0 ]; then
- exit 1
+@@ -130,6 +130,5 @@ if [ "$STRANGLE_VKONLY" != "1" ]; then
+ fi
fi
-# Execute the strangled program under a clean environment
# pass through the FPS and overriden LD_PRELOAD environment variables
--exec env FPS="${FPS}" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" "$@"
-+FPS="${FPS}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" exec "$@"
+-exec env ENABLE_VK_LAYER_TORKEL104_libstrangle=1 LD_PRELOAD="${LD_PRELOAD}" "$@"
++ENABLE_VK_LAYER_TORKEL104_libstrangle=1 XDG_DATA_DIRS="${XDG_DATA_DIRS}${XDG_DATA_DIRS:+:}@out@/share" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}" exec "$@"
+diff --git a/src/stranglevk.sh b/src/stranglevk.sh
+--- a/src/stranglevk.sh
++++ b/src/stranglevk.sh
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+
+-ENABLE_VK_LAYER_TORKEL104_libstrangle=1 STRANGLE_VKONLY=1 strangle "$@"
++ENABLE_VK_LAYER_TORKEL104_libstrangle=1 STRANGLE_VKONLY=1 @out@/bin/strangle "$@"
diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix
index d7967c018a2..7f59b0af944 100644
--- a/pkgs/tools/backup/rsbep/default.nix
+++ b/pkgs/tools/backup/rsbep/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, lib, coreutils, gnused, gawk, fetchurl }:
+{ lib, stdenv, coreutils, gawk, fetchFromGitHub }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "rsbep";
- version = "0.1.0";
+ version = "0.2.0";
- src = fetchurl {
- url = "https://www.thanassis.space/rsbep-0.1.0-ttsiodras.tar.bz2";
- sha256 = "1zji34kc9srxp0h1s1m7k60mvgsir1wrx1n3wc990jszfplr32zc";
+ src = fetchFromGitHub {
+ owner = "ttsiodras";
+ repo = "rsbep-backup";
+ rev = "v${version}";
+ sha256 = "0is4jgil3wdqbvx9h66xcyzbqy84ndyydnnay2g9k81a4mcz4dns";
};
postFixup = ''
@@ -18,20 +20,27 @@ stdenv.mkDerivation {
mv rsbep_chopper $libexecDir
# Fix store dependencies in scripts
- path="export PATH=$out/bin:$libexecDir:${lib.makeBinPath [ coreutils gnused gawk ]}"
+ path="export PATH=$out/bin:$libexecDir:${lib.makeBinPath [ coreutils gawk ]}"
sed -i "2i$path" freeze.sh
sed -i "2i$path" melt.sh
- substituteInPlace freeze.sh --replace /bin/ls ls
-
# Remove unneded binary
rm poorZFS.py
'';
+ doInstallCheck = true;
+ installCheckPhase = ''
+ cd $TMP
+ echo hello > input
+ $out/bin/freeze.sh input > packed
+ $out/bin/melt.sh packed > output
+ diff -u input output
+ '';
+
meta = with lib; {
description = "Create resilient backups with Reed-Solomon error correction and byte-spreading";
homepage = "https://www.thanassis.space/rsbep.html";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = [ maintainers.earvstedt ];
};
}
diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix
index adf845f943e..b5d08770ed7 100644
--- a/pkgs/tools/filesystems/apfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/apfs-fuse/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "apfs-fuse-unstable";
- version = "2019-07-23";
+ version = "2020-09-28";
src = fetchFromGitHub {
owner = "sgan81";
repo = "apfs-fuse";
- rev = "309ecb030f38edac4c10fa741a004c5eb7a23e15";
- sha256 = "0wq6rlqi00m5dp5gbzy65i1plm40j6nsm7938zvfgx5laal4wzr2";
+ rev = "ee71aa5c87c0831c1ae17048951fe9cd7579c3db";
+ sha256 = "0wvsx708km1lnhghny5y69k694x0zy8vlbndswkb7sq81j1r6kwx";
fetchSubmodules = true;
};
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = with lib; {
homepage = "https://github.com/sgan81/apfs-fuse";
description = "FUSE driver for APFS (Apple File System)";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ ealasu ];
platforms = platforms.linux;
};
diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix
index 462fc51b289..6a253a493fc 100644
--- a/pkgs/tools/misc/code-minimap/default.nix
+++ b/pkgs/tools/misc/code-minimap/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "code-minimap";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "wfxr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-t+zHAneINLd8JHkhaR+aF55gAWJmphYEqbx74CqAmM8=";
+ sha256 = "sha256-5YNY0MRlKKX6u32Id6J7bIPSHRi44TISoKqpAS9T8ow=";
};
- cargoSha256 = "sha256-eVh+6gTzKTelZ3MypkqYMXHr9QwaNG8H0xS82kilR/s=";
+ cargoSha256 = "sha256-87aRZC4OE3UTVToHi5XDBxVqEH4oFeFR4REf69OBkIw=";
meta = with lib; {
description = "A high performance code minimap render";
diff --git a/pkgs/tools/misc/librespeed-cli/default.nix b/pkgs/tools/misc/librespeed-cli/default.nix
new file mode 100644
index 00000000000..d2396f0086c
--- /dev/null
+++ b/pkgs/tools/misc/librespeed-cli/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "librespeed-cli";
+ version = "1.0.7";
+
+ src = fetchFromGitHub {
+ owner = "librespeed";
+ repo = "speedtest-cli";
+ rev = "v${version}";
+ sha256 = "03bhxx33fy1cgp83anm51fm8v079v0az0d0p785dz98jg14vzibl";
+ };
+
+ vendorSha256 = "1kccxmmzbkzbrxypcrz0j1zz51c0q1d5hh25lcpfbkm3498mj02c";
+
+ # Tests have additonal requirements
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Command line client for LibreSpeed";
+ homepage = "https://github.com/librespeed/speedtest-cli";
+ license = with licenses; [ lgpl3Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix
index 81437378c32..7b40e213135 100644
--- a/pkgs/tools/misc/miniserve/default.nix
+++ b/pkgs/tools/misc/miniserve/default.nix
@@ -4,24 +4,27 @@
, fetchFromGitHub
, pkg-config
, zlib
+, libiconv
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "miniserve";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "miniserve";
rev = "v${version}";
- sha256 = "sha256-/vtiHRHsbF7lfn9tfgfKhm5YwofjSJniNNnKahphHFg=";
+ sha256 = "sha256-hTNwEspM1qlQkC6lD7N947tvS7O7RCIUYACvj4KYsAY=";
};
- cargoSha256 = "sha256-gwy/LeVznZyawliXnkULyyVSXATk0sjSTUZPHO2K+9o=";
+ cargoSha256 = "sha256-7G+h+g00T/aJ1cQ1SChxy8dq3CWWdHlx5DAH77xM9Oc=";
nativeBuildInputs = [ pkg-config zlib ];
- buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
+
+ checkFlags = [ "--skip=cant_navigate_up_the_root" ];
meta = with lib; {
description = "For when you really just want to serve some files over HTTP right now!";
diff --git a/pkgs/tools/misc/past-time/default.nix b/pkgs/tools/misc/past-time/default.nix
new file mode 100644
index 00000000000..3604e4ddcb4
--- /dev/null
+++ b/pkgs/tools/misc/past-time/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonApplication
+, click
+, fetchFromGitHub
+, freezegun
+, pytestCheckHook
+, tqdm
+}:
+
+buildPythonApplication rec {
+ pname = "past-time";
+ version = "0.2.1";
+
+ src = fetchFromGitHub {
+ owner = "fabaff";
+ repo = pname;
+ rev = version;
+ sha256 = "0yhc0630rmcx4ia9y6klpx002mavfmqf1s3jb2gz54jlccwqbfgl";
+ };
+
+ propagatedBuildInputs = [
+ click
+ tqdm
+ ];
+
+ checkInputs = [
+ freezegun
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "past_time" ];
+
+ meta = with lib; {
+ description = "Tool to visualize the progress of the year based on the past days";
+ homepage = "https://github.com/fabaff/past-time";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix
index 1ff73492401..0c338fd91bc 100644
--- a/pkgs/tools/misc/silicon/default.nix
+++ b/pkgs/tools/misc/silicon/default.nix
@@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "silicon";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "Aloxaf";
repo = "silicon";
rev = "v${version}";
- sha256 = "0cvzkfyljgxhmn456f2rn0vq2bhm1ishr4jg4dnwjjfgmjg3w908";
+ sha256 = "sha256-ci0gq4rOQHBmFPvhXZseIlwnqAWd06/qg/i/luhV79s=";
};
- cargoSha256 = "1aymhbfzcncrbc5n8rf62bdgi95b4bjhw6p716vhca5p6c7wfxcb";
+ cargoSha256 = "sha256-1sekLS+jhMeFJcW7pH/X8t28//xA+L54u81uKOo1kHE=";
buildInputs = [ llvmPackages.libclang expat freetype ]
++ lib.optionals stdenv.isLinux [ libxcb ]
diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix
index 7a7bb0ab517..7d3c662b368 100644
--- a/pkgs/tools/networking/assh/default.nix
+++ b/pkgs/tools/networking/assh/default.nix
@@ -1,4 +1,9 @@
-{ lib, buildGoModule, fetchFromGitHub, openssh, makeWrapper }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, openssh
+, makeWrapper
+}:
buildGoModule rec {
pname = "assh";
@@ -15,6 +20,10 @@ buildGoModule rec {
doCheck = false;
+ preBuild = ''
+ buildFlagsArray+=("-ldflags" "-s -w -X moul.io/assh/v2/pkg/version.Version=${version}")
+ '';
+
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix
index 22631518e71..a32e98ca18a 100644
--- a/pkgs/tools/networking/findomain/default.nix
+++ b/pkgs/tools/networking/findomain/default.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "The fastest and cross-platform subdomain enumerator";
homepage = "https://github.com/Edu4rdSHL/findomain";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/tools/networking/lychee/default.nix
new file mode 100644
index 00000000000..40353ea278c
--- /dev/null
+++ b/pkgs/tools/networking/lychee/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "lychee";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "lycheeverse";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "03dsp0384mwr51dkqfl25xba0m17sppabiz7slhxcig89b0ksykm";
+ };
+
+ cargoSha256 = "08y2wpm2qgm2jsy257b2p2anxy4q3bj2kfdr5cnb6wnaz9g4ypq2";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ openssl ];
+
+ # Disabled because they currently fail
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A fast, async, resource-friendly link checker written in Rust.";
+ homepage = "https://github.com/lycheeverse/lychee";
+ license = with licenses; [ asl20 mit ];
+ maintainers = with maintainers; [ tuxinaut ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index f28c021fce3..53033b57442 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -8,6 +8,9 @@
}:
{ lib, stdenv
+# This *is* correct, though unusual. as a way of getting krb5-config from the
+# package without splicing See: https://github.com/NixOS/nixpkgs/pull/107606
+, pkgs
, fetchurl
, fetchpatch
, zlib
@@ -42,7 +45,10 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkg-config ]
- ++ optional withKerberos kerberos
+ # This is not the same as the kerberos from the inputs! pkgs.kerberos is
+ # needed here to access krb5-config in order to cross compile. See:
+ # https://github.com/NixOS/nixpkgs/pull/107606
+ ++ optional withKerberos pkgs.kerberos
++ extraNativeBuildInputs;
buildInputs = [ zlib openssl libedit ]
++ optional withFIDO libfido2
diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix
index 752f43b3348..60bd2f8cc7e 100644
--- a/pkgs/tools/networking/philter/default.nix
+++ b/pkgs/tools/networking/philter/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
description = "Mail sorter for Maildirs";
homepage = "http://philter.sourceforge.net";
maintainers = with maintainers; [ raskin ];
- platforms = platforms.linux;
+ platforms = platforms.all;
license = licenses.gpl2;
};
diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix
index 6155d411e13..c8c5ca118dd 100644
--- a/pkgs/tools/networking/pixiecore/default.nix
+++ b/pkgs/tools/networking/pixiecore/default.nix
@@ -23,6 +23,6 @@ buildGoModule rec {
homepage = "https://github.com/danderson/netboot/tree/master/pixiecore";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ bbigras danderson ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix
index ad9bfcfb1d1..561daacfd53 100644
--- a/pkgs/tools/networking/pixiewps/default.nix
+++ b/pkgs/tools/networking/pixiewps/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/wiire/pixiewps";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.nico202 ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
};
}
diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix
index af2dfe8040a..83d52fdf10d 100644
--- a/pkgs/tools/networking/redir/default.nix
+++ b/pkgs/tools/networking/redir/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/troglobit/redir";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/tools/networking/rshijack/default.nix b/pkgs/tools/networking/rshijack/default.nix
index 59558028c01..e4bb7315a45 100644
--- a/pkgs/tools/networking/rshijack/default.nix
+++ b/pkgs/tools/networking/rshijack/default.nix
@@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/kpcyrd/rshijack";
license = licenses.gpl3;
maintainers = with maintainers; [ xrelkd ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix
index d9bf06e825e..70bb5453518 100644
--- a/pkgs/tools/networking/surfraw/default.nix
+++ b/pkgs/tools/networking/surfraw/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power";
homepage = "https://gitlab.com/surfraw/Surfraw";
maintainers = [];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
license = lib.licenses.publicDomain;
};
}
diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix
index c41ef6836a7..1b8aa8fc3f9 100644
--- a/pkgs/tools/package-management/emplace/default.nix
+++ b/pkgs/tools/package-management/emplace/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "emplace";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "tversteeg";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-02Pn5saPrw1PIFZXVSCgsnvo/78CdT17/rCtS9R9bvU=";
+ sha256 = "sha256-6dmXWqkf8Z+cc4wnOuVCe4+Byfk3VTYXehTN1MCiFLE=";
};
- cargoSha256 = "sha256-ety50v0jxm45fzzkR9c/rvpJn3mWQUvAOHcHSJTTSd4=";
+ cargoSha256 = "sha256-uDoxMHSNoqH/AOixmkV6pwrDu/XSqXBCrAz4L7MMPU8=";
meta = with lib; {
description = "Mirror installed software on multiple machines";
diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
index 3256b5431a7..13327a84fff 100644
--- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
+++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
meta = with lib; {
homepage = "https://github.com/yishilin14/asc-key-to-qr-code-gif";
description = "Convert ASCII-armored PGP keys to animated QR code";
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ asymmetric ];
};
}
diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix
index 3eb192e8fcc..ba80734e5cf 100644
--- a/pkgs/tools/security/bash-supergenpass/default.nix
+++ b/pkgs/tools/security/bash-supergenpass/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
supergenpass will ask for your master password interactively, and it will not be displayed on your terminal.
'';
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ fgaz ];
homepage = "https://github.com/lanzz/bash-supergenpass";
};
diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix
index 29703ee1fc8..b358507bbae 100644
--- a/pkgs/tools/security/genpass/default.nix
+++ b/pkgs/tools/security/genpass/default.nix
@@ -7,22 +7,22 @@
}:
rustPlatform.buildRustPackage rec {
pname = "genpass";
- version = "0.4.9";
+ version = "0.4.12";
src = fetchgit {
url = "https://git.sr.ht/~cyplo/genpass";
rev = "v${version}";
- sha256 = "1dpv2iyd48xd8yw9bmymjjrkhsgmpwvsl5b9zx3lpaaq59ypi9g9";
+ sha256 = "154kprbqc59f06ciz60il4ax299zapwa0hz8vjn25rl4gr5gzn4l";
};
- cargoSha256 = "1cwxpc3xkw673wiamr4v7clrzwxl8ma1vdr6bw0hixm37gxdxz7x";
+ cargoSha256 = "1nc699n7f732lhzfhsfknay6z3igyiqy5jymm5x815mv9y1vwaj1";
buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
meta = with lib; {
description = "A simple yet robust commandline random password generator";
homepage = "https://sr.ht/~cyplo/genpass/";
- license = licenses.agpl3;
+ license = licenses.agpl3Only;
maintainers = with maintainers; [ cyplo ];
};
}
diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 92845c6cab2..ef4c6736528 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -13,7 +13,7 @@
buildGoModule rec {
pname = "gopass";
- version = "1.12.2";
+ version = "1.12.4";
nativeBuildInputs = [ installShellFiles makeWrapper ];
@@ -21,10 +21,10 @@ buildGoModule rec {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
- sha256 = "14ylvb7crx32h7inklvvxjc72jz9xq3dhzr5905i76kgx57h64w9";
+ sha256 = "1cwmka6shyycp9gq5js1hnbamdhqzpmzraxdaniz1cdqhxcvdkcb";
};
- vendorSha256 = "0gjzghrykdw1vp873yi7k8piz3gshzndm12jm6dxgl0ph4335a54";
+ vendorSha256 = "1qnxdrqpav6ky6gs9w63l0hbhakh23rrc9197br1nmbg0slb8vcj";
subPackages = [ "." ];
diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix
index afef0d4c472..451cdd5591b 100644
--- a/pkgs/tools/security/pdfcrack/default.nix
+++ b/pkgs/tools/security/pdfcrack/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
homepage = "http://pdfcrack.sourceforge.net/";
description = "Small command line driven tool for recovering passwords and content from PDF files";
license = with licenses; [ gpl2 ];
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ qoelet ];
};
}
diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix
index 4cbedb23218..0c1bf93ed1c 100644
--- a/pkgs/tools/security/shc/default.nix
+++ b/pkgs/tools/security/shc/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://neurobin.org/projects/softwares/unix/shc/";
description = "Shell Script Compiler";
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
license = licenses.gpl3;
};
}
diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/tools/system/gt5/default.nix
index 3e904e6c0ad..374bcf0e314 100644
--- a/pkgs/tools/system/gt5/default.nix
+++ b/pkgs/tools/system/gt5/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
homepage = "http://gt5.sourceforge.net/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [viric];
- platforms = with lib.platforms; linux;
+ platforms = with lib.platforms; all;
};
}
diff --git a/pkgs/tools/text/l2md/default.nix b/pkgs/tools/text/l2md/default.nix
new file mode 100644
index 00000000000..e443cc42a2e
--- /dev/null
+++ b/pkgs/tools/text/l2md/default.nix
@@ -0,0 +1,32 @@
+{ lib, stdenv, fetchgit, libgit2 }:
+
+stdenv.mkDerivation rec {
+ pname = "l2md";
+ version = "unstable-2020-07-31";
+
+ src = fetchgit {
+ url = "https://git.kernel.org/pub/scm/linux/kernel/git/dborkman/l2md.git";
+ rev = "2b9fae141fc2129940e0337732a35a3fc1c33455";
+ sha256 = "PNNoD3a+rJwKH6wbOkvVU1IW4+xF7+zQaLFAlyLlYOI=";
+ };
+
+ buildInputs = [ libgit2 ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp l2md $out/bin
+ '';
+
+ meta = with lib; {
+ description = "Convert public-inbox archives to maildir messages";
+ longDescription = ''
+ Quick and dirty hack to import lore.kernel.org list archives via git,
+ to export them in maildir format or through a pipe, and to keep them
+ periodically synced.
+ '';
+ homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/dborkman/l2md.git";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ yoctocell ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0ba45dd8f89..b5c819898ab 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -953,6 +953,7 @@ mapAliases ({
;
inherit (plasma5Packages.thirdParty)
plasma-applet-caffeine-plus
+ plasma-applet-virtual-desktop-bar
kwin-dynamic-workspaces
kwin-tiling
krohnkite
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95bc5a7dd34..f3d83e6d27a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -820,6 +820,10 @@ in
flavour = "git";
};
+ logseq = callPackage ../applications/misc/logseq {
+ electron = electron_11;
+ };
+
lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
microcom = callPackage ../applications/terminal-emulators/microcom { };
@@ -1413,6 +1417,8 @@ in
lesspass-cli = callPackage ../tools/security/lesspass-cli { };
+ mpdevil = callPackage ../applications/audio/mpdevil { };
+
pacparser = callPackage ../tools/networking/pacparser { };
pass = callPackage ../tools/security/pass { };
@@ -1802,6 +1808,8 @@ in
btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
+ btlejack = python3Packages.callPackage ../applications/radio/btlejack { };
+
btrbk = callPackage ../tools/backup/btrbk {
asciidoc = asciidoc-full;
};
@@ -2280,6 +2288,8 @@ in
edac-utils = callPackage ../os-specific/linux/edac-utils { };
+ eddy = libsForQt5.callPackage ../applications/graphics/eddy { };
+
eggdrop = callPackage ../tools/networking/eggdrop { };
eksctl = callPackage ../tools/admin/eksctl { };
@@ -3934,6 +3944,8 @@ in
kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { };
+ lychee = callPackage ../tools/networking/lychee { };
+
magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { };
mcrcon = callPackage ../tools/networking/mcrcon {};
@@ -4850,6 +4862,8 @@ in
gnuapl = callPackage ../development/interpreters/gnu-apl { };
+ gnucap = callPackage ../applications/science/electronics/gnucap { };
+
gnu-cobol = callPackage ../development/compilers/gnu-cobol { };
gnuclad = callPackage ../applications/graphics/gnuclad { };
@@ -5728,6 +5742,8 @@ in
k6 = callPackage ../development/tools/k6 { };
+ l2md = callPackage ../tools/text/l2md { };
+
lab = callPackage ../applications/version-management/git-and-tools/lab { };
lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { };
@@ -6157,6 +6173,8 @@ in
libzmf = callPackage ../development/libraries/libzmf {};
+ librespeed-cli = callPackage ../tools/misc/librespeed-cli { };
+
libreswan = callPackage ../tools/networking/libreswan { };
librest = callPackage ../development/libraries/librest { };
@@ -7412,6 +7430,8 @@ in
cntlm = callPackage ../tools/networking/cntlm { };
+ past-time = python3Packages.callPackage ../tools/misc/past-time { };
+
pastebinit = callPackage ../tools/misc/pastebinit { };
pifi = callPackage ../applications/audio/pifi { };
@@ -8635,6 +8655,8 @@ in
trezor-suite = callPackage ../applications/blockchains/trezor-suite { };
+ trunk = callPackage ../development/tools/trunk { };
+
tthsum = callPackage ../applications/misc/tthsum { };
chaps = callPackage ../tools/security/chaps { };
@@ -13276,6 +13298,8 @@ in
xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { };
+ xcode-install = callPackage ../development/tools/xcode-install { };
+
xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;
};
@@ -22712,6 +22736,8 @@ in
freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {};
+ freeplane = callPackage ../applications/misc/freeplane { };
+
freepv = callPackage ../applications/graphics/freepv { };
xfontsel = callPackage ../applications/misc/xfontsel { };
@@ -24144,6 +24170,7 @@ in
mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix {};
simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {};
sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {};
+ thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { };
};
mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };
@@ -24831,6 +24858,8 @@ in
ponymix = callPackage ../applications/audio/ponymix { };
+ portfolio-filemanager = callPackage ../applications/misc/portfolio-filemanager { };
+
pothos = libsForQt5.callPackage ../applications/radio/pothos { };
potrace = callPackage ../applications/graphics/potrace {};
@@ -27819,7 +27848,6 @@ in
zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {
wxGTK = wxGTK30;
- stdenv = gcc9Stdenv;
});
zeroad = zeroadPackages.zeroad;
@@ -29043,6 +29071,8 @@ in
dell-530cdn = callPackage ../misc/drivers/dell-530cdn {};
+ demjson = with python3Packages; toPythonApplication demjson;
+
dosbox = callPackage ../misc/emulators/dosbox { };
emu2 = callPackage ../misc/emulators/emu2 { };
@@ -29174,6 +29204,8 @@ in
inherit (darwin.apple_sdk.frameworks) Security CoreServices;
};
+ hjson = with python3Packages; toPythonApplication hjson;
+
epkowa = callPackage ../misc/drivers/epkowa { };
utsushi = callPackage ../misc/drivers/utsushi { };
@@ -29201,6 +29233,8 @@ in
libjack2 = jack2.override { prefix = "lib"; };
jack2Full = jack2; # TODO: move to aliases.nix
+ j2cli = with python3Packages; toPythonApplication j2cli;
+
jstest-gtk = callPackage ../tools/misc/jstest-gtk { };
keynav = callPackage ../tools/X11/keynav { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c1afeb8c508..557484e96ff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8682,6 +8682,10 @@ let
url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.003001.tar.gz";
sha256 = "1q7im0zj238k5agwi7d1mz26a8r0wrxwfwp1l8n5k777gx3b5xhp";
};
+ nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
+ postInstall = lib.optionalString stdenv.isDarwin ''
+ shortenPerlShebang $out/bin/git-autofixup
+ '';
meta = {
maintainers = [ maintainers.DamienCassou ];
description = "Create fixup commits for topic branches";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 12991afcb37..a68193c790e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -302,6 +302,8 @@ in {
aionotify = callPackage ../development/python-modules/aionotify { };
+ aionotion = callPackage ../development/python-modules/aionotion { };
+
aioprocessing = callPackage ../development/python-modules/aioprocessing { };
aiopulse = callPackage ../development/python-modules/aiopulse { };
@@ -1422,6 +1424,10 @@ in {
cmdtest = callPackage ../development/python-modules/cmdtest { };
+ cmigemo = callPackage ../development/python-modules/cmigemo {
+ inherit (pkgs) cmigemo;
+ };
+
cmsis-svd = callPackage ../development/python-modules/cmsis-svd { };
cntk = callPackage ../development/python-modules/cntk { };
@@ -1843,6 +1849,8 @@ in {
django-cache-url = callPackage ../development/python-modules/django-cache-url { };
+ django-cacheops = callPackage ../development/python-modules/django-cacheops { };
+
django_classytags = callPackage ../development/python-modules/django_classytags { };
django-cleanup = callPackage ../development/python-modules/django-cleanup { };
@@ -3565,6 +3573,8 @@ in {
jupyter_core = callPackage ../development/python-modules/jupyter_core { };
+ jupyter_server = callPackage ../development/python-modules/jupyter_server { };
+
jupyterhub = callPackage ../development/python-modules/jupyterhub { };
jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { };
@@ -3583,6 +3593,8 @@ in {
jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { };
+ jupyter-packaging = callPackage ../development/python-modules/jupyter-packaging { };
+
jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker {
pkgs-docker = pkgs.docker;
};
@@ -4365,6 +4377,8 @@ in {
mpi4py = callPackage ../development/python-modules/mpi4py { };
+ mplfinance = callPackage ../development/python-modules/mplfinance { };
+
mplleaflet = callPackage ../development/python-modules/mplleaflet { };
mpmath = callPackage ../development/python-modules/mpmath { };
@@ -4486,6 +4500,8 @@ in {
naturalsort = callPackage ../development/python-modules/naturalsort { };
+ nbclassic = callPackage ../development/python-modules/nbclassic { };
+
nbclient = callPackage ../development/python-modules/nbclient { };
nbconflux = callPackage ../development/python-modules/nbconflux { };
@@ -4838,6 +4854,8 @@ in {
oyaml = callPackage ../development/python-modules/oyaml { };
+ packageurl-python = callPackage ../development/python-modules/packageurl-python { };
+
packaging = if isPy3k
then callPackage ../development/python-modules/packaging { }
else callPackage ../development/python-modules/packaging/2.nix { };
@@ -5587,6 +5605,8 @@ in {
pydantic = callPackage ../development/python-modules/pydantic { };
+ pydash = callPackage ../development/python-modules/pydash { };
+
pydbus = callPackage ../development/python-modules/pydbus { };
pydenticon = callPackage ../development/python-modules/pydenticon { };
@@ -7629,6 +7649,8 @@ in {
simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server { };
+ simplisafe-python = callPackage ../development/python-modules/simplisafe-python { };
+
simpy = callPackage ../development/python-modules/simpy { };
singledispatch = callPackage ../development/python-modules/singledispatch { };