.config/nixpkgs: Sync to 21.11 and 22.05

7 files changed, 48 insertions, 70 deletions

diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix
index b060e53..c7391b9 100644
--- a/.config/nixpkgs/config.nix
+++ b/.config/nixpkgs/config.nix
@@ -3,12 +3,12 @@ let
   pkgs = import <nixpkgs> {};
 
   stable = import (builtins.fetchTarball {
-    url = "https://releases.nixos.org/nixos/21.05/nixos-21.05.1510.a165aeceda9/nixexprs.tar.xz";
-    sha256 = "124s05b0xk97arw0vvq8b4wcvsw6024dfdzwcx9qjxf3a2zszmam"; }) {};
+    url = "https://releases.nixos.org/nixos/21.11/nixos-21.11.336020.2128d0aa28e/nixexprs.tar.xz";
+    sha256 = "0w8plbxms0di6gnh0k2yhj0pgxzxas7g5x0m01zjzixf16i2bapj"; }) {};
 
   unstable = import (builtins.fetchTarball {
-    url = "https://releases.nixos.org/nixos/unstable/nixos-21.11pre301985.23cd13167a1/nixexprs.tar.xz";
-    sha256 = "0djd5zr9l2r6ahwhyasl1asrdjhbavdamkz8qzlkkb6j4z015zqd"; }) {};
+    url = "https://releases.nixos.org/nixos/unstable/nixos-22.05pre353770.23d785aa6f8/nixexprs.tar.xz";
+    sha256 = "1n50i34h3yj2a44x3gl2xk27z8r12lzgj2m8n5j1c4k6kh4z1b22"; }) {};
 
 in
 
@@ -157,11 +157,11 @@ in
         (callPackage ./packages/ntrviewer/default.nix {})
         (callPackage ./packages/planner/default.nix {})
         (callPackage ./packages/sowon/default.nix {})
+        (callPackage ./packages/tilp2/default.nix {})
         (mplayer.override { v4lSupport = true; })
         unstable.claws-mail
         unstable.fsearch
         unstable.nyxt
-        unstable.tilp2
         unstable.ungoogled-chromium
         aegisub
         anki
