.config/nixpkgs: Synchronize to NixOS 21.05 and 21.11

2 files changed, 54 insertions, 6 deletions

diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix
index f2174b0..de6dc01 100644
--- a/.config/nixpkgs/config.nix
+++ b/.config/nixpkgs/config.nix
@@ -1,12 +1,12 @@
 let
 
   stable = import (builtins.fetchTarball {
-    url = "https://releases.nixos.org/nixos/20.09/nixos-20.09.3346.4d0ee90c6e2/nixexprs.tar.xz";
-    sha256 = "1hl3ibkqpk0fihppj85fgiin5r6l9jsqmfjbmcqfyjvykh9fy6ag"; }) {};
+    url = "https://releases.nixos.org/nixos/21.05/nixos-21.05.650.eaba7870ffc/nixexprs.tar.xz";
+    sha256 = "08fpds1bkv9106c6s5w3p5r4v3dc24bhk9asm9vqbxxypjglqg9l"; }) {};
 
   unstable = import (builtins.fetchTarball {
-    url = "https://releases.nixos.org/nixos/unstable/nixos-21.03pre265961.891f607d530/nixexprs.tar.xz";
-    sha256 = "1hwwb4n15bbqxnbqffq4kfb369vz65sq74p537fqdp6i4ywpqsyh"; }) {};
+    url = "https://releases.nixos.org/nixos/unstable/nixos-21.11pre292748.6933d068c5d/nixexprs.tar.xz";
+    sha256 = "1bwwrij68m0jb7vq5vzjnas3c5ylq5lj6fvwklyzawhkarq4hv1k"; }) {};
 
 in
 
@@ -144,6 +144,7 @@ in
         (callPackage ./packages/dmenu/default.nix {})
         (callPackage ./packages/gnaural/default.nix {})
         (callPackage ./packages/ntrviewer/default.nix {})
+        (callPackage ./packages/planner/default.nix {})
         unstable.nyxt
         unstable.tilp2
         unstable.ungoogled-chromium
@@ -181,7 +182,6 @@ in
         palemoon
         pavucontrol
         peek
-        planner
         qownnotes
         qrencode
         recoll
@@ -189,7 +189,7 @@ in
         rofi
         scrcpy
         screenkey
-        scribus
+        scribusUnstable
         sigil
         skippy-xd
         spaceFM
diff --git a/.config/nixpkgs/packages/planner/default.nix b/.config/nixpkgs/packages/planner/default.nix
new file mode 100644
index 0000000..9921372
--- /dev/null
+++ b/.config/nixpkgs/packages/planner/default.nix
@@ -0,0 +1,48 @@
+{ lib, stdenvNoCC, fetchgit, pkgconfig, intltool, automake111x, autoconf
+, libtool, gnome2, libxslt, python2, gcc48 }:
+
+stdenvNoCC.mkDerivation rec {
+
+  pname = "planner";
+  version = "de43d655f9f8103993129cde9de3d0e080d0546c";
+
+  src = fetchgit {
+    url = "https://gitlab.gnome.org/World/planner.git";
+    sha256 = "1zpcswdpcjhllk7phy3z1zyxcgqr4pp0vf5fgpg5f3gqpk4xvwyg";
+    rev = version;
+  };
+
+  nativeBuildInputs = with gnome2; [
+    autoconf
+    automake111x
+    gnome-common
+    gtk-doc
+    intltool
+    libtool
+    pkgconfig
+    scrollkeeper
+  ];
+
+  buildInputs = with gnome2; [
+    GConf
+    gcc48
+    gtk
+    libglade
+    libgnomecanvas
+    libgnomeui
+    libxslt
+    python2.pkgs.pygtk
+  ];
+
+  enableParallelBuilding = true;
+  preConfigure = "./autogen.sh";
+  makeFlags = [ "CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+  configureFlags = [ "--enable-python" "--enable-python-plugin" ];
+
+  meta = with lib; {
+    description = "Project management application for GNOME";
+    homepage = "https://wiki.gnome.org/Apps/Planner";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+  };
+}