configuration.nix: Update package list

1 files changed, 69 insertions, 57 deletions

diff --git a/configuration.nix b/configuration.nix
index 8aa52799..5915811a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -96,6 +96,12 @@ in {
     enableDebugInfo = true;
 
     systemPackages = let
+      pkgs-19 = import (fetchTarball
+        "https://github.com/NixOS/nixpkgs/archive/b0d748e244df6c977b2a1db3873ffdc271e59615.tar.gz")
+        { };
+      pkgs-21 = import (fetchTarball
+        "https://github.com/NixOS/nixpkgs/archive/e6377ff35544226392b49fa2cf05590f9f0c4b43.tar.gz")
+        { };
       bmake-with-alias = pkgs.bmake.overrideAttrs (oldAttrs: {
         postInstall = ''
           ln -s $out/bin/bmake $out/bin/make
@@ -106,80 +112,70 @@ in {
           ln -s $out/bin/tcc $out/bin/c99
         '';
       });
-      flex-with-posix-alias = pkgs.flex.overrideAttrs (oldAttrs: {
-        postInstall = ''
-          ln -s $out/bin/flex $out/bin/lex
-        '';
+      timidity-with-more-formats = pkgs.timidity.overrideAttrs (oldAttrs: {
+	configureFlags = oldAttrs.configureFlags ++ [ "--enable-audio=vorbis,flac" ];
+	buildInputs = oldAttrs.buildInputs ++ (with pkgs; [ libogg libvorbis flac ]);
       });
-      pax-with-good-path = pkgs.pax.overrideAttrs (oldAttrs: {
-        postPatch = ''
-          substituteInPlace ar_io.c --replace 'putenv' '// putenv'
-          ${({ postPatch = ""; } // oldAttrs).postPatch}
-        '';
+      mktorrent-latest = pkgs.mktorrent.overrideAttrs (oldAttrs: rec {
+	version = "de7d011b35458de1472665f50b96c9cf6c303f39";
+        src = pkgs.fetchFromGitHub {
+	  owner = "Rudde";
+	  repo = "mktorrent";
+	  rev = version;
+	  sha256 = "1gsky1ijxrfsw07lvfjw4annjkdfpmnp8nnddi1wakbzqn6v5dwq";
+	};
       });
 
-      nu-packages = with pkgs; [
-        awscli
-        yubioath-desktop
-        leiningen
-        openjdk8
-        clojure # =clj=
-        kubernetes
-        nssTools # =pk12util=
-        python3
-      ];
-
     in with pkgs;
     [
+
       ## Documentation
       posix_man_pages
       scheme-manpages
 
-      ## Personal data tools
-      gitAndTools.git-open
+      ## DVCS
+      mr
+      fossil
+      mercurial
+      cvs
+      pkgs-19.bitkeeper
+      pkgs-19.packer
       gitAndTools.gitFull
-      gitAndTools.git-annex
       gitAndTools.gitRemoteGcrypt
-      git-crypt
-      git-lfs
-      mr
+
+      ## Personal data tools
       borgbackup
       pass
       gnupg
       pinentry_gtk2
-      fossil
-      mercurial
 
       ## CLI tools
       groff
-      mktorrent
+      mktorrent-latest
+      pkgs-21.diffoscope
       diffoscope
-      bundix
       bash-completion
       nix-bash-completions
       youtube-dl
       wget
       tmux
-      tmuxinator
       sox # =play=, SoX - Sound eXchange
       gettext
+      perlPackages.Po4a
       rlwrap
       jq
       rq
       openvpn
       xclip
       psmisc # =killall=
-      xorg.xkill
-      gksu
       tree
-      unzip # used by extract bash function and Clojure go-to-source
       feh
+      libqrencode
       nixUnstable # =nix=
       bind # =dig=
       rsync
-      moreutils # =vipe=, =sponge=
+      moreutils # =vipe=, =sponge=, errno
       graphviz # =dot= and others
-      graph-easy # ASCII drawings for GraphViz output
       mkpasswd
       direnv
       recutils
@@ -198,19 +194,22 @@ in {
       newsboat
       acpi
       xsel
-      pinentry
       nixfmt
-      # nvi # broken, now using the one from Guix
+      nvi
       fzf
       calcurse
       pandoc
-      buku # replaces Firefox bookmarks
       cloc
       inetutils # telnet
-      nodePackages.node2nix
       lsof
       lsscsi
-			bpytop
+      gotop
+      imagemagick
+      enscript
+      tcl
+
+      ## System utilities
+      pmutils
 
       ## Mail
       isync
@@ -219,38 +218,45 @@ in {
       alot
       w3m
       urlscan
+      md4c
+      docutils
+      timidity-with-more-formats
 
       ## Conversations
-      gomuks
-      weechat # replacing ERC
-      poezio
+      # gomuks
+      weechat
+      # poezio
 
       ## Programming tools
       perl
       shellcheck
-      mrsh
-      dash
       gcc
+      musl.dev
       clang
       clang-tools
       valgrind
       gdb
-      scdoc
       sbcl
+      openssl.dev
+      openssl
+      nodejs_latest
+      quickjs
+      deno
+      lilypond
+      ghostscript
+      pdftk
 
       ## POSIX
       bmake-with-alias
       byacc
       bc
-      pax-with-good-path
       lzip
-      flex-with-posix-alias
       gnugrep
       file
       ed
       tinycc-with-posix-alias
       m4
-      llvmPackages.bintools # ar, nm and friends
+      bintools-unwrapped
       units
 
       ## Containers and VMs
@@ -270,27 +276,33 @@ in {
       arandr
       alsaUtils # for xmonad volume commands
       yad
+      amfora
+      cmus # remove it, use just mpv?
+      mutagen
 
       ## EuAndreh overlay
-      xyz-euandreh.remembering-latest
-      xyz-euandreh.autoqemu-latest
+      # xyz-euandreh.remembering-latest
+      # xyz-euandreh.git-permalink-latest
+      # xyz-euandreh.autoqemu-latest
 
       ## GUI programs
+      frescobaldi
+      inkscape
+      # dino
+      fractal
+      poedit
       audacity
       zbar
-      calibre
       (mpv-with-scripts.override {
         scripts = with mpvScripts; [ mpris sponsorblock ];
       })
       firefox
-
-      ## Desktop programs
-      cmus
-      mutagen
+      libreoffice
 
       ## Candidates to be replaced by alternatives
       transmission-gtk # https://github.com/btpd/btpd
       tdesktop # telegram -> gomuks
+      whatsapp-for-linux
     ] ++ work.packages.libre ++ work.packages.proprietary;
 
     etc = {