@@ -437,7 +437,7 @@ in
 
     Perl = pkgs.buildEnv {
       name = "perl";
-      paths = [ rakudo (perl530.withPackages (ps: with ps; [ PerlCritic PerlTidy TextLorem ])) ];
+      paths = [ rakudo (perl532.withPackages (ps: with ps; [ PerlCritic PerlTidy TextLorem ])) ];
     };
 
     Nix = pkgs.buildEnv {
@@ -485,9 +485,9 @@ in
       paths = [
         (callPackage ./packages/skeema/default.nix {})
         (callPackage ./packages/sqldef/default.nix {})
-        (callPackage ./packages/sqlfluff/default.nix {})
         dbeaver
         pgformatter
+        sqlfluff
         sqlint
         sqlite
       ];
diff --git a/.config/nixpkgs/packages/ntrviewer/default.nix b/.config/nixpkgs/packages/ntrviewer/default.nix
index 0f2289d..af155bf 100644
--- a/.config/nixpkgs/packages/ntrviewer/default.nix
+++ b/.config/nixpkgs/packages/ntrviewer/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   patches = [
     (fetchpatch {
       name = "ntrviewer.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/ntrviewer.patch?h=ntrviewer-git";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/ntrviewer.patch?h=ntrviewer-git&id=7ae6776d6db1476ee9df8cac7a933167a1bc3d25";
       sha256 = "0lw1zmm4fdjb09iqsw593pdv4p36q77zq5lb2qh0xqcaf2ll84z5";
     })
   ];
diff --git a/.config/nixpkgs/packages/sqlfluff/default.nix b/.config/nixpkgs/packages/sqlfluff/default.nix
deleted file mode 100644
index 217613a..0000000
--- a/.config/nixpkgs/packages/sqlfluff/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ lib, fetchgit, python36 }:
-
-with python36.pkgs;
-
-let
-
-  bench-it = buildPythonPackage rec {
-    pname = "bench-it";
-    version = "1.0.1";
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "0v6kfvgdnjlfmwlafmyjadgllfr8qc1hq83kz9q287gh5nvw851f";
-    };
-    postPatch = ''
-      # Avoid building pypandoc
-      sed -i 's|^import pypandoc.*||' setup.py
-      sed -i 's|^description = pypandoc.*|description = ""|' setup.py
-    '';
-    doCheck = false;
-  };
-
-in buildPythonApplication rec {
-
-  pname = "sqlfluff";
-  url = "https://github.com/sqlfluff/sqlfluff";
-  version = "0.4.1";
-
-  src = fetchgit {
-    inherit url;
-    rev = version;
-    sha256 = "0g53rhdg8b2p3xx9rmkc2fkqnz4fsrmkg98n5fi10s16wscn90kz";
-  };
-
-  propagatedBuildInputs = [
-    appdirs
-    bench-it
-    cached-property
-    click
-    colorama
-    configparser
-    dataclasses
-    diff_cover
-    jinja2
-    oyaml
-    pathspec
-    pluggy
-    typing-extensions
-  ];
-
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = url;
-    license = licenses.mit;
-    platforms = platforms.linux;
-    description = "A SQL linter and auto-formatter for Humans";
-  };
-}
diff --git a/.config/nixpkgs/packages/tilp2/default.nix b/.config/nixpkgs/packages/tilp2/default.nix
new file mode 100644
index 0000000..743514c
--- /dev/null
+++ b/.config/nixpkgs/packages/tilp2/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, pkg-config, intltool, glib
+, gnome2, gtk2, gfm, libticables2, libticalcs2, libticonv, libtifiles2 }:
+
+stdenv.mkDerivation rec {
+  pname = "tilp2";
+  version = "1.18";
+  src = fetchurl {
+    url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
+    sha256 = "0isf73bjwk06baz2gm3vpdh600gqck9ca4aqxzb089dmxriv6fkv";
+  };
+
+  patches = fetchpatch {
+    name = "remove-broken-kde-support.patch";
+    url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=tilp";
+    sha256 = "1fn6vh7r45spkwpmkvffkbn7zrcsdrs5mjmspd5rwi3jc12cy3ny";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkg-config intltool ];
+
+  buildInputs = [
+    glib
+    gtk2
+    gnome2.libglade
+    gfm
+    libticables2
+    libticalcs2
+    libticonv
+    libtifiles2
+  ];
+
+  meta = with lib; {
+    changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
+    description = "Transfer data between Texas Instruments graphing calculators and a computer";
+    homepage = "http://lpg.ticalc.org/prj_tilp/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ luc65r ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/.gitmodules b/.gitmodules
index 799574b..da0e6ab 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule ".vim/pack/plugins/start/vim-elixir"]
 	path = .vim/pack/plugins/start/vim-elixir
 	url = https://github.com/elixir-editors/vim-elixir
-[submodule ".vim/pack/plugins/start/vim-fugitive"]
-	path = .vim/pack/plugins/start/vim-fugitive
-	url = https://github.com/tpope/vim-fugitive
 [submodule ".vim/pack/plugins/start/vim-HiLinkTrace"]
 	path = .vim/pack/plugins/start/vim-HiLinkTrace
 	url = https://github.com/gerw/vim-HiLinkTrace
diff --git a/.vim/pack/plugins/start/vim-fugitive b/.vim/pack/plugins/start/vim-fugitive
deleted file mode 160000
-Subproject 85e2c73830b6bb01ce7fc3a926d2b25836a253e
diff --git a/.vimrc b/.vimrc
index c6b4351..90da095 100644
--- a/.vimrc
+++ b/.vimrc
@@ -219,8 +219,8 @@ nnoremap ,awk         :-1read $HOME/.vim/snippets/skeleton.awk<cr>
 
 "---------------Plugin Settings---------------"
 
+let g:gundo_prefer_python3=1            " Use python3 to restore gundo functionality.
 let g:netrw_banner=0                    " Disable netrw banner.
-
 let g:nnn#command = 'nnn -H'            " Override default command.
 let g:nnn#set_default_mappings = 0      " Disable default mappings.
 let g:nnn#layout = 'new'                " Opens the nnn window in a split.