From 522b170d0c950e9f610f62467b729ea004550f0a Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Wed, 7 Jul 2021 04:38:18 +0200 Subject: [PATCH] sterni fixes for 21.05 update --- .channelUnstable.json | 8 +- configs/sterni/configuration.nix | 1 + configs/sterni/hardware-configuration.nix | 4 +- modules/system/x11.nix | 2 +- pkgs/default.nix | 34 +- pkgs/lektor-with-plugins/README.md | 12 - .../lektor-with-plugins/lektor-git/.gitignore | 5 - pkgs/lektor-with-plugins/lektor-git/README.md | 4 - .../lektor-git/default.nix | 20 - .../lektor-git/lektor_git.py | 61 -- pkgs/lektor-with-plugins/lektor-git/setup.py | 38 -- pkgs/lektor-with-plugins/lektor-git/shell.nix | 20 - .../default.nix | 17 - .../lektor-shell/.gitignore | 5 - .../lektor-shell/README.md | 4 - .../lektor-shell/default.nix | 9 - .../lektor-shell/lektor_shell.py | 36 -- .../lektor-with-plugins/lektor-shell/setup.py | 38 -- .../lektor-shell/shell.nix | 22 - pkgs/lektor-with-plugins/requirements.nix | 600 ------------------ .../requirements_frozen.txt | 0 .../requirements_override.nix | 27 - pkgs/polygon-art/default.nix | 6 +- pkgs/taskwarrior-hooks/default.nix | 3 +- system/all/packages.nix | 2 +- system/desktop/default.nix | 9 +- system/desktop/packages.nix | 3 +- 27 files changed, 39 insertions(+), 951 deletions(-) delete mode 100644 pkgs/lektor-with-plugins/README.md delete mode 100644 pkgs/lektor-with-plugins/lektor-git/.gitignore delete mode 100644 pkgs/lektor-with-plugins/lektor-git/README.md delete mode 100644 pkgs/lektor-with-plugins/lektor-git/default.nix delete mode 100644 pkgs/lektor-with-plugins/lektor-git/lektor_git.py delete mode 100644 pkgs/lektor-with-plugins/lektor-git/setup.py delete mode 100644 pkgs/lektor-with-plugins/lektor-git/shell.nix delete mode 100644 pkgs/lektor-with-plugins/lektor-markdown-header-anchors/default.nix delete mode 100644 pkgs/lektor-with-plugins/lektor-shell/.gitignore delete mode 100644 pkgs/lektor-with-plugins/lektor-shell/README.md delete mode 100644 pkgs/lektor-with-plugins/lektor-shell/default.nix delete mode 100644 pkgs/lektor-with-plugins/lektor-shell/lektor_shell.py delete mode 100644 pkgs/lektor-with-plugins/lektor-shell/setup.py delete mode 100644 pkgs/lektor-with-plugins/lektor-shell/shell.nix delete mode 100644 pkgs/lektor-with-plugins/requirements.nix delete mode 100644 pkgs/lektor-with-plugins/requirements_frozen.txt delete mode 100644 pkgs/lektor-with-plugins/requirements_override.nix diff --git a/.channelUnstable.json b/.channelUnstable.json index eb08312..8e89a5b 100644 --- a/.channelUnstable.json +++ b/.channelUnstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs.git", - "rev": "d8079260a3028ae3221d7a5467443ee3a9edd2b8", - "date": "2021-07-02T08:57:49+07:00", - "path": "/nix/store/4srrxf65m8511gvarl4ryx9pa31i37l6-nixpkgs", - "sha256": "0xjcji6z00i49xaanf193n3kr34m4if6qg9npcnh30acv8gx9krk", + "rev": "20887e4bbfdae3aed6bfa1f53ddf138ee325515e", + "date": "2021-07-03T21:40:35-05:00", + "path": "/nix/store/ph4npn3fa3hv9i9vvwsgwaz7zhl9v2dd-nixpkgs", + "sha256": "0hc79sv59appb7bynz5bzyqvrapyjdq63s79i649vxl93504kmnv", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/configs/sterni/configuration.nix b/configs/sterni/configuration.nix index 99d8acb..c1cc735 100644 --- a/configs/sterni/configuration.nix +++ b/configs/sterni/configuration.nix @@ -14,6 +14,7 @@ ]; + networking.hostName = "sterni"; system.custom.wifi.interfaces = [ "wlp3s0" ]; diff --git a/configs/sterni/hardware-configuration.nix b/configs/sterni/hardware-configuration.nix index eabc563..271183a 100644 --- a/configs/sterni/hardware-configuration.nix +++ b/configs/sterni/hardware-configuration.nix @@ -24,12 +24,12 @@ memoryPercent = 50; }; - fileSystems."/share/" = { + fileSystems."/share" = { device = "/dev/ram1"; fsType = "tmpfs"; }; - fileSystems."/browsers/" = { + fileSystems."/browsers" = { #device = "/dev/ram2"; #fsType = "tmpfs"; options = [ "noatime" "nodiratime" "discard" ]; diff --git a/modules/system/x11.nix b/modules/system/x11.nix index 8105b78..6ce656e 100644 --- a/modules/system/x11.nix +++ b/modules/system/x11.nix @@ -41,7 +41,7 @@ in { desktopManager = { xterm.enable = false; - gnome3.enable = lib.mkDefault true; + #gnome3.enable = lib.mkDefault true; }; windowManager = { xmonad.enable = true; diff --git a/pkgs/default.nix b/pkgs/default.nix index 3b97489..e00e3ff 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -8,7 +8,7 @@ let in { - image-generator = super.callPackage ./image-generator { }; + #image-generator = super.callPackage ./image-generator { }; polygon-art = super.callPackage ./polygon-art { }; @@ -22,23 +22,23 @@ in { # }); #}; - haskellPackages = super.haskellPackages.override { - overrides = self: super: { mahlzeit = super.callPackage ./mahlzeit { }; }; - }; + #haskellPackages = super.haskellPackages.override { + # overrides = self: super: { mahlzeit = super.callPackage ./mahlzeit { }; }; + #}; - gitlog2json = callPackage ./gitlog2json { }; + #gitlog2json = callPackage ./gitlog2json { }; - fuji-cam-wifi-tool = callPackage ./fuji-cam { }; + #fuji-cam-wifi-tool = callPackage ./fuji-cam { }; - navi = callPackage ./navi { }; + #navi = callPackage ./navi { }; bitwig-studio3 = callPackage ./bitwig-studio/bitwig-studio3.nix { }; - bitwig-studio = callPackage ./bitwig-studio/bitwig-studio-environment.nix { }; + #bitwig-studio = callPackage ./bitwig-studio/bitwig-studio-environment.nix { }; - lv2vst = callPackage ./lv2vst { }; + #lv2vst = callPackage ./lv2vst { }; - wolf-spectrum = callPackage ./wolf-spectrum { }; + #wolf-spectrum = callPackage ./wolf-spectrum { }; landingpage = callPackage ./landingpage { }; @@ -57,14 +57,14 @@ in { sononym = callPackage ./sononym { }; sononym-crawler = callPackage ./sononym-crawler { }; - castget = callPackage ./castget { }; + #castget = callPackage ./castget { }; - radio-dj = callPackage (super.fetchgit { - url = "https://git.ingolf-wagner.de/crashburn_radio/radio_dj.git"; - rev = "0.1.5"; - sha256 = "04j6gcb6ayrcf7rxr0bkgd48zppiryhdyv7mvp0q12ngdkf2yagd"; - }) { }; + #radio-dj = callPackage (super.fetchgit { + # url = "https://git.ingolf-wagner.de/crashburn_radio/radio_dj.git"; + # rev = "0.1.5"; + # sha256 = "04j6gcb6ayrcf7rxr0bkgd48zppiryhdyv7mvp0q12ngdkf2yagd"; + #}) { }; - ethminer = callPackage ./ethminer { cudaSupport = false; }; + #ethminer = callPackage ./ethminer { cudaSupport = false; }; } diff --git a/pkgs/lektor-with-plugins/README.md b/pkgs/lektor-with-plugins/README.md deleted file mode 100644 index 3d4e232..0000000 --- a/pkgs/lektor-with-plugins/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# build - -``` -pypi2nix -V 3.6 -e lektor -E libffi -E openssl -``` - -# run - -``` -nix-shell requirements.nix -A interpreter -``` - diff --git a/pkgs/lektor-with-plugins/lektor-git/.gitignore b/pkgs/lektor-with-plugins/lektor-git/.gitignore deleted file mode 100644 index 463960b..0000000 --- a/pkgs/lektor-with-plugins/lektor-git/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -dist -build -*.pyc -*.pyo -*.egg-info diff --git a/pkgs/lektor-with-plugins/lektor-git/README.md b/pkgs/lektor-with-plugins/lektor-git/README.md deleted file mode 100644 index 19195c6..0000000 --- a/pkgs/lektor-with-plugins/lektor-git/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# shell - -This is where a description of your plugin goes. -Provide usage instructions here. diff --git a/pkgs/lektor-with-plugins/lektor-git/default.nix b/pkgs/lektor-with-plugins/lektor-git/default.nix deleted file mode 100644 index 4700c2d..0000000 --- a/pkgs/lektor-with-plugins/lektor-git/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, ... }: - -pkgs.python36.pkgs.buildPythonPackage { - name = "lektor-git"; - version = "0.1"; - - src = ./.; - - prePatch = '' - - ls -lah - - substituteInPlace lektor_git.py \ - --replace \ - 'subprocess.run(["git"' \ - 'subprocess.run(["${pkgs.git}/bin/git"' - - ''; -} - diff --git a/pkgs/lektor-with-plugins/lektor-git/lektor_git.py b/pkgs/lektor-with-plugins/lektor-git/lektor_git.py deleted file mode 100644 index 71a7b9b..0000000 --- a/pkgs/lektor-with-plugins/lektor-git/lektor_git.py +++ /dev/null @@ -1,61 +0,0 @@ -# -*- coding: utf-8 -*- -from lektor.pluginsystem import Plugin - -from lektor.publisher import Publisher, _patch_git_env -import subprocess -import uuid - - -class GitPlugin(Plugin): - name = 'git' - description = u'manage content via git.' - - def on_setup_env(self, **extra): - try: - self.env.add_publisher('git-publish', GitPublisher) - self.env.add_publisher('git-sync', GitSync) - except AttributeError: - from lektor.publisher import publishers - publishers['git-publish'] = GitPublisher - publishers['git-sync'] = GitSync - - -class GitPublisher(Publisher): - - def publish(self, target, credentials=None, **extra): - env = _patch_git_env({}) - - yield "Commiting content directory..." - subprocess.run(["git", "add", "content"], env=env) - subprocess.run(["git", "commit", "-m", "Added from preflight"], env=env) - - yield "Pushing to Git ..." - subprocess.run(["git", "push"], env=env) - - yield "Pulling from Git ..." - subprocess.run(["git", "pull"], env=env) - - - yield "Done" - return - -# pulls master -class GitSync(Publisher): - - def publish(self, target, credentials=None, **extra): - env = _patch_git_env({}) - - yield "Commit trash ..." - subprocess.run(["git", "add", "content"], env=env) - subprocess.run(["git", "commit", "-m", "trash"], env=env) - - yield "Checkout reset master ..." - subprocess.run(["git", "checkout", "-f", "master"], env=env) - subprocess.run(["git", "reset", "--hard", "origin/master"], env=env) - - yield "Pull Updates" - subprocess.run(["git", "pull"], env=env) - - yield "Done" - return - diff --git a/pkgs/lektor-with-plugins/lektor-git/setup.py b/pkgs/lektor-with-plugins/lektor-git/setup.py deleted file mode 100644 index 1e186ed..0000000 --- a/pkgs/lektor-with-plugins/lektor-git/setup.py +++ /dev/null @@ -1,38 +0,0 @@ -import ast -import io -import re - -from setuptools import setup, find_packages - -with io.open('README.md', 'rt', encoding="utf8") as f: - readme = f.read() - -_description_re = re.compile(r'description\s+=\s+(?P.*)') - -with open('lektor_git.py', 'rb') as f: - description = str(ast.literal_eval(_description_re.search( - f.read().decode('utf-8')).group(1))) - -setup( - author='palo', - author_email='contact@ingolf-wagner.de', - description=description, - keywords='Lektor plugin', - license='MIT', - long_description=readme, - long_description_content_type='text/markdown', - name='lektor-git', - packages=find_packages(), - py_modules=['lektor_git'], - # url='[link to your repository]', - version='0.2', - classifiers=[ - 'Framework :: Lektor', - 'Environment :: Plugins', - ], - entry_points={ - 'lektor.plugins': [ - 'git = lektor_git:GitPlugin', - ] - } -) diff --git a/pkgs/lektor-with-plugins/lektor-git/shell.nix b/pkgs/lektor-with-plugins/lektor-git/shell.nix deleted file mode 100644 index 44d06fa..0000000 --- a/pkgs/lektor-with-plugins/lektor-git/shell.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs ? import { } }: - -let - - callPackage = pkgs.lib.callPackageWith pkgs; - - bin = callPackage ./default.nix { }; - -in pkgs.mkShell { - - # needed pkgs - # ----------- - buildInputs = with pkgs; [ bin ]; - - # run this on start - # ----------------- - #shellHook = '' - # HISTFILE=${toString ./.}/.history - #''; -} diff --git a/pkgs/lektor-with-plugins/lektor-markdown-header-anchors/default.nix b/pkgs/lektor-with-plugins/lektor-markdown-header-anchors/default.nix deleted file mode 100644 index 70b53ff..0000000 --- a/pkgs/lektor-with-plugins/lektor-markdown-header-anchors/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, fetchFromGitHub, ... }: - -pkgs.python36.pkgs.buildPythonPackage rec { - - name = "lektor-markdown-header-anchors"; - - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "lektor"; - repo = "lektor-markdown-header-anchors"; - rev = "${version}"; - sha256 = "0f82rngfqhb1jk6ilrlw74wi2maxfvvc36k2509scckyh77hqbqf"; - }; - -} - diff --git a/pkgs/lektor-with-plugins/lektor-shell/.gitignore b/pkgs/lektor-with-plugins/lektor-shell/.gitignore deleted file mode 100644 index 463960b..0000000 --- a/pkgs/lektor-with-plugins/lektor-shell/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -dist -build -*.pyc -*.pyo -*.egg-info diff --git a/pkgs/lektor-with-plugins/lektor-shell/README.md b/pkgs/lektor-with-plugins/lektor-shell/README.md deleted file mode 100644 index 19195c6..0000000 --- a/pkgs/lektor-with-plugins/lektor-shell/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# shell - -This is where a description of your plugin goes. -Provide usage instructions here. diff --git a/pkgs/lektor-with-plugins/lektor-shell/default.nix b/pkgs/lektor-with-plugins/lektor-shell/default.nix deleted file mode 100644 index afffe79..0000000 --- a/pkgs/lektor-with-plugins/lektor-shell/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: - -pkgs.python36.pkgs.buildPythonPackage { - name = "lektor-shell"; - version = "0.3"; - src = ./.; - # propagatedBuildInputs = [ pytest numpy pkgs.libsndfile ]; -} - diff --git a/pkgs/lektor-with-plugins/lektor-shell/lektor_shell.py b/pkgs/lektor-with-plugins/lektor-shell/lektor_shell.py deleted file mode 100644 index 6ffec88..0000000 --- a/pkgs/lektor-with-plugins/lektor-shell/lektor_shell.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -from lektor.pluginsystem import Plugin - -from lektor.publisher import Publisher, _patch_git_env -import subprocess - - -class ShellPlugin(Plugin): - name = 'shell' - description = u'Add your description here.' - - def on_setup_env(self, **extra): - try: - self.env.add_publisher('shell', ShellPublisher) - except AttributeError: - from lektor.publisher import publishers - publishers['shell'] = ShellPublisher - - -class ShellPublisher(Publisher): - - def publish(self, target, credentials=None, **extra): - yield "Commiting content directory... " - print("target") - print(target) - #subprocess.run(["git", "add", "content"]) - #subprocess.run(["git", "commit", "-m", "Added from preflight"]) - - yield "Pulling and merging from GitHub ..." - #subprocess.run(["git", "pull"]) - - yield "Pushing to GitHub ..." - #subprocess.run(["git", "push"]) - - yield "Done" - return diff --git a/pkgs/lektor-with-plugins/lektor-shell/setup.py b/pkgs/lektor-with-plugins/lektor-shell/setup.py deleted file mode 100644 index 34fdade..0000000 --- a/pkgs/lektor-with-plugins/lektor-shell/setup.py +++ /dev/null @@ -1,38 +0,0 @@ -import ast -import io -import re - -from setuptools import setup, find_packages - -with io.open('README.md', 'rt', encoding="utf8") as f: - readme = f.read() - -_description_re = re.compile(r'description\s+=\s+(?P.*)') - -with open('lektor_shell.py', 'rb') as f: - description = str(ast.literal_eval(_description_re.search( - f.read().decode('utf-8')).group(1))) - -setup( - author='palo', - author_email='contact@ingolf-wagner.de', - description=description, - keywords='Lektor plugin', - license='MIT', - long_description=readme, - long_description_content_type='text/markdown', - name='lektor-shell', - packages=find_packages(), - py_modules=['lektor_shell'], - # url='[link to your repository]', - version='0.2', - classifiers=[ - 'Framework :: Lektor', - 'Environment :: Plugins', - ], - entry_points={ - 'lektor.plugins': [ - 'shell = lektor_shell:ShellPlugin', - ] - } -) diff --git a/pkgs/lektor-with-plugins/lektor-shell/shell.nix b/pkgs/lektor-with-plugins/lektor-shell/shell.nix deleted file mode 100644 index 4052a27..0000000 --- a/pkgs/lektor-with-plugins/lektor-shell/shell.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ pkgs ? import { } }: - -let - - bin = pkgs.python.pkgs.buildPythonPackage { - name = "lektor-shell"; - src = ./.; - # propagatedBuildInputs = [ pytest numpy pkgs.libsndfile ]; - }; - -in pkgs.mkShell { - - # needed pkgs - # ----------- - buildInputs = with pkgs; [ bin ]; - - # run this on start - # ----------------- - shellHook = '' - HISTFILE=${toString ./.}/.history - ''; -} diff --git a/pkgs/lektor-with-plugins/requirements.nix b/pkgs/lektor-with-plugins/requirements.nix deleted file mode 100644 index 5bb2832..0000000 --- a/pkgs/lektor-with-plugins/requirements.nix +++ /dev/null @@ -1,600 +0,0 @@ -# generated using pypi2nix tool (version: 1.8.1) -# See more at: https://github.com/garbas/pypi2nix -# -# COMMAND: -# pypi2nix -V 3.6 -e lektor -E libffi -E openssl -# - -{ pkgs ? import { } }: - -let - - inherit (pkgs) makeWrapper; - inherit (pkgs.stdenv.lib) fix' extends inNixShell; - - pythonPackages = - import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" { - inherit pkgs; - inherit (pkgs) stdenv; - python = pkgs.python36; - # patching pip so it does not try to remove files when running nix-shell - overrides = self: super: { - bootstrapped-pip = super.bootstrapped-pip.overrideDerivation (old: { - patchPhase = old.patchPhase + '' - sed -i -e "s|paths_to_remove.remove(auto_confirm)|#paths_to_remove.remove(auto_confirm)|" -e "s|self.uninstalled = paths_to_remove|#self.uninstalled = paths_to_remove|" $out/${pkgs.python35.sitePackages}/pip/req/req_install.py - ''; - }); - }; - }; - - commonBuildInputs = with pkgs; [ libffi openssl ]; - commonDoCheck = false; - - withPackages = pkgs': - let - pkgs = builtins.removeAttrs pkgs' [ "__unfix__" ]; - interpreter = pythonPackages.buildPythonPackage { - name = "python36-interpreter"; - buildInputs = [ makeWrapper ] ++ (builtins.attrValues pkgs); - buildCommand = '' - mkdir -p $out/bin - ln -s ${pythonPackages.python.interpreter} $out/bin/${pythonPackages.python.executable} - for dep in ${ - builtins.concatStringsSep " " (builtins.attrValues pkgs) - }; do - if [ -d "$dep/bin" ]; then - for prog in "$dep/bin/"*; do - if [ -f $prog ]; then - ln -s $prog $out/bin/`basename $prog` - fi - done - fi - done - for prog in "$out/bin/"*; do - wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH" - done - pushd $out/bin - ln -s ${pythonPackages.python.executable} python - ln -s ${pythonPackages.python.executable} python3 - popd - ''; - passthru.interpreter = pythonPackages.python; - }; - in { - __old = pythonPackages; - inherit interpreter; - mkDerivation = pythonPackages.buildPythonPackage; - packages = pkgs; - overrideDerivation = drv: f: - pythonPackages.buildPythonPackage - (drv.drvAttrs // f drv.drvAttrs // { meta = drv.meta; }); - withPackages = pkgs'': withPackages (pkgs // pkgs''); - }; - - python = withPackages { }; - - generated = self: { - - "Babel" = python.mkDerivation { - name = "Babel-2.6.0"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/be/cc/9c981b249a455fa0c76338966325fc70b7265521bad641bf2932f77712f4/Babel-2.6.0.tar.gz"; - sha256 = - "8cba50f48c529ca3fa18cf81fa9403be176d374ac4d60738b839122dfaaa3d23"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ self."pytz" ]; - meta = with pkgs.stdenv.lib; { - homepage = "http://babel.pocoo.org/"; - license = licenses.bsdOriginal; - description = "Internationalization utilities"; - }; - }; - - "Click" = python.mkDerivation { - name = "Click-7.0"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/f8/5c/f60e9d8a1e77005f664b76ff8aeaee5bc05d0a91798afd7f53fc998dbc47/Click-7.0.tar.gz"; - sha256 = - "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://palletsprojects.com/p/click/"; - license = licenses.bsdOriginal; - description = "Composable command line interface toolkit"; - }; - }; - - "ExifRead" = python.mkDerivation { - name = "ExifRead-2.1.2"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/7b/cb/92b644626830115910cf2b36d3dfa600adbec86dff3207a7de3bfd6c6a60/ExifRead-2.1.2.tar.gz"; - sha256 = - "79e244f2eb466709029e8806fe5e2cdd557870c3db5f68954db0ef548d9320ad"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://github.com/ianare/exif-py"; - license = licenses.bsdOriginal; - description = "Read Exif metadata from tiff and jpeg files."; - }; - }; - - "Flask" = python.mkDerivation { - name = "Flask-1.0.2"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/4b/12/c1fbf4971fda0e4de05565694c9f0c92646223cff53f15b6eb248a310a62/Flask-1.0.2.tar.gz"; - sha256 = - "2271c0070dbcb5275fad4a82e29f23ab92682dc45f9dfbc22c02ba9b9322ce48"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = - [ self."Click" self."Jinja2" self."Werkzeug" self."itsdangerous" ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://www.palletsprojects.com/p/flask/"; - license = licenses.bsdOriginal; - description = - "A simple framework for building complex web applications."; - }; - }; - - "Jinja2" = python.mkDerivation { - name = "Jinja2-2.10"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/56/e6/332789f295cf22308386cf5bbd1f4e00ed11484299c5d7383378cf48ba47/Jinja2-2.10.tar.gz"; - sha256 = - "f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ self."Babel" self."MarkupSafe" ]; - meta = with pkgs.stdenv.lib; { - homepage = "http://jinja.pocoo.org/"; - license = licenses.bsdOriginal; - description = - "A small but fast and easy to use stand-alone template engine written in pure python."; - }; - }; - - "Lektor" = python.mkDerivation { - name = "Lektor-3.1.3"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/00/02/43e93399b2f3974d7dfc50364d2d74a000f98bd0eedc406fd391769643e2/Lektor-3.1.3.tar.gz"; - sha256 = - "60a83e7a100780a58553324b396b0df32a2f584452184efbf87acefed85e564d"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."Babel" - self."Click" - self."ExifRead" - self."Flask" - self."Jinja2" - self."inifile" - self."mistune" - self."requests" - self."watchdog" - ]; - meta = with pkgs.stdenv.lib; { - homepage = "http://github.com/lektor/lektor/"; - license = licenses.bsdOriginal; - description = "A static content management system."; - }; - }; - - "MarkupSafe" = python.mkDerivation { - name = "MarkupSafe-1.1.1"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094/MarkupSafe-1.1.1.tar.gz"; - sha256 = - "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://palletsprojects.com/p/markupsafe/"; - license = licenses.bsdOriginal; - description = "Safely add untrusted strings to HTML/XML markup."; - }; - }; - - "PyYAML" = python.mkDerivation { - name = "PyYAML-5.1"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/9f/2c/9417b5c774792634834e730932745bc09a7d36754ca00acf1ccd1ac2594d/PyYAML-5.1.tar.gz"; - sha256 = - "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://github.com/yaml/pyyaml"; - license = licenses.mit; - description = "YAML parser and emitter for Python"; - }; - }; - - "Werkzeug" = python.mkDerivation { - name = "Werkzeug-0.15.1"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/72/60/f628e8920cbf54afa2a83b75b32a1e69b559b95514d1deb841823dd97830/Werkzeug-0.15.1.tar.gz"; - sha256 = - "ca5c2dcd367d6c0df87185b9082929d255358f5391923269335782b213d52655"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ self."watchdog" ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://palletsprojects.com/p/werkzeug/"; - license = licenses.bsdOriginal; - description = "The comprehensive WSGI web application library."; - }; - }; - - "argh" = python.mkDerivation { - name = "argh-0.26.2"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/e3/75/1183b5d1663a66aebb2c184e0398724b624cecd4f4b679cb6e25de97ed15/argh-0.26.2.tar.gz"; - sha256 = - "e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "http://github.com/neithere/argh/"; - license = licenses.lgpl2; - description = "An unobtrusive argparse wrapper with natural syntax"; - }; - }; - - "asn1crypto" = python.mkDerivation { - name = "asn1crypto-0.24.0"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/fc/f1/8db7daa71f414ddabfa056c4ef792e1461ff655c2ae2928a2b675bfed6b4/asn1crypto-0.24.0.tar.gz"; - sha256 = - "9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://github.com/wbond/asn1crypto"; - license = licenses.mit; - description = - "Fast ASN.1 parser and serializer with definitions for private keys, public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8, PKCS#12, PKCS#5, X.509 and TSP"; - }; - }; - - "certifi" = python.mkDerivation { - name = "certifi-2019.3.9"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/06/b8/d1ea38513c22e8c906275d135818fee16ad8495985956a9b7e2bb21942a1/certifi-2019.3.9.tar.gz"; - sha256 = - "b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://certifi.io/"; - license = licenses.mpl20; - description = "Python package for providing Mozilla's CA Bundle."; - }; - }; - - "cffi" = python.mkDerivation { - name = "cffi-1.12.2"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/64/7c/27367b38e6cc3e1f49f193deb761fe75cda9f95da37b67b422e62281fcac/cffi-1.12.2.tar.gz"; - sha256 = - "e113878a446c6228669144ae8a56e268c91b7f1fafae927adc4879d9849e0ea7"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ self."pycparser" ]; - meta = with pkgs.stdenv.lib; { - homepage = "http://cffi.readthedocs.org"; - license = licenses.mit; - description = "Foreign Function Interface for Python calling C code."; - }; - }; - - "chardet" = python.mkDerivation { - name = "chardet-3.0.4"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d/chardet-3.0.4.tar.gz"; - sha256 = - "84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://github.com/chardet/chardet"; - license = licenses.lgpl2; - description = "Universal encoding detector for Python 2 and 3"; - }; - }; - - "cryptography" = python.mkDerivation { - name = "cryptography-2.6.1"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff92f3563476c3b00d0a9157d9c0217449/cryptography-2.6.1.tar.gz"; - sha256 = - "26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = - [ self."asn1crypto" self."cffi" self."idna" self."pytz" self."six" ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://github.com/pyca/cryptography"; - license = licenses.bsdOriginal; - description = - "cryptography is a package which provides cryptographic recipes and primitives to Python developers."; - }; - }; - - "idna" = python.mkDerivation { - name = "idna-2.8"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/ad/13/eb56951b6f7950cadb579ca166e448ba77f9d24efc03edd7e55fa57d04b7/idna-2.8.tar.gz"; - sha256 = - "c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://github.com/kjd/idna"; - license = licenses.bsdOriginal; - description = "Internationalized Domain Names in Applications (IDNA)"; - }; - }; - - "inifile" = python.mkDerivation { - name = "inifile-0.4"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/af/9e/1cd6be0edcbeeb89a6d6ee101dc371a43fa1a19ffaa06ffe99b9e92a3053/inifile-0.4.zip"; - sha256 = - "891bc629f81477708581b30a7b0583bb5c9c2ee3c070afd4675ecd4f96b0d78d"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = ""; - license = licenses.bsdOriginal; - description = "A small INI library for Python."; - }; - }; - - "itsdangerous" = python.mkDerivation { - name = "itsdangerous-1.1.0"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/68/1a/f27de07a8a304ad5fa817bbe383d1238ac4396da447fa11ed937039fa04b/itsdangerous-1.1.0.tar.gz"; - sha256 = - "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://palletsprojects.com/p/itsdangerous/"; - license = licenses.bsdOriginal; - description = - "Various helpers to pass data to untrusted environments and back."; - }; - }; - - "mistune" = python.mkDerivation { - name = "mistune-0.8.4"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/2d/a4/509f6e7783ddd35482feda27bc7f72e65b5e7dc910eca4ab2164daf9c577/mistune-0.8.4.tar.gz"; - sha256 = - "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://github.com/lepture/mistune"; - license = licenses.bsdOriginal; - description = "The fastest markdown parser in pure Python"; - }; - }; - - "pathtools" = python.mkDerivation { - name = "pathtools-0.1.2"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/e7/7f/470d6fcdf23f9f3518f6b0b76be9df16dcc8630ad409947f8be2eb0ed13a/pathtools-0.1.2.tar.gz"; - sha256 = - "7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "http://github.com/gorakhargosh/pathtools"; - license = licenses.mit; - description = "File system general utilities"; - }; - }; - - "pyOpenSSL" = python.mkDerivation { - name = "pyOpenSSL-19.0.0"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/40/d0/8efd61531f338a89b4efa48fcf1972d870d2b67a7aea9dcf70783c8464dc/pyOpenSSL-19.0.0.tar.gz"; - sha256 = - "aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ self."cryptography" self."six" ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://pyopenssl.org/"; - license = licenses.asl20; - description = "Python wrapper module around the OpenSSL library"; - }; - }; - - "pycparser" = python.mkDerivation { - name = "pycparser-2.19"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/68/9e/49196946aee219aead1290e00d1e7fdeab8567783e83e1b9ab5585e6206a/pycparser-2.19.tar.gz"; - sha256 = - "a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://github.com/eliben/pycparser"; - license = licenses.bsdOriginal; - description = "C parser in Python"; - }; - }; - - "pytz" = python.mkDerivation { - name = "pytz-2018.9"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/af/be/6c59e30e208a5f28da85751b93ec7b97e4612268bb054d0dff396e758a90/pytz-2018.9.tar.gz"; - sha256 = - "d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "http://pythonhosted.org/pytz"; - license = licenses.mit; - description = "World timezone definitions, modern and historical"; - }; - }; - - "requests" = python.mkDerivation { - name = "requests-2.21.0"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/52/2c/514e4ac25da2b08ca5a464c50463682126385c4272c18193876e91f4bc38/requests-2.21.0.tar.gz"; - sha256 = - "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."certifi" - self."chardet" - self."cryptography" - self."idna" - self."pyOpenSSL" - self."urllib3" - ]; - meta = with pkgs.stdenv.lib; { - homepage = "http://python-requests.org"; - license = licenses.asl20; - description = "Python HTTP for Humans."; - }; - }; - - "six" = python.mkDerivation { - name = "six-1.12.0"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca/six-1.12.0.tar.gz"; - sha256 = - "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://github.com/benjaminp/six"; - license = licenses.mit; - description = "Python 2 and 3 compatibility utilities"; - }; - }; - - "urllib3" = python.mkDerivation { - name = "urllib3-1.24.1"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/b1/53/37d82ab391393565f2f831b8eedbffd57db5a718216f82f1a8b4d381a1c1/urllib3-1.24.1.tar.gz"; - sha256 = - "de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = - [ self."certifi" self."cryptography" self."idna" self."pyOpenSSL" ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://urllib3.readthedocs.io/"; - license = licenses.mit; - description = - "HTTP library with thread-safe connection pooling, file post, and more."; - }; - }; - - "watchdog" = python.mkDerivation { - name = "watchdog-0.9.0"; - src = pkgs.fetchurl { - url = - "https://files.pythonhosted.org/packages/bb/e3/5a55d48a29300160779f0a0d2776d17c1b762a2039b36de528b093b87d5b/watchdog-0.9.0.tar.gz"; - sha256 = - "965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d"; - }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ self."PyYAML" self."argh" self."pathtools" ]; - meta = with pkgs.stdenv.lib; { - homepage = "http://github.com/gorakhargosh/watchdog"; - license = licenses.asl20; - description = "Filesystem events monitoring"; - }; - }; - - }; - localOverridesFile = ./requirements_override.nix; - overrides = import localOverridesFile { inherit pkgs python; }; - commonOverrides = [ - - ]; - allOverrides = - (if (builtins.pathExists localOverridesFile) then [ overrides ] else [ ]) - ++ commonOverrides; - -in python.withPackages (fix' (pkgs.lib.fold extends generated allOverrides)) diff --git a/pkgs/lektor-with-plugins/requirements_frozen.txt b/pkgs/lektor-with-plugins/requirements_frozen.txt deleted file mode 100644 index e69de29..0000000 diff --git a/pkgs/lektor-with-plugins/requirements_override.nix b/pkgs/lektor-with-plugins/requirements_override.nix deleted file mode 100644 index 572a2cb..0000000 --- a/pkgs/lektor-with-plugins/requirements_override.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ pkgs, python }: -self: super: - -let - - callPackage = pkgs.lib.callPackageWith super; - - lektorShell = callPackage ./lektor-shell/default.nix { inherit pkgs; }; - lektorGit = callPackage ./lektor-git/default.nix { inherit pkgs; }; - lektorMarkdownHeaderAnchors = - callPackage ./lektor-markdown-header-anchors/default.nix { - inherit pkgs; - fetchFromGitHub = pkgs.fetchFromGitHub; - }; - - inputs = [ lektorShell lektorGit lektorMarkdownHeaderAnchors ]; - -in { - - "Lektor" = python.overrideDerivation super."Lektor" (old: { - - propagatedBuildInputs = old.propagatedBuildInputs ++ inputs; - buildInputs = old.buildInputs ++ inputs; - - }); - -} diff --git a/pkgs/polygon-art/default.nix b/pkgs/polygon-art/default.nix index 093544f..487d555 100644 --- a/pkgs/polygon-art/default.nix +++ b/pkgs/polygon-art/default.nix @@ -14,10 +14,12 @@ rustPlatform.buildRustPackage { sha256 = "0iqmikvl93pazxfd120hcr0waxav7zy6px5kmdqxifrjgdbda9xx"; }; - cargoSha256 = "05rkn8iihj4j9k179xx7wn2a07hxks050raj6fbxmj6gdx6aj170"; + #cargoSha256 = "05rkn8iihj4j9k179xx7wn2a07hxks050raj6fbxmj6gdx6aj170"; + cargoSha256 = "0sgk4hw77cxqbqzd258fz67r7fpjblkm7cqh14n5f1c43y8vgxa0"; verifyCargoDeps = true; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + # Needed so bindgen can find libclang.so + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; buildInputs = [ cairo geos clipper openssl ]; diff --git a/pkgs/taskwarrior-hooks/default.nix b/pkgs/taskwarrior-hooks/default.nix index 2ae26d9..5218f23 100644 --- a/pkgs/taskwarrior-hooks/default.nix +++ b/pkgs/taskwarrior-hooks/default.nix @@ -10,7 +10,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1mj0k6ykac332667315kqrvg37j8r8078g48nafv7ini6lw8djas"; }; - cargoSha256 = "0l4sa5c1pfjdlbdxrd61wd2qij4zaf8rx1xqac80jicly9rf3859"; + cargoSha256 = "1panzqb7nfv3w92ij7pnczkqmcidzlr4pra6a0vcqd65j1m3s4wk"; + #cargoSha256 = "0l4sa5c1pfjdlbdxrd61wd2qij4zaf8rx1xqac80jicly9rf3859"; #cargoSha256 = "1ijnh2ank9slmfglw4yhnycl11x26m94m2hiq3hcasmbs6c39zj5"; #verifyCargoDeps = true; diff --git a/system/all/packages.nix b/system/all/packages.nix index 2f077eb..f857b09 100644 --- a/system/all/packages.nix +++ b/system/all/packages.nix @@ -82,7 +82,7 @@ in { zip unzip - pastebin + #pastebin # no need jq miller diff --git a/system/desktop/default.nix b/system/desktop/default.nix index 8fc65e7..055e175 100644 --- a/system/desktop/default.nix +++ b/system/desktop/default.nix @@ -57,19 +57,20 @@ # temperature / power consumption # https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html - services.tlp.enable = true; - services.thermald.enable = true; + # todo fix this + #services.tlp.enable = false; + #services.thermald.enable = false; # fucks up usb mouse #powerManagement.powertop.enable = true; # overwrite use zram on small RAM systems - fileSystems."/share/" = lib.mkDefault { + fileSystems."/share" = lib.mkDefault { device = "tmpfs"; fsType = "tmpfs"; }; # overwrite use zram on small RAM systems - fileSystems."/browsers/" = lib.mkDefault { + fileSystems."/browsers" = lib.mkDefault { device = "tmpfs"; fsType = "tmpfs"; }; diff --git a/system/desktop/packages.nix b/system/desktop/packages.nix index 941778c..7aee776 100644 --- a/system/desktop/packages.nix +++ b/system/desktop/packages.nix @@ -349,8 +349,9 @@ in { (fileContents )) replaceLinks + youtube-dl - image-generator + #image-generator cairo w3m