Don't depend upon xdg

It's not yet available in a stable release branch of nixpkgs.  We don't want to
force folks to use unstable to use pinch.

Revert this commit after 20.09 is released and everyone's had time to upgrade.

diff --git a/pinch.py b/pinch.py
index 732a91f645c036a4692e6ea55083cad4427373d0..003ee70ee535d1c2b33071ceb07c096eb9830cfd 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -25,7 +25,17 @@ from typing import (
     Tuple,
 )
 
     Tuple,
 )
 

-import xdg
+# Use xdg module when it's less painful to have as a dependency
+
+
+class XDG(types.SimpleNamespace):
+    XDG_CACHE_HOME: str
+
+
+xdg = XDG(
+    XDG_CACHE_HOME=os.getenv(
+        'XDG_CACHE_HOME',
+        os.path.expanduser('~/.cache')))

 
 
 Digest16 = NewType('Digest16', str)
 
 
 Digest16 = NewType('Digest16', str)

diff --git a/shell.nix b/shell.nix
index 11e4f03df38198bcabaed52cabc35697a9beb716..b408ea4ba330739becfe23b5d71ed5ae0e6d1310 100644 (file)
--- a/shell.nix
+++ b/shell.nix
@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> { } }:
 pkgs.mkShell rec {
   doCheck = true;
 { pkgs ? import <nixpkgs> { } }:
 pkgs.mkShell rec {
   doCheck = true;

-  buildInputs = with pkgs; [ (python3.withPackages (ps: with ps; [ xdg ])) ];
+  buildInputs = with pkgs; [ python3 ];

   checkInputs = with pkgs; [
     mypy
     python3Packages.autopep8
   checkInputs = with pkgs; [
     mypy
     python3Packages.autopep8