From 4efe5617e65e216a2421413f9b5e9df46494bcc6 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sat, 11 Sep 2021 20:05:27 +0200 Subject: [PATCH] fixing nixos-rebuild switch warnings on sterni --- images/etherminer/.gitignore | 2 - images/etherminer/README.md | 16 --- images/etherminer/configuration.nix | 51 --------- images/etherminer/ethminer-pkg.nix | 64 ----------- images/etherminer/ethminer.nix | 106 ------------------ images/etherminer/parameters.nix.sample | 6 - pkgs/bepasty-client-cli/default.nix | 20 ---- pkgs/bitwig-studio/bitwig-studio1.nix | 2 +- pkgs/bitwig-studio/bitwig-studio2.nix | 4 +- pkgs/castget/default.nix | 22 ---- pkgs/default.nix | 58 +--------- pkgs/ethminer/default.nix | 64 ----------- pkgs/fuji-cam/default.nix | 28 ----- pkgs/fuji-cam/my.patch | 66 ----------- pkgs/image-generator/default.nix | 29 ----- pkgs/light-control/default.nix | 4 +- pkgs/lv2vst/default.nix | 24 ---- pkgs/mahlzeit/default.nix | 41 ------- pkgs/memo/default.nix | 50 --------- pkgs/museek/default.nix | 37 ------ pkgs/navi/default.nix | 34 ------ pkgs/otpmenu/default.nix | 6 +- pkgs/pixelnuke/default.nix | 4 +- pkgs/polygon-art/default.nix | 4 +- pkgs/sononym-crawler/default.nix | 4 +- pkgs/sononym/default.nix | 2 +- pkgs/taskwarrior-hooks/default.nix | 4 +- pkgs/terminal-tools/default.nix | 4 +- pkgs/wolf-spectrum/default.nix | 43 ------- system/all/packages/llvm-config-dummy.nix | 2 +- .../home-manager/xmonad/current-project.nix | 4 +- system/desktop/packages.nix | 2 +- 32 files changed, 28 insertions(+), 779 deletions(-) delete mode 100644 images/etherminer/.gitignore delete mode 100644 images/etherminer/README.md delete mode 100644 images/etherminer/configuration.nix delete mode 100644 images/etherminer/ethminer-pkg.nix delete mode 100644 images/etherminer/ethminer.nix delete mode 100644 images/etherminer/parameters.nix.sample delete mode 100644 pkgs/bepasty-client-cli/default.nix delete mode 100644 pkgs/castget/default.nix delete mode 100644 pkgs/ethminer/default.nix delete mode 100644 pkgs/fuji-cam/default.nix delete mode 100644 pkgs/fuji-cam/my.patch delete mode 100644 pkgs/image-generator/default.nix delete mode 100644 pkgs/lv2vst/default.nix delete mode 100644 pkgs/mahlzeit/default.nix delete mode 100644 pkgs/memo/default.nix delete mode 100644 pkgs/museek/default.nix delete mode 100644 pkgs/navi/default.nix delete mode 100644 pkgs/wolf-spectrum/default.nix diff --git a/images/etherminer/.gitignore b/images/etherminer/.gitignore deleted file mode 100644 index 0dac9f3..0000000 --- a/images/etherminer/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -parameters.nix -*.iso \ No newline at end of file diff --git a/images/etherminer/README.md b/images/etherminer/README.md deleted file mode 100644 index b288e7b..0000000 --- a/images/etherminer/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# How to build - -`cp parameters.nix.sample parameters.nix` and set file up. - -``` -nixos-generate \ - -f iso \ - -c configuration.nix \ - -o image.iso \ -``` - -# How to create USB-Stick - -``` -dd if=./image.iso of=/dev/sdXY bs=4096 -``` diff --git a/images/etherminer/configuration.nix b/images/etherminer/configuration.nix deleted file mode 100644 index 8b4de7d..0000000 --- a/images/etherminer/configuration.nix +++ /dev/null @@ -1,51 +0,0 @@ -# $ nixos-generator -f iso -c configuration.nix -o image.iso -{ pkgs, lib, ... }: -let parameters = import ./parameters.nix; -in { - - imports = [ ./ethminer.nix ]; - - nixpkgs.overlays = [ - (self: super: { - ethminer = super.lib.callPackageWith super ./ethminer-pkg.nix { - cudaSupport = true; - }; - }) - ]; - - users.users.root.initialPassword = "root"; - - # allow un-free - # ------------- - nixpkgs.config.allowUnfree = true; - environment.variables.NIXPKGS_ALLOW_UNFREE = "1"; - - time.timeZone = lib.mkDefault "Europe/Berlin"; - - networking.wireless = { - enable = true; - networks."${parameters.ssid}".psk = parameters.password; - }; - - # configure ethminer - own.services.ethminer = { - enable = true; - pool = "eu1.ethermine.org"; - wallet = parameters.wallet; - rig = parameters.rig; - }; - - hardware.opengl = { - enable = true; - #extraPackages = with pkgs; []; - driSupport = true; - driSupport32Bit = true; - }; - - environment.systemPackages = with pkgs; [ - go-ethereum - i7z # check temperature - pciutils # lspci - ]; - -} diff --git a/images/etherminer/ethminer-pkg.nix b/images/etherminer/ethminer-pkg.nix deleted file mode 100644 index 7db924c..0000000 --- a/images/etherminer/ethminer-pkg.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, clangStdenv, fetchFromGitHub, opencl-headers, cmake, jsoncpp -, boost, makeWrapper, cudatoolkit, cudaSupport, mesa, ethash, opencl-info -, ocl-icd, openssl, pkg-config, cli11 }@args: - -# Note that this requires clang < 9.0 to build, and currently -# clangStdenv provides clang 7.1 which satisfies the requirement. -let stdenv = if cudaSupport then clangStdenv else args.stdenv; - -in stdenv.mkDerivation rec { - pname = "ethminer"; - version = "0.19.0"; - - src = fetchFromGitHub { - owner = "ethereum-mining"; - repo = "ethminer"; - rev = "v${version}"; - sha256 = "1kyff3vx2r4hjpqah9qk99z6dwz7nsnbnhhl6a76mdhjmgp1q646"; - fetchSubmodules = true; - }; - - # NOTE: dbus is broken - cmakeFlags = [ - "-DHUNTER_ENABLED=OFF" - "-DETHASHCUDA=ON" - "-DAPICORE=ON" - "-DETHDBUS=OFF" - "-DCMAKE_BUILD_TYPE=Release" - ] ++ lib.optionals (!cudaSupport) [ - "-DETHASHCUDA=OFF" # on by default - ]; - - nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - - buildInputs = [ - cli11 - boost - opencl-headers - mesa - ethash - opencl-info - ocl-icd - openssl - jsoncpp - ] ++ lib.optionals cudaSupport [ cudatoolkit ]; - - preConfigure = '' - sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt - ''; - - postInstall = '' - wrapProgram $out/bin/ethminer --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib - ''; - - meta = with lib; { - description = "Ethereum miner with OpenCL${ - lib.optionalString cudaSupport ", CUDA" - } and stratum support"; - homepage = "https://github.com/ethereum-mining/ethminer"; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ nand0p atemu ]; - license = licenses.gpl3Only; - #broken = cudaSupport; - }; -} diff --git a/images/etherminer/ethminer.nix b/images/etherminer/ethminer.nix deleted file mode 100644 index 7adc821..0000000 --- a/images/etherminer/ethminer.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.own.services.ethminer; - poolUrl = "stratum1+tcp://${cfg.wallet}.${cfg.rig}@${cfg.pool}:${ - toString cfg.stratumPort - }"; - -in { - - ###### interface - - options = { - - own.services.ethminer = { - - enable = mkOption { - type = types.bool; - default = false; - description = "Enable ethminer ether mining."; - }; - - recheckInterval = mkOption { - type = types.int; - default = 2000; - description = "Interval in milliseconds between farm rechecks."; - }; - - toolkit = mkOption { - type = types.enum [ "cuda" "opencl" ]; - default = "cuda"; - description = "Cuda or opencl toolkit."; - }; - - wallet = mkOption { - type = types.str; - example = "0x0123456789abcdef0123456789abcdef01234567"; - description = "Ethereum wallet address."; - }; - - pool = mkOption { - type = types.str; - example = "eth-us-east1.nanopool.org"; - description = "Mining pool address."; - }; - - stratumPort = mkOption { - type = types.port; - default = 4444; - description = "Stratum protocol tcp port."; - }; - - rig = mkOption { - type = types.str; - default = "rig01"; - description = "Mining rig name."; - }; - - maxPower = mkOption { - type = types.int; - default = 113; - description = "Miner max watt usage."; - }; - - }; - - }; - - ###### implementation - - config = mkIf cfg.enable { - - systemd.services.ethminer = { - path = [ pkgs.cudatoolkit ]; - description = "ethminer ethereum mining service"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = { - DynamicUser = true; - ExecStartPre = "${pkgs.ethminer}/bin/.ethminer-wrapped --list-devices"; - ExecStartPost = optional (cfg.toolkit == "cuda") "+${ - getBin config.boot.kernelPackages.nvidia_x11 - }/bin/nvidia-smi -pl ${toString cfg.maxPower}"; - Restart = "always"; - }; - - environment = { - LD_LIBRARY_PATH = "${config.boot.kernelPackages.nvidia_x11}/lib"; - }; - - script = '' - ${pkgs.ethminer}/bin/.ethminer-wrapped \ - --farm-recheck ${toString cfg.recheckInterval} \ - --report-hashrate \ - --${cfg.toolkit} \ - --pool ${poolUrl} - ''; - - }; - - }; - -} diff --git a/images/etherminer/parameters.nix.sample b/images/etherminer/parameters.nix.sample deleted file mode 100644 index 16a07cf..0000000 --- a/images/etherminer/parameters.nix.sample +++ /dev/null @@ -1,6 +0,0 @@ -{ - ssid = "Your SSID"; - password = "Your Password"; - wallet = "Your ETH Wallet Address"; - rig = "usb-stick"; -} diff --git a/pkgs/bepasty-client-cli/default.nix b/pkgs/bepasty-client-cli/default.nix deleted file mode 100644 index 117ca82..0000000 --- a/pkgs/bepasty-client-cli/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, pkgs, pythonPackages, fetchFromGitHub, ... }: - -with pythonPackages; -buildPythonPackage rec { - name = "bepasty-client-cli"; - propagatedBuildInputs = [ python_magic click requests ]; - - src = fetchFromGitHub { - owner = "bepasty"; - repo = "bepasty-client-cli"; - rev = "4b7135ba8ba1e17501de08ad7b6aca73c0d949d2"; - sha256 = "1svchyk9zai1vip9ppm12jm7wfjbdr9ijhgcd2n10xh73jrn9cnc"; - }; - - meta = { - homepage = "https://github.com/bepasty/bepasty-client-cli"; - description = "CLI client for bepasty-server"; - license = lib.licenses.bsd2; - }; -} diff --git a/pkgs/bitwig-studio/bitwig-studio1.nix b/pkgs/bitwig-studio/bitwig-studio1.nix index 06441f3..d4e106c 100644 --- a/pkgs/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/bitwig-studio/bitwig-studio1.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A digital audio workstation"; longDescription = '' Bitwig Studio is a multi-platform music-creation system for diff --git a/pkgs/bitwig-studio/bitwig-studio2.nix b/pkgs/bitwig-studio/bitwig-studio2.nix index 5bcc34d..e6deca6 100644 --- a/pkgs/bitwig-studio/bitwig-studio2.nix +++ b/pkgs/bitwig-studio/bitwig-studio2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bitwig-studio1, xdg_utils, zenity, ffmpeg }: +{ lib, fetchurl, bitwig-studio1, xdg_utils, zenity, ffmpeg }: bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; @@ -12,5 +12,5 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ]; - binPath = stdenv.lib.makeBinPath [ ffmpeg xdg_utils zenity ]; + binPath = lib.makeBinPath [ ffmpeg xdg_utils zenity ]; }) diff --git a/pkgs/castget/default.nix b/pkgs/castget/default.nix deleted file mode 100644 index f888def..0000000 --- a/pkgs/castget/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, curl, glib, id3lib, libxml2, ... }: - -stdenv.mkDerivation rec { - version = "1.2.4"; - name = "castget-${version}"; - - src = fetchurl { - url = "http://savannah.nongnu.org/download/castget/${name}.tar.bz2"; - sha256 = "0bb9pb1pn3d3x6a0l1d7l77gjq369g5v62bbnmg4k1jkxl633vli"; - }; - - buildInputs = [ glib libxml2 curl id3lib pkgconfig ]; - - meta = with stdenv.lib; { - description = - "a simple, command-line based RSS enclosure downloader. It is primarily intended for automatic, unattended downloading of podcasts."; - homepage = "https://castget.johndal.com"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ mrVanDalo ]; - }; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index e00e3ff..30ef974 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -8,63 +8,15 @@ let in { - #image-generator = super.callPackage ./image-generator { }; - - polygon-art = super.callPackage ./polygon-art { }; - - #bitwig-studio1 = super.bitwig-studio1.override { - # libxkbcommon = super.libxkbcommon.overrideAttrs (old: rec { - # name = "libxkbcommon-0.7.2"; - # src = super.fetchurl { - # url = "https://xkbcommon.org/download/${name}.tar.xz"; - # sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918"; - # }; - # }); - #}; - - #haskellPackages = super.haskellPackages.override { - # overrides = self: super: { mahlzeit = super.callPackage ./mahlzeit { }; }; - #}; - - #gitlog2json = callPackage ./gitlog2json { }; - - #fuji-cam-wifi-tool = callPackage ./fuji-cam { }; - - #navi = callPackage ./navi { }; - bitwig-studio3 = callPackage ./bitwig-studio/bitwig-studio3.nix { }; - - #bitwig-studio = callPackage ./bitwig-studio/bitwig-studio-environment.nix { }; - - #lv2vst = callPackage ./lv2vst { }; - - #wolf-spectrum = callPackage ./wolf-spectrum { }; - - landingpage = callPackage ./landingpage { }; - - light-control = callPackage ./light-control { }; - - bepasty-client-cli = callPackage ./bepasty-client-cli { }; - emo = callPackage ./emoji { }; - + landingpage = callPackage ./landingpage { }; + light-control = callPackage ./light-control { }; otpmenu = callPackage ./otpmenu { }; - - taskwarrior-hooks = callPackage ./taskwarrior-hooks { }; - - terminal-tools = callPackage ./terminal-tools { }; - + polygon-art = super.callPackage ./polygon-art { }; sononym = callPackage ./sononym { }; sononym-crawler = callPackage ./sononym-crawler { }; - - #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"; - #}) { }; - - #ethminer = callPackage ./ethminer { cudaSupport = false; }; + taskwarrior-hooks = callPackage ./taskwarrior-hooks { }; + terminal-tools = callPackage ./terminal-tools { }; } diff --git a/pkgs/ethminer/default.nix b/pkgs/ethminer/default.nix deleted file mode 100644 index 78b1d4f..0000000 --- a/pkgs/ethminer/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, clangStdenv, fetchFromGitHub, opencl-headers, cmake, jsoncpp -, boost, makeWrapper, cudatoolkit, cudaSupport, mesa, ethash, opencl-info -, ocl-icd, openssl, pkg-config, cli11 }@args: - -# Note that this requires clang < 9.0 to build, and currently -# clangStdenv provides clang 7.1 which satisfies the requirement. -let stdenv = if cudaSupport then clangStdenv else args.stdenv; - -in stdenv.mkDerivation rec { - pname = "ethminer"; - version = "0.19.0"; - - src = fetchFromGitHub { - owner = "ethereum-mining"; - repo = "ethminer"; - rev = "v${version}"; - sha256 = "1kyff3vx2r4hjpqah9qk99z6dwz7nsnbnhhl6a76mdhjmgp1q646"; - fetchSubmodules = true; - }; - - # NOTE: dbus is broken - cmakeFlags = [ - "-DHUNTER_ENABLED=OFF" - "-DETHASHCUDA=ON" - "-DAPICORE=ON" - "-DETHDBUS=OFF" - "-DCMAKE_BUILD_TYPE=Release" - ] ++ lib.optionals (!cudaSupport) [ - "-DETHASHCUDA=OFF" # on by default - ]; - - nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - - buildInputs = [ - cli11 - boost - opencl-headers - mesa - ethash - opencl-info - ocl-icd - openssl - jsoncpp - ] ++ lib.optionals cudaSupport [ cudatoolkit ]; - - preConfigure = '' - sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt - ''; - - postInstall = '' - wrapProgram $out/bin/ethminer --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib - ''; - - meta = with lib; { - description = "Ethereum miner with OpenCL${ - lib.optionalString cudaSupport ", CUDA" - } and stratum support"; - homepage = "https://github.com/ethereum-mining/ethminer"; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ nand0p atemu ]; - license = licenses.gpl3Only; - broken = cudaSupport; - }; -} diff --git a/pkgs/fuji-cam/default.nix b/pkgs/fuji-cam/default.nix deleted file mode 100644 index 3e378ec..0000000 --- a/pkgs/fuji-cam/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchgit, fetchpatch, cmake, linenoise, opencv, ... }: - -stdenv.mkDerivation rec { - version = "master"; - name = "fuji-cam-wifi-tool-${version}"; - - src = fetchgit { - url = "https://github.com/hkr/fuji-cam-wifi-tool.git"; - rev = "d66aad105f8533f62cf308647850c04f3436af26"; - sha256 = "0bnqdqs7g1p5qz3jnlazydznym516bwwxsyzybqxqxy01jjpc5kw"; - }; - - patches = [ ./my.patch ]; - - buildInputs = [ linenoise opencv ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DWITH_OPENCV=ON" ]; - - meta = with stdenv.lib; { - description = - "Trying to reverse-engineer the wifi remote control protocol used by Fuji X series cameras"; - homepage = "https://github.com/hkr/fuji-cam-wifi-tool"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ mrVanDalo ]; - }; -} diff --git a/pkgs/fuji-cam/my.patch b/pkgs/fuji-cam/my.patch deleted file mode 100644 index 2466a65..0000000 --- a/pkgs/fuji-cam/my.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/lib/include/capabilities.hpp b/lib/include/capabilities.hpp -index d8d05dc..46f3660 100644 ---- a/lib/include/capabilities.hpp -+++ b/lib/include/capabilities.hpp -@@ -37,7 +37,7 @@ enum property_codes: uint16_t { - bool is_known_property(uint16_t value); - std::string to_string(property_codes property); - --enum data_type : uint16_t { -+enum data_types : uint16_t { - data_type_unknown = 0, - data_type_int8 = 1, - data_type_uint8 = 2, -@@ -47,7 +47,7 @@ enum data_type : uint16_t { - data_type_uint32 = 6 - }; - --inline bool is_signed(data_type dt) -+inline bool is_signed(data_types dt) - { - switch (dt) { - default: -@@ -59,7 +59,7 @@ inline bool is_signed(data_type dt) - } - } - --inline size_t data_type_size(data_type dt) -+inline size_t data_type_size(data_types dt) - { - switch (dt) { - case data_type_int8: -@@ -79,7 +79,7 @@ inline size_t data_type_size(data_type dt) - - struct capability { - property_codes property_code = property_unknown; -- data_type data_type = data_type_unknown; -+ data_types data_type = data_type_unknown; - uint8_t get_set = 0; - uint32_t default_value = 0; - uint32_t current_value = 0; -diff --git a/lib/src/capabilities.cpp b/lib/src/capabilities.cpp -index 9f5b175..141d8fc 100644 ---- a/lib/src/capabilities.cpp -+++ b/lib/src/capabilities.cpp -@@ -63,7 +63,7 @@ std::string to_string(property_codes property) - flag = "(current)"; \ - printf("\t\t%s %s\n", value_string, flag.c_str()) - --static int cap_value_to_int(data_type dt, uint32_t value) -+static int cap_value_to_int(data_types dt, uint32_t value) - { - switch (dt) - { -diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt -index 74c15d6..3d221c9 100644 ---- a/tool/CMakeLists.txt -+++ b/tool/CMakeLists.txt -@@ -30,3 +30,8 @@ endif() - if(WIN32) - target_link_libraries(fuji_cam_wifi_tool wsock32 ws2_32) - endif() -+ -+ -+# install -+install(TARGETS fuji_cam_wifi_tool DESTINATION bin) -+ diff --git a/pkgs/image-generator/default.nix b/pkgs/image-generator/default.nix deleted file mode 100644 index 63236ae..0000000 --- a/pkgs/image-generator/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ rustPlatform, fetchgit, stdenv, cairo, ... }: - -rustPlatform.buildRustPackage rec { - name = "image-geneartor-${version}"; - version = "2.0.0"; - # src = ./.; - src = fetchgit { - url = "https://github.com/mrVanDalo/image-generator"; - rev = "7f5fd75ffa0f4ebd531f7f01b51bbec26ff000f4"; - sha256 = "1vflkrld7qiikykna2ygw6cv8vn07x458pkrsrxm8imhm579076r"; - }; - - cargoSha256 = "1zpsqg9v1w17ks22i3vspdydfbznv9s3c9av7lww69wkarksznp5"; - #cargoSha256 = "07pwds279qc54g5fza805ah2m8jhrdzng7vb1bi24a9ra9ci8s29"; - #cargoSha256 = "10s1h1xya2gl5wj9cj104z50d9awv8z2mbply22lpzwzqyxrrxd9"; - #verifyCargoDeps = true; - - buildInputs = [ cairo ]; - - meta = with stdenv.lib; { - description = - "An image generator unsing entropy and a JSON as configuration."; - homepage = "https://git.ingolf-wagner.de/palo/image-generator2"; - license = licenses.gpl3; - maintainers = [ maintainers.mrVanDalo ]; - platforms = platforms.all; - }; -} - diff --git a/pkgs/light-control/default.nix b/pkgs/light-control/default.nix index b0fd5f8..5caf486 100644 --- a/pkgs/light-control/default.nix +++ b/pkgs/light-control/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchgit, stdenv, mosquitto, cmake, openssl, ... }: +{ rustPlatform, fetchgit, lib, mosquitto, cmake, openssl, ... }: rustPlatform.buildRustPackage rec { name = "light-${version}"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake ]; buildInputs = [ mosquitto openssl ]; - meta = with stdenv.lib; { + meta = with lib; { description = "light control over mqtt, with scenes and room tracking"; homepage = "https://github.com/mrVanDalo/light-control"; license = licenses.gpl3; diff --git a/pkgs/lv2vst/default.nix b/pkgs/lv2vst/default.nix deleted file mode 100644 index 60231d9..0000000 --- a/pkgs/lv2vst/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchgit, ... }: - -stdenv.mkDerivation rec { - version = "2019-09-30"; - name = "lv2vst-${version}"; - - src = fetchgit { - url = "https://github.com/x42/lv2vst.git"; - rev = "3fc413550dbe7b37a60ad7808dde05c4670c7bb4"; - sha256 = "0dq1r95fxqwirkyv91j4qbigrazh0wsy769kc27yysl69p3lpgq3"; - }; - - installPhase = "PREFIX=$out VSTDIR=$out/lib/vst/ make install"; - - buildInputs = [ ]; - - meta = with stdenv.lib; { - description = "experimental LV2 to VST2.x wrapper"; - homepage = "https://github.com/x42/lv2vst"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ mrVanDalo ]; - }; -} diff --git a/pkgs/mahlzeit/default.nix b/pkgs/mahlzeit/default.nix deleted file mode 100644 index 6839ba9..0000000 --- a/pkgs/mahlzeit/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ mkDerivation, ansi-terminal, base, directory, doctest, fetchgit, filepath -, megaparsec, optparse-applicative, prettyprinter, process, raw-strings-qq -, stdenv, tasty, tasty-hunit, text, yaml }: -mkDerivation { - pname = "mahlzeit"; - version = "0.1.0"; - src = fetchgit { - url = "https://github.com/kmein/mahlzeit"; - sha256 = "1k8690x7jnvr9ya2b9biv75wpzy15bn03in6af4bspzihi8w4fyl"; - rev = "ea4769ad691de3c6b5b5c161b502a648b663efce"; - fetchSubmodules = true; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal - base - directory - filepath - megaparsec - prettyprinter - text - yaml - ]; - executableHaskellDepends = [ - ansi-terminal - base - directory - filepath - optparse-applicative - process - text - yaml - ]; - testHaskellDepends = - [ base doctest megaparsec raw-strings-qq tasty tasty-hunit ]; - doCheck = false; - homepage = "https://github.com/kmein/mahlzeit"; - description = "Recipe toolkit"; - license = stdenv.lib.licenses.mit; -} diff --git a/pkgs/memo/default.nix b/pkgs/memo/default.nix deleted file mode 100644 index 6be6142..0000000 --- a/pkgs/memo/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ fetchFromGitHub, silver-searcher, tree, man, stdenv, git, pandocSupport ? true -, pandoc ? null, ... }: - -assert pandocSupport -> pandoc != null; - -stdenv.mkDerivation rec { - - name = "memo-${version}"; - - version = "0.6"; - - src = fetchFromGitHub { - owner = "mrVanDalo"; - repo = "memo"; - rev = "${version}"; - sha256 = "1cvjs36f6vxzfz5d63yhyw8j7gdw5hn6cfzccf7ag08lamjhfhbr"; - }; - - installPhase = let - pandocReplacement = if pandocSupport then - "pandoc_cmd=${pandoc}/bin/pandoc" - else - "#pandoc_cmd=pandoc"; - in '' - mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions,share/zsh/site-functions} - substituteInPlace memo \ - --replace "ack_cmd=ack" "ack_cmd=${silver-searcher}/bin/ag" \ - --replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \ - --replace "man_cmd=man" "man_cmd=${man}/bin/man" \ - --replace "git_cmd=git" "git_cmd=${git}/bin/git" \ - --replace "pandoc_cmd=pandoc" "${pandocReplacement}" - mv memo $out/bin/ - mv doc/memo.1 $out/share/man/man1/memo.1 - mv completion/bash/memo.sh $out/share/bash-completion/completions/memo.sh - mv completion/zsh/_memo $out/share/zsh/site-functions/_memo - ''; - - meta = { - description = "A simple tool written in bash to memorize stuff"; - longDescription = '' - A simple tool written in bash to memorize stuff. - Memo organizes is structured through topics which are folders in ~/memo. - ''; - homepage = "http://palovandalo.com/memo/"; - downloadPage = "https://github.com/mrVanDalo/memo/releases"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.mrVanDalo ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/museek/default.nix b/pkgs/museek/default.nix deleted file mode 100644 index 29996c2..0000000 --- a/pkgs/museek/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchgit, pkgconfig, curl, glib, id3lib, libxml2, cmake, libevent -, libxmlxx, ... }: - -stdenv.mkDerivation rec { - version = "0.2"; - name = "museek-plus-${version}"; - - src = fetchgit { - url = "https://github.com/eLvErDe/museek-plus.git"; - rev = "875d96e65697b96c70b2d1e557fc9428b6a1d04a"; - sha256 = "07ajdighiqri09bp1xv7fd4lr8w3x1qb4l2ghyxwkmf4wrq21mlr"; - }; - - nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-DEVERYTHING=0" # (0): Enable all features. - "-DMUSEEKD=1" # (1): Build museekd soulseek daemon. - "-DMUSETUP=0" # (1): Build musetup configuration interface for museekd. - "-DMUSEEQ=0" # (1): Build museeq Qt client. - "-DMUSCAN=0" # (1): Build muscan shared file index generator. - "-DMUCOUS=0" # (0): Build mucous curses client. - "-DMURMUR=0" # (0): Build murmur PyGTK client. - "-DPYMUCIPHER=0" # (0): Generate PyMucipher bindings. - "-DPYTHON_BINDINGS=0" # (0): Generate python bindings. - "-DPYTHON_CLIENTS=0" # (0): Build python clients (mulog, museekchat, museekcontrol, musirc).\ - ]; - - buildInputs = [ glib libxml2 pkgconfig libevent libxmlxx ]; - - meta = with stdenv.lib; { - description = ""; - homepage = ""; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ mrVanDalo ]; - }; -} diff --git a/pkgs/navi/default.nix b/pkgs/navi/default.nix deleted file mode 100644 index 9fc6725..0000000 --- a/pkgs/navi/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ rustPlatform, fetchFromGitHub, stdenv, fzf, makeWrapper, openssl, pkgconfig }: - -rustPlatform.buildRustPackage rec { - pname = "navi"; - version = "2.1.1"; - - src = fetchFromGitHub { - owner = "denisidoro"; - repo = "navi"; - rev = "v${version}"; - #rev = "${version}"; - sha256 = "1195f7c3ij2mkv0k1h9fwn6jkyjb01w0p6mj2xc39w5f6i0c0hwp"; - }; - - cargoSha256 = "0ks25w0dncaiw3ma05r8jrng3cczancrynnpgdksbvgz49lg3wjw"; - - postInstall = '' - mkdir -p $out/share/navi/ - mv shell $out/share/navi/ - - wrapProgram "$out/bin/navi" \ - --suffix "PATH" : "${fzf}/bin" - ''; - buildInputs = [ openssl ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; - - meta = with stdenv.lib; { - description = "An interactive cheatsheet tool for the command-line"; - homepage = "https://github.com/denisidoro/navi"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ mrVanDalo ]; - }; -} diff --git a/pkgs/otpmenu/default.nix b/pkgs/otpmenu/default.nix index 8b75f59..d0bc555 100644 --- a/pkgs/otpmenu/default.nix +++ b/pkgs/otpmenu/default.nix @@ -1,5 +1,5 @@ -{ stdenv, symlinkJoin, rofi, gnused, pass-otp, writeTextFile -, writeShellScriptBin, xdotool }: +{ lib, symlinkJoin, rofi, gnused, pass-otp, writeTextFile, writeShellScriptBin +, xdotool }: let @@ -40,7 +40,7 @@ in symlinkJoin rec { version = "1.0.0"; name = "otpMenu-${version}"; paths = [ bin desktopFile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "similar to passmenu shows and prints otp"; homepage = "https://your.mama"; license = licenses.gpl3; diff --git a/pkgs/pixelnuke/default.nix b/pkgs/pixelnuke/default.nix index 71792b0..fd8083b 100644 --- a/pkgs/pixelnuke/default.nix +++ b/pkgs/pixelnuke/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libevent, glew, glfw, ... }: +{ lib, fetchgit, libevent, glew, glfw, ... }: stdenv.mkDerivation rec { version = "2019-05-19"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp ./pixelnuke $out/bin/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Multiplayer canvas"; homepage = "https://cccgoe.de/wiki/Pixelflut"; license = licenses.unknown; diff --git a/pkgs/polygon-art/default.nix b/pkgs/polygon-art/default.nix index 487d555..27b0ff6 100644 --- a/pkgs/polygon-art/default.nix +++ b/pkgs/polygon-art/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchgit, stdenv, cairo, geos, clipper, clang, pkg-config, cmake +{ rustPlatform, fetchgit, lib, cairo, geos, clipper, clang, pkg-config, cmake , openssl, llvmPackages, ... }: rustPlatform.buildRustPackage { @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ cmake llvmPackages.clang llvmPackages.libclang pkg-config ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Framework with examples to generate plotter friendly SVGs"; homepage = "https://git.ingolf-wagner.de/palo/polygon-art.git"; license = licenses.gpl3Plus; diff --git a/pkgs/sononym-crawler/default.nix b/pkgs/sononym-crawler/default.nix index bceeb68..bb52774 100644 --- a/pkgs/sononym-crawler/default.nix +++ b/pkgs/sononym-crawler/default.nix @@ -1,6 +1,6 @@ -{ pkgs, stdenv, fetchurl }: +{ pkgs, lib, stdenv, fetchurl }: -with stdenv.lib; +with lib; let diff --git a/pkgs/sononym/default.nix b/pkgs/sononym/default.nix index 7b004c1..e417243 100644 --- a/pkgs/sononym/default.nix +++ b/pkgs/sononym/default.nix @@ -1,6 +1,6 @@ { pkgs, stdenv, fetchurl }: -with stdenv.lib; +with lib; let diff --git a/pkgs/taskwarrior-hooks/default.nix b/pkgs/taskwarrior-hooks/default.nix index 5218f23..c1bbf70 100644 --- a/pkgs/taskwarrior-hooks/default.nix +++ b/pkgs/taskwarrior-hooks/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, stdenv, ... }: +{ rustPlatform, fetchFromGitHub, lib, ... }: rustPlatform.buildRustPackage rec { name = "taskwarrior-hooks-${version}"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { #cargoSha256 = "1ijnh2ank9slmfglw4yhnycl11x26m94m2hiq3hcasmbs6c39zj5"; #verifyCargoDeps = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast line-oriented regex search tool, similar to ag and ack"; homepage = "https://github.com/mrvandalo/taskwarrior-hooks"; diff --git a/pkgs/terminal-tools/default.nix b/pkgs/terminal-tools/default.nix index 9082bba..e23ce8d 100644 --- a/pkgs/terminal-tools/default.nix +++ b/pkgs/terminal-tools/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchgit, stdenv, ... }: +{ rustPlatform, fetchgit, lib, ... }: rustPlatform.buildRustPackage rec { name = "terminal-tools-${version}"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { verifyCargoDeps = true; - meta = with stdenv.lib; { + meta = with lib; { description = "tools I use in my shell scripts which should be fast"; homepage = "https://git.ingolf-wagner.de/palo/terminal-tools"; license = licenses.gpl3; diff --git a/pkgs/wolf-spectrum/default.nix b/pkgs/wolf-spectrum/default.nix deleted file mode 100644 index af17194..0000000 --- a/pkgs/wolf-spectrum/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchFromGitHub, libjack2, lv2, xorg, liblo, libGL, pkgconfig }: - -stdenv.mkDerivation rec { - pname = "wolf-spectrum"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "pdesaulniers"; - repo = "wolf-spectrum"; - rev = "v${version}"; - sha256 = "17db1jlj7vb1xyvkdhhrsvdbwb7jqw6i4168cdvlj3yvn2ra8gpm"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libjack2 lv2 xorg.libX11 liblo libGL xorg.libXcursor ]; - - makeFlags = - [ "BUILD_LV2=true" "BUILD_DSSI=false" "BUILD_VST2=true" "BUILD_JACK=true" ]; - - patchPhase = '' - patchShebangs ./dpf/utils/generate-ttl.sh - ''; - - installPhase = '' - mkdir -p $out/lib/lv2 - #mkdir -p $out/lib/dssi - mkdir -p $out/lib/vst - mkdir -p $out/bin/ - cp -r bin/wolf-spectrum.lv2 $out/lib/lv2/ - #cp -r bin/wolf-spectrum-dssi* $out/lib/dssi/ - cp -r bin/wolf-spectrum-vst.so $out/lib/vst/ - cp -r bin/wolf-spectrum $out/bin/ - ''; - - meta = with stdenv.lib; { - homepage = "https://pdesaulniers.github.io/wolf-shaper/"; - description = "Waveshaper plugin with spline-based graph editor"; - license = licenses.gpl3; - maintainers = [ maintainers.magnetophon ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/system/all/packages/llvm-config-dummy.nix b/system/all/packages/llvm-config-dummy.nix index 3435ef6..e3f03e6 100644 --- a/system/all/packages/llvm-config-dummy.nix +++ b/system/all/packages/llvm-config-dummy.nix @@ -1,5 +1,5 @@ { pkgs, config, lib, ... }: -with pkgs.stdenv.lib; { +with pkgs.lib; { environment.systemPackages = let llvm = pkgs.llvm; llvm-config = pkgs.writers.writeBashBin "llvm-config" '' diff --git a/system/desktop/home-manager/xmonad/current-project.nix b/system/desktop/home-manager/xmonad/current-project.nix index c0febe3..789c656 100644 --- a/system/desktop/home-manager/xmonad/current-project.nix +++ b/system/desktop/home-manager/xmonad/current-project.nix @@ -1,5 +1,5 @@ # created by cabal2nix -{ mkDerivation, base, deepseq, stdenv, xmonad, xmonad-contrib, xmonad-extras }: +{ mkDerivation, base, deepseq, lib, xmonad, xmonad-contrib, xmonad-extras }: mkDerivation { pname = "palos-xmonad"; version = "0.1.0.0"; @@ -8,5 +8,5 @@ mkDerivation { isExecutable = true; executableHaskellDepends = [ base deepseq xmonad xmonad-contrib xmonad-extras ]; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; } diff --git a/system/desktop/packages.nix b/system/desktop/packages.nix index 9545cd3..a951f6f 100644 --- a/system/desktop/packages.nix +++ b/system/desktop/packages.nix @@ -11,7 +11,7 @@ let allLicenses = let licenses = builtins.map (license: "echo '${license.shortName} : ${license.fullName}'") - (builtins.attrValues pkgs.stdenv.lib.licenses); + (builtins.attrValues pkgs.lib.licenses); in pkgs.writers.writeBashBin "all-licenses" (lib.concatStringsSep "\n" licenses);