Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f29e259efe47
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0c26ef9e7661
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 10, 2020

  1. qutebrowser: 1.8.3 -> 1.9.0 

    Closes #77360
    @emmanuelrosa
    emmanuelrosa committed Jan 10, 2020
    Copy the full SHA
    216dea5 View commit details

  2. Merge pull request #77425 from emmanuelrosa/qutebrowser-1.9 

    qutebrowser: 1.8.3 -> 1.9.0
    @flokli
    flokli authored Jan 10, 2020
    Copy the full SHA
    0c26ef9 View commit details
Showing with 7 additions and 16 deletions.
  1. +2 −2 pkgs/applications/networking/browsers/qutebrowser/default.nix
  2. +5 −14 pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/qutebrowser/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,12 +21,12 @@ let

in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
version = "1.8.3";
version = "1.9.0";

# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "055zmzk3q0m3hx1742nfy2mdawfllrkvijnbzp1hiv01dj1bxaf8";
sha256 = "1y0yq1qfr6g1s7kf3w2crd0b025dv2dfknhlz3v0001ns3rgwj17";
};

# Needs tox
19 changes: 5 additions & 14 deletions pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 2b6896b76..ee05f379d 100644
index a47b5d2f4..f23ee23ef 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -555,22 +555,8 @@ class Quitter:
args: The commandline as a list of strings.
cwd: The current working directory as a string.
@@ -573,13 +573,8 @@ class Quitter(QObject):
Return:
The commandline as a list of strings.
"""
- if os.path.basename(sys.argv[0]) == 'qutebrowser':
- # Launched via launcher script
- args = [sys.argv[0]]
- cwd = None
- elif hasattr(sys, 'frozen'):
- args = [sys.executable]
- cwd = os.path.abspath(os.path.dirname(sys.executable))
- else:
- 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@']
+ cwd = None

# Add all open pages so they get reopened.
page_args = []
page_args = [] # type: typing.MutableSequence[str]