summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-10-09 13:25:46 +0200
committerlassulus <lassulus@lassul.us>2017-10-09 13:25:46 +0200
commita357a82f9e10c8b35465d1d3458d51e49e8e5676 (patch)
tree0a8da6542296e9743c81226c3b8fdb9b239fbb8b /makefu/5pkgs
parent71e25af663f7b620a2adffa4ac5e0eeaef548a81 (diff)
parent903a1182b5c27cf0c07d267f136a0f2e5be3d89b (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/5pkgs')
-rw-r--r--makefu/5pkgs/custom/inkscape/dxf_fix.patch11
-rw-r--r--makefu/5pkgs/default.nix2
-rw-r--r--makefu/5pkgs/drozer/default.nix2
3 files changed, 7 insertions, 8 deletions
diff --git a/makefu/5pkgs/custom/inkscape/dxf_fix.patch b/makefu/5pkgs/custom/inkscape/dxf_fix.patch
index 5ea0a073e..b7b491d4e 100644
--- a/makefu/5pkgs/custom/inkscape/dxf_fix.patch
+++ b/makefu/5pkgs/custom/inkscape/dxf_fix.patch
@@ -1,13 +1,12 @@
---- ./share/extensions/dxf_outlines.py 2017-02-14 00:46:57.000000000 +0100
-+++ ./share/extensions/dxf_outlines.py.new 2017-05-10 04:15:03.000000000 +0200
-@@ -340,7 +340,7 @@
- scale = eval(self.options.units)
+--- ./share/extensions/dxf_outlines.py 2017-10-08 17:28:45.553368917 +0200
++++ ./share/extensions/dxf_outlines.py.new 2017-10-08 17:29:20.172554152 +0200
+@@ -341,7 +341,7 @@
if not scale:
scale = 25.4/96 # if no scale is specified, assume inch as baseunit
+ scale /= self.unittouu('1px')
- h = self.unittouu(self.document.getroot().xpath('@height', namespaces=inkex.NSS)[0])
-+ h = self.unittouu(self.getDocumentHeight())
++ h = self.unittouu(self.documentHeight())
self.groupmat = [[[scale, 0.0, 0.0], [0.0, -scale, h*scale]]]
doc = self.document.getroot()
self.process_group(doc)
-
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 96975e54f..e99aa696b 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -24,7 +24,7 @@ in {
alsa-hdspmixer = callPackage ./custom/alsa-tools { alsaToolTarget="hdspmixer";};
alsa-hdsploader = callPackage ./custom/alsa-tools { alsaToolTarget="hdsploader";};
qcma = super.pkgs.libsForQt5.callPackage ./custom/qcma { };
- inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client;
+ inherit (callPackage ./devpi {}) devpi-web devpi-server;
nodemcu-uploader = super.pkgs.callPackage ./nodemcu-uploader {};
inkscape = super.pkgs.stdenv.lib.overrideDerivation super.inkscape (old: {
patches = [ ./custom/inkscape/dxf_fix.patch ];
diff --git a/makefu/5pkgs/drozer/default.nix b/makefu/5pkgs/drozer/default.nix
index 885777be4..3df67d07e 100644
--- a/makefu/5pkgs/drozer/default.nix
+++ b/makefu/5pkgs/drozer/default.nix
@@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec {
version = "2.4.3";
buildInputs = [ jdk7 ];
propagatedBuildInputs = with pythonPackages; [
- protobuf3_2
+ protobuf
pyopenssl
pyyaml
] ++ [