public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-03-26 07:53:44 +01:00
parent 15151dabaf 26fdaef6b2
commit b3c854b60b
195 changed files with 3269 additions and 1871 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/1password-gui/default.nix
+2 -2
View File
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "1password";
version = "8.0.28";
version = "8.0.30";
src = fetchurl {
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
hash = "sha256-okLeyok/5rihGXaQaUR06dGkpuqqW02qJ6q6VVLtZsE=";
hash = "sha256-j+fp/f8nta+OOuOFU4mmUrGYlVmAqdaXO4rLJ0in+m8=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/applications/misc/bashSnippets/default.nix
+5 -3
View File
@@ -1,10 +1,10 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
, curl, python, bind, iproute, bc, gitMinimal }:
, curl, python3, bind, iproute, bc, gitMinimal }:
let
version = "1.23.0";
deps = lib.makeBinPath [
curl
python
python3
bind.dnsutils
iproute
bc
@@ -24,11 +24,13 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
patchPhase = ''
postPatch = ''
patchShebangs install.sh
substituteInPlace install.sh --replace /usr/local "$out"
'';
strictDeps = true;
dontBuild = true;
installPhase = ''
pkgs/applications/misc/cherrytree/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, pythonPackages, gettext }:
{ lib, fetchFromGitHub, python2Packages, gettext }:
pythonPackages.buildPythonApplication rec {
python2Packages.buildPythonApplication rec {
pname = "cherrytree";
version = "0.39.4";
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = [ gettext ];
propagatedBuildInputs = with pythonPackages; [ pygtk dbus-python pygtksourceview ];
propagatedBuildInputs = with python2Packages; [ pygtk dbus-python pygtksourceview ];
patches = [ ./subprocess.patch ];
pkgs/applications/misc/curabydagoma/default.nix
+6 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, runtimeShell, lib, fetchurl, python, pythonPackages, unzip }:
{ stdenv, runtimeShell, lib, fetchurl, python2Packages, unzip }:
# This package uses a precompiled "binary" distribution of CuraByDagoma,
# distributed by the editor.
@@ -13,7 +13,9 @@
# I guess people owning a 3D printer generally don't use i686.
# If, however, someone needs it, we certainly can find a solution.
stdenv.mkDerivation rec {
let
pythonPackages = python2Packages;
in stdenv.mkDerivation rec {
pname = "curabydagoma";
# Version is the date, UNIX format
version = "1520506579";
@@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
};
unpackCmd = "unzip $curSrc && tar zxf CuraByDagoma_amd64.tar.gz";
nativeBuildInputs = [ unzip ];
buildInputs = [ python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ];
buildInputs = [ pythonPackages.python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ];
# Compile all pyc files because the included pyc files may be older than the
# py files. However, Python doesn't realize that because the packages
@@ -46,7 +48,7 @@ stdenv.mkDerivation rec {
cat > $out/bin/curabydago <<EOF
#!${runtimeShell}
export PYTHONPATH=$PYTHONPATH
${python.out}/bin/python $out/curabydago/cura.py
${pythonPackages.python.interpreter} $out/curabydago/cura.py
EOF
chmod a+x $out/bin/curabydago
pkgs/applications/misc/dockbarx/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, pythonPackages, gnome2, keybinder }:
{ lib, fetchFromGitHub, python2Packages, gnome2, keybinder }:
pythonPackages.buildPythonApplication rec {
python2Packages.buildPythonApplication rec {
ver = "0.93";
name = "dockbarx-${ver}";
@@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec {
substituteInPlace dockx_applets/volume-control.py --replace /usr/share/ $out/share/
'';
propagatedBuildInputs = (with pythonPackages; [ pygtk pyxdg dbus-python pillow xlib ])
propagatedBuildInputs = (with python2Packages; [ pygtk pyxdg dbus-python pillow xlib ])
++ (with gnome2; [ gnome_python gnome_python_desktop ])
++ [ keybinder ];
pkgs/applications/misc/dotfiles/default.nix
+5 -5
View File
@@ -1,10 +1,10 @@
{ lib, pythonPackages }:
{ lib, python3Packages }:
pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "dotfiles";
version = "0.6.4";
src = pythonPackages.fetchPypi {
src = python3Packages.fetchPypi {
inherit version pname;
sha256 = "03qis6m9r2qh00sqbgwsm883s4bj1ibwpgk86yh4l235mdw8jywv";
};
@@ -12,8 +12,8 @@ pythonPackages.buildPythonApplication rec {
# No tests in archive
doCheck = false;
checkInputs = with pythonPackages; [ pytest ];
propagatedBuildInputs = with pythonPackages; [ click ];
checkInputs = with python3Packages; [ pytest ];
propagatedBuildInputs = with python3Packages; [ click ];
meta = with lib; {
description = "Easily manage your dotfiles";
pkgs/applications/misc/gammu/default.nix
+4 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python, pkg-config, cmake, bluez, libusb1, curl
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, bluez, libusb1, curl
, libiconv, gettext, sqlite
, dbiSupport ? false, libdbi ? null, libdbiDrivers ? null
, postgresSupport ? false, postgresql ? null
@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ python bluez libusb1 curl gettext sqlite libiconv ]
strictDeps = true;
buildInputs = [ bluez libusb1 curl gettext sqlite libiconv ]
++ optionals dbiSupport [ libdbi libdbiDrivers ]
++ optionals postgresSupport [ postgresql ];
pkgs/applications/misc/gpxsee/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "gpxsee";
version = "8.8";
version = "8.9";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
sha256 = "sha256-eAXMmjPcfnJA5w6w/SRc6T5KHss77t0JijTB6+ctjzo=";
sha256 = "sha256-nl9iu8ezgMZ1wy2swDXYRDLlkSz1II+C65UUWNvGBxg=";
};
patches = (substituteAll {
pkgs/applications/misc/pure-maps/default.nix
+11 -8
View File
@@ -1,7 +1,7 @@
{ lib, mkDerivation, fetchFromGitHub, wrapQtAppsHook
{ lib, mkDerivation, fetchFromGitHub
, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors
, nemo-qml-plugin-dbus, mapbox-gl-qml, s2geometry
, python3, pyotherside, python3Packages
, python3, pyotherside
}:
mkDerivation rec {
@@ -16,12 +16,14 @@ mkDerivation rec {
fetchSubmodules = true;
};
nativeBuildInputs = [ qmake python3 qttools wrapQtAppsHook ];
nativeBuildInputs = [
qmake python3 qttools python3.pkgs.wrapPython
];
buildInputs = [
kirigami2 qtquickcontrols2 qtlocation qtsensors
nemo-qml-plugin-dbus pyotherside mapbox-gl-qml s2geometry
];
propagatedBuildInputs = with python3Packages; [ gpxpy pyxdg ];
postPatch = ''
substituteInPlace pure-maps.pro \
@@ -30,10 +32,11 @@ mkDerivation rec {
qmakeFlags = [ "FLAVOR=kirigami" ];
dontWrapQtApps = true;
postInstall = ''
wrapQtApp $out/bin/pure-maps \
--prefix PYTHONPATH : "$out/share"
pythonPath = with python3.pkgs; [ gpxpy ];
preInstall = ''
buildPythonPath "$pythonPath"
qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
'';
meta = with lib; {
pkgs/applications/misc/zettlr/default.nix
+10 -4
View File
@@ -1,5 +1,10 @@
{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas
, texlive, pandoc, pandoc-citeproc
{ appimageTools
, lib
, fetchurl
, gtk3
, gsettings-desktop-schemas
, texlive
, pandoc
}:
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
@@ -14,7 +19,8 @@ let
appimageContents = appimageTools.extractType2 {
inherit name src;
};
in appimageTools.wrapType2 rec {
in
appimageTools.wrapType2 rec {
inherit name src;
profile = ''
@@ -22,7 +28,7 @@ in appimageTools.wrapType2 rec {
'';
multiPkgs = null; # no 32bit needed
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc pandoc-citeproc ];
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ];
extraInstallCommands = ''
mv $out/bin/{${name},${pname}}
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop