nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 18:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77425 from emmanuelrosa/qutebrowser-1.9

Browse Source 
qutebrowser: 1.8.3 -> 1.9.0
This commit is contained in:
Florian Klink 2020-01-10 11:35:13 +01:00 committed by GitHub
commit 0c26ef9e76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/qutebrowser/default.nix
View File

@ -21,12 +21,12 @@ let
in mkDerivationWith python3Packages.buildPythonApplication rec { in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser"; pname = "qutebrowser";
version = "1.8.3"; version = "1.9.0";
# the release tarballs are different from the git checkout! # the release tarballs are different from the git checkout!
src = fetchurl { src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "055zmzk3q0m3hx1742nfy2mdawfllrkvijnbzp1hiv01dj1bxaf8"; sha256 = "1y0yq1qfr6g1s7kf3w2crd0b025dv2dfknhlz3v0001ns3rgwj17";
}; };
# Needs tox # Needs tox

19
pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch
View File

@ -1,29 +1,20 @@
diff --git a/qutebrowser/app.py b/qutebrowser/app.py diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 2b6896b76..ee05f379d 100644 index a47b5d2f4..f23ee23ef 100644
--- a/qutebrowser/app.py --- a/qutebrowser/app.py
+++ b/qutebrowser/app.py +++ b/qutebrowser/app.py
@@ -555,22 +555,8 @@ class Quitter: @@ -573,13 +573,8 @@ class Quitter(QObject):
args: The commandline as a list of strings. Return:
cwd: The current working directory as a string. The commandline as a list of strings.
""" """
- if os.path.basename(sys.argv[0]) == 'qutebrowser': - if os.path.basename(sys.argv[0]) == 'qutebrowser':
- # Launched via launcher script - # Launched via launcher script
- args = [sys.argv[0]] - args = [sys.argv[0]]
- cwd = None
- elif hasattr(sys, 'frozen'): - elif hasattr(sys, 'frozen'):
- args = [sys.executable] - args = [sys.executable]
- cwd = os.path.abspath(os.path.dirname(sys.executable))
- else: - else:
- args = [sys.executable, '-m', 'qutebrowser'] - args = [sys.executable, '-m', 'qutebrowser']
- cwd = os.path.join(
- os.path.abspath(os.path.dirname(qutebrowser.__file__)), '..')
- if not os.path.isdir(cwd):
- # Probably running from a python egg. Let's fallback to
- # cwd=None and see if that works out.
- # See https://github.com/qutebrowser/qutebrowser/issues/323
- cwd = None
+ args = ['@qutebrowser@'] + args = ['@qutebrowser@']
+ cwd = None + cwd = None
# Add all open pages so they get reopened. # Add all open pages so they get reopened.
page_args = [] page_args = [] # type: typing.MutableSequence[str]