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: 7ee7b5deec51
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bdfd50116a90
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Feb 26, 2021

  1. Revert "mdsh: 0.5.0 -> 0.6.0" 

    This was pushed by mistake!

This reverts commit 7ee7b5d.
    @zimbatm
    zimbatm committed Feb 26, 2021
    Copy the full SHA
    bdfd501 View commit details
Showing with 17 additions and 17 deletions.
  1. +14 −14 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
  2. +3 −3 pkgs/development/tools/documentation/mdsh/default.nix
28 changes: 14 additions & 14 deletions pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{ lib
, stdenv
{ lib, stdenv
, fetchurl
, makeDesktopItem

# Common run-time dependencies
# Common run-time dependencies
, zlib

# libxul run-time dependencies
# libxul run-time dependencies
, atk
, cairo
, dbus
@@ -28,37 +27,38 @@
, libpulseaudio
, apulse

# Media support (implies audio support)
# Media support (implies audio support)
, mediaSupport ? true
, ffmpeg_3

, gmp

# Pluggable transport dependencies
# Pluggable transport dependencies
, python27

# Wrapper runtime
# Wrapper runtime
, coreutils
, glibcLocales
, gnome3
, runtimeShell
, shared-mime-info
, gsettings-desktop-schemas

# Hardening
# Hardening
, graphene-hardened-malloc
# crashes with intel driver
# crashes with intel driver
, useHardenedMalloc ? false

# Whether to disable multiprocess support to work around crashing tabs
# TODO: fix the underlying problem instead of this terrible work-around
# Whether to disable multiprocess support to work around crashing tabs
# TODO: fix the underlying problem instead of this terrible work-around
, disableContentSandbox ? true

# Extra preferences
# Extra preferences
, extraPrefs ? ""
}:

with lib;

let
libPath = makeLibraryPath libPkgs;

@@ -91,7 +91,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

# Upstream source
version = "10.0.12";
version = "10.0.9";

lang = "en-US";

@@ -405,7 +405,7 @@ stdenv.mkDerivation rec {
changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
platforms = attrNames srcs;
maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 cap KarlJoad ];
hydraPlatforms = [ ];
hydraPlatforms = [];
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
# the compound is "libre" in a strict sense (some components place certain
# restrictions on redistribution), it's free enough for our purposes.
6 changes: 3 additions & 3 deletions pkgs/development/tools/documentation/mdsh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "mdsh";
version = "0.6.0";
version = "0.5.0";

src = fetchFromGitHub {
owner = "zimbatm";
repo = "mdsh";
rev = "v${version}";
sha256 = "1ki6w3qf8ipcf7ch5120mj16vs7yan8k9zjd25v8x6vbsd1iccgy";
sha256 = "02xslf5ssmyklbfsif2d7yk5aaz08n5w0dqiid6v4vlr2mkqcpjl";
};

cargoSha256 = "10iqypz8hfyzy1xd78r39z2waa728d97kfnf1bbx8fr4a4pzan7y";
cargoSha256 = "118ykkqlf0x6gcgywx4pg3qawfhfr5q5f51gvrw9s302c1lmgk3g";

meta = with lib; {
description = "Markdown shell pre-processor";