.config/nixpkgs: Sync with NixOS version 20.09

Deepin deprecated.

3 files changed, 38 insertions, 8 deletions

diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix
index 5dbba48..3c2204c 100644
--- a/.config/nixpkgs/config.nix
+++ b/.config/nixpkgs/config.nix
@@ -1,12 +1,12 @@
 let
 
   stable = import (builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/360e2af4f87.tar.gz";
-    sha256 = "1i3i9cpn6m3r07pgw4w3xinbqmxkm7pmnqjlz96x424ngbc21sg2"; }) {};
+    url = "https://github.com/NixOS/nixpkgs/archive/c6b23ba64ae.tar.gz";
+    sha256 = "13hg91g46qg2bbpdzpnmzcrsayfbkcp0gx36n8lsb2v980vahvi3"; }) {};
 
   unstable = import (builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/7dc2d9f819c.tar.gz";
-    sha256 = "19zgr6mrfx7z4w822n3wbw3r3javrjszs7jsiz4r2fbq2l3h68gx"; }) {};
+    url = "https://github.com/NixOS/nixpkgs/archive/a36bf6faf96.tar.gz";
+    sha256 = "12n0mzkvs81ygspdjia03fv3v88cbbwznrpn375farcrsjzl86mc"; }) {};
 
 in
 
@@ -103,6 +103,7 @@ in
         (callPackage ./packages/dmenu/default.nix {})
         (callPackage ./packages/gnaural/default.nix {})
         (callPackage ./packages/ntrviewer/default.nix {})
+        unstable.tilp2
         unstable.ungoogled-chromium
         aegisub
         anki
@@ -203,7 +204,11 @@ in
 
     Awesome = pkgs.buildEnv {
       name = "awesome";
-      paths = [ awesome lxappearance deepin.deepin-gtk-theme ];
+      paths = [
+        (callPackage ./packages/deepin-gtk-theme/default.nix {})
+        awesome
+        lxappearance
+      ];
       pathsToLink = [ "/share" "/bin" ];
     };
 
@@ -278,7 +283,7 @@ in
     JavaScript = pkgs.buildEnv {
       name = "javascript";
       paths = [
-        nodejs-13_x
+        nodejs-14_x
         unstable.deno
         nodePackages.prettier
         nodePackages.eslint
@@ -291,7 +296,7 @@ in
     Python = pkgs.buildEnv {
       name = "python";
       paths = [
-        (python38.withPackages (ps: with ps; [ mypy bandit pylint pip2nix pyflakes ]))
+        (python38.withPackages (ps: with ps; [ mypy bandit pylint pyflakes ]))
       ];
     };
 
diff --git a/.config/nixpkgs/packages/amfora/default.nix b/.config/nixpkgs/packages/amfora/default.nix
index 7832e41..5c35b37 100644
--- a/.config/nixpkgs/packages/amfora/default.nix
+++ b/.config/nixpkgs/packages/amfora/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "1f5r12hmdgj26p4ss5pcpfcvqlcn19fr9xvvvk2izckcr48p4fy7";
   };
 
-  modSha256 = "1xqw7m1qfzmssxrkipjcfgy4jz0cmjbbpy7vf4v1w5jjci9nwxdm";
+  vendorSha256 = "0mkk7xxfxxp1w9890mkmag11mzxhy2zmh8v1macpyp1zmzgs21f8";
 
   meta = with stdenv.lib; {
     homepage = url;
diff --git a/.config/nixpkgs/packages/deepin-gtk-theme/default.nix b/.config/nixpkgs/packages/deepin-gtk-theme/default.nix
new file mode 100644
index 0000000..bdddc28
--- /dev/null
+++ b/.config/nixpkgs/packages/deepin-gtk-theme/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "deepin-gtk-theme-${version}";
+  version = "17.10.5";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = "deepin-gtk-theme";
+    rev = version;
+    sha256 = "0ff1yg4gz4p7nd0qg3dcbsiw8yqlvqccm55kxi998w8j1wrg6pq3";
+  };
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    description = "Deepin GTK Theme";
+    homepage = https://github.com/linuxdeepin/deepin-gtk-theme;
+    license = stdenv.lib.licenses.lgpl3;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}