From bdfd50116a9022e1188c1e6a4fe5767bbf65f6e6 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 26 Feb 2021 22:54:37 +0100 Subject: [PATCH] Revert "mdsh: 0.5.0 -> 0.6.0" This was pushed by mistake! This reverts commit 7ee7b5deec517a238a1618202aadbfbc2aadb55b. --- .../tor-browser-bundle-bin/default.nix | 28 +++++++++---------- .../tools/documentation/mdsh/default.nix | 6 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 7857fb4bdf7..9b0a9078ee5 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -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,16 +27,16 @@ , 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 @@ -45,20 +44,21 @@ , 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. diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index 68be931aa44..c8e6cafa27a 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -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";