diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-21 19:43:53 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-21 19:43:53 +0200 |
commit | ad47d658d1734353df834a05e45b98dae968550d (patch) | |
tree | 5ee2481126f5e29cf961e3b955b748609bc08f82 /pkgs/applications/misc/octoprint | |
parent | 8213ff161c461655aaff7d43984384dbca64b312 (diff) | |
parent | cc218fc91530529b84307faf6fa2dd8c5d395d6f (diff) | |
download | nixpkgs-ad47d658d1734353df834a05e45b98dae968550d.tar nixpkgs-ad47d658d1734353df834a05e45b98dae968550d.tar.gz nixpkgs-ad47d658d1734353df834a05e45b98dae968550d.tar.bz2 nixpkgs-ad47d658d1734353df834a05e45b98dae968550d.tar.lz nixpkgs-ad47d658d1734353df834a05e45b98dae968550d.tar.xz nixpkgs-ad47d658d1734353df834a05e45b98dae968550d.tar.zst nixpkgs-ad47d658d1734353df834a05e45b98dae968550d.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc/octoprint')
-rw-r--r-- | pkgs/applications/misc/octoprint/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/octoprint/plugins.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index b3a32d30c39..99d23b0eb7c 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2, fetchurl }: +{ stdenv, fetchFromGitHub, python2 }: let diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 0a1d26012a8..bd65acf5e5e 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, octoprint, pythonPackages }: +{ stdenv, fetchFromGitHub, octoprint, pythonPackages }: let buildPlugin = args: pythonPackages.buildPythonApplication (args // { |