Revert "mdsh: 0.5.0 -> 0.6.0"
This was pushed by mistake! This reverts commit 7ee7b5deec517a238a1618202aadbfbc2aadb55b.
This commit is contained in:
parent
7ee7b5deec
commit
bdfd50116a
@ -1,12 +1,11 @@
|
|||||||
{ lib
|
{ lib, stdenv
|
||||||
, stdenv
|
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
|
|
||||||
# Common run-time dependencies
|
# Common run-time dependencies
|
||||||
, zlib
|
, zlib
|
||||||
|
|
||||||
# libxul run-time dependencies
|
# libxul run-time dependencies
|
||||||
, atk
|
, atk
|
||||||
, cairo
|
, cairo
|
||||||
, dbus
|
, dbus
|
||||||
@ -28,16 +27,16 @@
|
|||||||
, libpulseaudio
|
, libpulseaudio
|
||||||
, apulse
|
, apulse
|
||||||
|
|
||||||
# Media support (implies audio support)
|
# Media support (implies audio support)
|
||||||
, mediaSupport ? true
|
, mediaSupport ? true
|
||||||
, ffmpeg_3
|
, ffmpeg_3
|
||||||
|
|
||||||
, gmp
|
, gmp
|
||||||
|
|
||||||
# Pluggable transport dependencies
|
# Pluggable transport dependencies
|
||||||
, python27
|
, python27
|
||||||
|
|
||||||
# Wrapper runtime
|
# Wrapper runtime
|
||||||
, coreutils
|
, coreutils
|
||||||
, glibcLocales
|
, glibcLocales
|
||||||
, gnome3
|
, gnome3
|
||||||
@ -45,20 +44,21 @@
|
|||||||
, shared-mime-info
|
, shared-mime-info
|
||||||
, gsettings-desktop-schemas
|
, gsettings-desktop-schemas
|
||||||
|
|
||||||
# Hardening
|
# Hardening
|
||||||
, graphene-hardened-malloc
|
, graphene-hardened-malloc
|
||||||
# crashes with intel driver
|
# crashes with intel driver
|
||||||
, useHardenedMalloc ? false
|
, useHardenedMalloc ? false
|
||||||
|
|
||||||
# Whether to disable multiprocess support to work around crashing tabs
|
# Whether to disable multiprocess support to work around crashing tabs
|
||||||
# TODO: fix the underlying problem instead of this terrible work-around
|
# TODO: fix the underlying problem instead of this terrible work-around
|
||||||
, disableContentSandbox ? true
|
, disableContentSandbox ? true
|
||||||
|
|
||||||
# Extra preferences
|
# Extra preferences
|
||||||
, extraPrefs ? ""
|
, extraPrefs ? ""
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
libPath = makeLibraryPath libPkgs;
|
libPath = makeLibraryPath libPkgs;
|
||||||
|
|
||||||
@ -91,7 +91,7 @@ let
|
|||||||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||||
|
|
||||||
# Upstream source
|
# Upstream source
|
||||||
version = "10.0.12";
|
version = "10.0.9";
|
||||||
|
|
||||||
lang = "en-US";
|
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}";
|
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;
|
platforms = attrNames srcs;
|
||||||
maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 cap KarlJoad ];
|
maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 cap KarlJoad ];
|
||||||
hydraPlatforms = [ ];
|
hydraPlatforms = [];
|
||||||
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
|
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
|
||||||
# the compound is "libre" in a strict sense (some components place certain
|
# the compound is "libre" in a strict sense (some components place certain
|
||||||
# restrictions on redistribution), it's free enough for our purposes.
|
# restrictions on redistribution), it's free enough for our purposes.
|
||||||
|
@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "mdsh";
|
pname = "mdsh";
|
||||||
version = "0.6.0";
|
version = "0.5.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zimbatm";
|
owner = "zimbatm";
|
||||||
repo = "mdsh";
|
repo = "mdsh";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1ki6w3qf8ipcf7ch5120mj16vs7yan8k9zjd25v8x6vbsd1iccgy";
|
sha256 = "02xslf5ssmyklbfsif2d7yk5aaz08n5w0dqiid6v4vlr2mkqcpjl";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "10iqypz8hfyzy1xd78r39z2waa728d97kfnf1bbx8fr4a4pzan7y";
|
cargoSha256 = "118ykkqlf0x6gcgywx4pg3qawfhfr5q5f51gvrw9s302c1lmgk3g";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Markdown shell pre-processor";
|
description = "Markdown shell pre-processor";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user