Merge staging-next-21.05 into staging-21.05
This commit is contained in:
github-actions[bot]
GitHub
commit
9f8cafe9c6
@ -55,6 +55,22 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
firmwarePartitionOffset = mkOption {
|
||||
type = types.int;
|
||||
default = 8;
|
||||
description = ''
|
||||
Gap in front of the /boot/firmware partition, in mebibytes (1024×1024
|
||||
bytes).
|
||||
Can be increased to make more space for boards requiring to dd u-boot
|
||||
SPL before actual partitions.
|
||||
|
||||
Unless you are building your own images pre-configured with an
|
||||
installed U-Boot, you can instead opt to delete the existing `FIRMWARE`
|
||||
partition, which is used **only** for the Raspberry Pi family of
|
||||
hardware.
|
||||
'';
|
||||
};
|
||||
|
||||
firmwarePartitionID = mkOption {
|
||||
type = types.str;
|
||||
default = "0x2178694e";
|
||||
@ -177,7 +193,7 @@ in
|
||||
zstd -d --no-progress "${rootfsImage}" -o ./root-fs.img
|
||||
|
||||
# Gap in front of the first partition, in MiB
|
||||
gap=8
|
||||
gap=${toString config.sdImage.firmwarePartitionOffset}
|
||||
|
||||
# Create the image file sized to fit /boot/firmware and /, plus slack for the gap.
|
||||
rootSizeBlocks=$(du -B 512 --apparent-size ./root-fs.img | awk '{ print $1 }')
|
||||
|
||||
@ -157,7 +157,7 @@ in
|
||||
${dup} cleanup ${target} --force ${extra}
|
||||
${lib.optionalString (cfg.cleanup.maxAge != null) "${dup} remove-older-than ${lib.escapeShellArg cfg.cleanup.maxAge} ${target} --force ${extra}"}
|
||||
${lib.optionalString (cfg.cleanup.maxFull != null) "${dup} remove-all-but-n-full ${toString cfg.cleanup.maxFull} ${target} --force ${extra}"}
|
||||
${lib.optionalString (cfg.cleanup.maxIncr != null) "${dup} remove-all-incr-but-n-full ${toString cfg.cleanup.maxIncr} ${target} --force ${extra}"}
|
||||
${lib.optionalString (cfg.cleanup.maxIncr != null) "${dup} remove-all-inc-of-but-n-full ${toString cfg.cleanup.maxIncr} ${target} --force ${extra}"}
|
||||
exec ${dup} ${if cfg.fullIfOlderThan == "always" then "full" else "incr"} ${lib.escapeShellArgs (
|
||||
[ cfg.root cfg.targetUrl ]
|
||||
++ concatMap (p: [ "--include" p ]) cfg.include
|
||||
|
||||
@ -184,7 +184,7 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.etcdctl ];
|
||||
environment.systemPackages = [ pkgs.etcd ];
|
||||
|
||||
users.users.etcd = {
|
||||
uid = config.ids.uids.etcd;
|
||||
|
||||
@ -118,7 +118,7 @@ in
|
||||
let speeds = concatStringsSep "," (map toString config.services.getty.serialSpeed); in
|
||||
{ serviceConfig.ExecStart = [
|
||||
"" # override upstream default with an empty ExecStart
|
||||
(gettyCmd "%I ${speeds} $TERM")
|
||||
(gettyCmd "%I --keep-baud ${speeds} $TERM")
|
||||
];
|
||||
restartIfChanged = false;
|
||||
};
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "ghostwriter";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wereturtle";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-bNVhYwX60F3lrP9UmZSntfz83vbmHe9tu/4nUgzUWR4=";
|
||||
sha256 = "sha256-kNt0IIAcblDJ81ENIkoJuJvrI+F+fdVgWUJ6g1YpjqU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config qttools ];
|
||||
|
||||
@ -242,12 +242,12 @@ in
|
||||
|
||||
clion = buildClion rec {
|
||||
name = "clion-${version}";
|
||||
version = "2021.1.1"; /* updated by script */
|
||||
version = "2021.1.2"; /* updated by script */
|
||||
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
|
||||
sha256 = "0xzlkf3gq6fcb0q9mcj8k39880l8h21pb1lz0xl2dqj8cfwpws9h"; /* updated by script */
|
||||
sha256 = "1zx9qwjx7hwjq25y474yj7sxvp9bqnq9l53afs6d4h6131lhjkcz"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-clion";
|
||||
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
|
||||
@ -255,12 +255,12 @@ in
|
||||
|
||||
datagrip = buildDataGrip rec {
|
||||
name = "datagrip-${version}";
|
||||
version = "2021.1.1"; /* updated by script */
|
||||
version = "2021.1.2"; /* updated by script */
|
||||
description = "Your Swiss Army Knife for Databases and SQL";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
|
||||
sha256 = "0smg0qbk3mnm2543w0nlvnyvbwmprf0p3z2spwrmcmfagv50crrx"; /* updated by script */
|
||||
sha256 = "1znb4m7sv7xqi1mq3yw0m51m06wfwmhhxmvck0xkv8s0cfg18qim"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-datagrip";
|
||||
update-channel = "DataGrip RELEASE";
|
||||
@ -268,12 +268,12 @@ in
|
||||
|
||||
goland = buildGoland rec {
|
||||
name = "goland-${version}";
|
||||
version = "2021.1.1"; /* updated by script */
|
||||
version = "2021.1.2"; /* updated by script */
|
||||
description = "Up and Coming Go IDE";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/go/${name}.tar.gz";
|
||||
sha256 = "02fyrq4px9w34amincgjgm6maxpxn445j5h4nfbskx7z428ynx25"; /* updated by script */
|
||||
sha256 = "0g20r7yn4r2h08wv3i8bnnma8x4jljixsbmfml8kixk0pzfhv4px"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-goland";
|
||||
update-channel = "GoLand RELEASE";
|
||||
@ -281,12 +281,12 @@ in
|
||||
|
||||
idea-community = buildIdea rec {
|
||||
name = "idea-community-${version}";
|
||||
version = "2021.1.1"; /* updated by script */
|
||||
version = "2021.1.2"; /* updated by script */
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
|
||||
license = lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
|
||||
sha256 = "1say19p7kgx4b2ccs9bv61phllzhl8gmrd1fp1a5cnagya7vl1c5"; /* updated by script */
|
||||
sha256 = "03i5f6p0abr9yfs9fg90fg7hb1a7zar9q4d4iiag30cmndwpslg2"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-idea-ce";
|
||||
update-channel = "IntelliJ IDEA RELEASE";
|
||||
@ -294,12 +294,12 @@ in
|
||||
|
||||
idea-ultimate = buildIdea rec {
|
||||
name = "idea-ultimate-${version}";
|
||||
version = "2021.1.1"; /* updated by script */
|
||||
version = "2021.1.2"; /* updated by script */
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
|
||||
sha256 = "19zi4njz79z8gi458kz1m0sia79y3rhbayix4rmh93mwfc0npkii"; /* updated by script */
|
||||
sha256 = "0mw4acaik1bkr7gqbwgs3i8f8px8zw95hm1zxgd5gd5kh88n17x5"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-idea";
|
||||
update-channel = "IntelliJ IDEA RELEASE";
|
||||
@ -359,12 +359,12 @@ in
|
||||
|
||||
rider = buildRider rec {
|
||||
name = "rider-${version}";
|
||||
version = "2021.1.2"; /* updated by script */
|
||||
version = "2021.1.3"; /* updated by script */
|
||||
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
|
||||
sha256 = "1a28pi18j0cb2wxhw1vnfg9gqsgf2kyfg0hl4xgqp50gzv7i3aam"; /* updated by script */
|
||||
sha256 = "0k2vpndpachq6g767v2dwfa3xc8mssv0i7wwpm05dgqirpn4n0dw"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-rider";
|
||||
update-channel = "Rider RELEASE";
|
||||
@ -385,12 +385,12 @@ in
|
||||
|
||||
webstorm = buildWebStorm rec {
|
||||
name = "webstorm-${version}";
|
||||
version = "2021.1.1"; /* updated by script */
|
||||
version = "2021.1.2"; /* updated by script */
|
||||
description = "Professional IDE for Web and JavaScript development";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
|
||||
sha256 = "1hici40qsxj2fw29g68i6hr1vhr0h7xrlhkialy74ah53wi7myz1"; /* updated by script */
|
||||
sha256 = "0q4hn6npm0c30v23d30dnphd6wajif0im1b9vjwa121lqi997l34"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-webstorm";
|
||||
update-channel = "WebStorm RELEASE";
|
||||
|
||||
@ -16,13 +16,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
version = "6.9.12-16";
|
||||
version = "6.9.12-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick6";
|
||||
rev = version;
|
||||
sha256 = "sha256-kg8vt88G6huRbJlVYztKxHiFPhGz/QHuNKtbhmai790=";
|
||||
sha256 = "sha256-yZXvxl9Tbl3JRBmRcfsjbkaxywtD08SuUnJayKfwk9M=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@ -26,7 +26,7 @@ in writeScript "update-${name}" ''
|
||||
HOME=`mktemp -d`
|
||||
export GNUPGHOME=`mktemp -d`
|
||||
|
||||
gpg --import ${./mozilla.asc}
|
||||
gpg --receive-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353
|
||||
|
||||
tmpfile=`mktemp`
|
||||
url=${baseUrl}
|
||||
|
||||
@ -7,10 +7,10 @@ in
|
||||
rec {
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
ffversion = "89.0";
|
||||
ffversion = "89.0.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
||||
sha512 = "5089720feda15d054d0aa4c3bdeb84760314dadd6381d7360e688d8e396154868220c6315add650d8d2a42652cb8a9bfeb833885812ef0bd70a74ee58ad18aa3";
|
||||
sha512 = "ffd98ab0887611c5b4aba68346c49a7a31a58150fd8bbae610a4d941c4cff0acef0daaebfbb577787a759b4c1ef3c1199f02681148612f4f5b709983e07e0ccb";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -51,6 +51,7 @@ rec {
|
||||
tests = [ nixosTests.firefox-esr ];
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "firefox-esr-78-unwrapped";
|
||||
versionSuffix = "esr";
|
||||
versionKey = "ffversion";
|
||||
};
|
||||
};
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, gnused
|
||||
, gnugrep
|
||||
, curl
|
||||
, gnupg
|
||||
, attrPath
|
||||
, runtimeShell
|
||||
, baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/"
|
||||
@ -15,7 +16,12 @@
|
||||
|
||||
writeScript "update-${attrPath}" ''
|
||||
#!${runtimeShell}
|
||||
PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]}
|
||||
PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnupg gnused xidel ]}
|
||||
|
||||
set -eux
|
||||
HOME=`mktemp -d`
|
||||
export GNUPGHOME=`mktemp -d`
|
||||
gpg --receive-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353
|
||||
|
||||
url=${baseUrl}
|
||||
|
||||
@ -31,5 +37,11 @@ writeScript "update-${attrPath}" ''
|
||||
sort --version-sort | \
|
||||
tail -n 1`
|
||||
|
||||
update-source-version ${attrPath} "$version" "" "" --version-key=${versionKey}
|
||||
curl --silent --show-error -o "$HOME"/shasums "$url$version/SHA512SUMS"
|
||||
curl --silent --show-error -o "$HOME"/shasums.asc "$url$version/SHA512SUMS.asc"
|
||||
gpgv --keyring="$GNUPGHOME"/pubring.kbx "$HOME"/shasums.asc "$HOME"/shasums
|
||||
|
||||
hash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o)
|
||||
|
||||
update-source-version ${attrPath} "$version" "$hash" "" --version-key=${versionKey}
|
||||
''
|
||||
|
||||
@ -31,12 +31,12 @@ let
|
||||
|
||||
in mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
pname = "qutebrowser";
|
||||
version = "2.2.3";
|
||||
version = "2.3.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 = "sha256-BoP168jxj94nvkrcgC83fPw/TPRsI2PbCooqzWNF62I=";
|
||||
sha256 = "09fz6rd0laisq7pqf9nrllcx58yb129fc05kdk45zrwwggq03b8h";
|
||||
};
|
||||
|
||||
# Needs tox
|
||||
|
||||
@ -25,7 +25,7 @@ let
|
||||
else "");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.6.1"; # Please backport all updates to the stable channel.
|
||||
version = "5.7.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "00q99r3p49fa5j54h1faxrzxfgz1pkx86b1jg3vi94hddlw3xm9c";
|
||||
sha256 = "170x2zsp3z95b123ybs8zqr8sasd5jgd4gl1q32wvhk7m41fvkmd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -335,7 +335,7 @@ stdenv.mkDerivation rec {
|
||||
attrPath = "thunderbird-78";
|
||||
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
|
||||
inherit writeScript lib common-updater-scripts xidel coreutils gnused
|
||||
gnugrep curl runtimeShell;
|
||||
gnugrep gnupg curl runtimeShell;
|
||||
};
|
||||
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep
|
||||
{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep, fetchpatch
|
||||
, enableX11 ? true}:
|
||||
|
||||
let inherit (ocamlPackages) ocaml lablgtk; in
|
||||
@ -17,6 +17,16 @@ stdenv.mkDerivation (rec {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ ocaml ncurses ];
|
||||
|
||||
patches = [
|
||||
# Patch to fix build with ocaml 4.12. Remove in 2.51.4
|
||||
# https://github.com/bcpierce00/unison/pull/481
|
||||
(fetchpatch {
|
||||
name = "fix-compile-with-ocaml-4.12.patch";
|
||||
url = "https://github.com/bcpierce00/unison/commit/14b885316e0a4b41cb80fe3daef7950f88be5c8f.patch?full_index=1";
|
||||
sha256 = "0j1rma1cwdsfql19zvzhfj2ys5c4lbhjcp6jrnck04xnckxxiy3d";
|
||||
})
|
||||
];
|
||||
|
||||
preBuild = (if enableX11 then ''
|
||||
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml
|
||||
'' else "") + ''
|
||||
|
||||
@ -42,14 +42,14 @@
|
||||
, versionAttr ? {
|
||||
major = "3.8";
|
||||
minor = "3";
|
||||
patch = "0";
|
||||
patch = "1";
|
||||
}
|
||||
# We use our build of volk and not the one bundled with the release
|
||||
, fetchSubmodules ? false
|
||||
}:
|
||||
|
||||
let
|
||||
sourceSha256 = "0lwbj3slhc8bjjvfw7yz45if21hajydgy2vsjvj2barzmhfb37fd";
|
||||
sourceSha256 = "0vd39azp8n576dbqsanax7bgsnxwc80riaxid2ihxs4xzyjmbw9r";
|
||||
featuresInfo = {
|
||||
# Needed always
|
||||
basic = {
|
||||
@ -242,6 +242,7 @@ stdenv.mkDerivation rec {
|
||||
# From some reason, if these are not set, libcodec2 and gsm are not
|
||||
# detected properly. The issue is reported upstream:
|
||||
# https://github.com/gnuradio/gnuradio/issues/4278
|
||||
# The above issue was fixed for GR3.9 without a backporting patch.
|
||||
#
|
||||
# NOTE: qradiolink needs libcodec2 to be detected in
|
||||
# order to build, see https://github.com/qradiolink/qradiolink/issues/67
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wireless-regdb";
|
||||
version = "2020.04.29";
|
||||
version = "2021.04.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0yicda474ygahv8da18h1p4yf42s6x2f208mlwcw4xsrxld07zc9";
|
||||
sha256 = "sha256-nkwCsqlxDfTb2zJ8OWEujLuuZJWYev7drrqyjB6j2Po=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -11,7 +11,7 @@ let
|
||||
|
||||
inherit (lib) optionals optionalString;
|
||||
|
||||
version = "1.15.12";
|
||||
version = "1.15.13";
|
||||
|
||||
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
|
||||
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/go/go${version}.src.tar.gz";
|
||||
sha256 = "sha256-HGkRk330onf6dOe378PQhZRJjExK3AtsSuNWYTdSgJE=";
|
||||
sha256 = "sha256-mQaeciNHnM5FU/hPh0uTRfb0BF8nz1CJSJtUbaYZokQ=";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "olm";
|
||||
version = "3.2.2";
|
||||
version = "3.2.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.matrix.org";
|
||||
owner = "matrix-org";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0qji25wiwmkxyfpraxj96c54hyayqmjkvwh0gsy5gb5pz5bp4mcy";
|
||||
sha256 = "1rl7j26li1irb1lqnnkzan7jrj38kvmdn69rlwbbp390v3z15lvh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "ast";
|
||||
|
||||
version = "1.0.10";
|
||||
sha256 = "13s5r1szd80g1mqickghdd38mvjkwss221322mmbrykcfgp4fs30";
|
||||
version = "1.0.12";
|
||||
sha256 = "1mcfx989yrakixlsx2d8v6kyxawfwhig4mra9ccpjasfhad0d31x";
|
||||
|
||||
meta.maintainers = lib.teams.php.members;
|
||||
}
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
buildPecl {
|
||||
pname = "event";
|
||||
|
||||
version = "3.0.2";
|
||||
sha256 = "1ws4l014z52vb23xbsfj6viwkf7fmh462af639xgbp0n6syf77dq";
|
||||
version = "3.0.4";
|
||||
sha256 = "13yb3zvlx43cncawymiwbqyz8gzpq1g03vd0xjlw9vz75b4mwn1x";
|
||||
|
||||
configureFlags = [
|
||||
"--with-event-libevent-dir=${libevent.dev}"
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "igbinary";
|
||||
|
||||
version = "3.2.1";
|
||||
sha256 = "sha256-YBYgz/07PlWWIAmcBWm4xCR/Ap7BitwCBr8m+ONXU9s=";
|
||||
version = "3.2.2";
|
||||
sha256 = "0321pb0298fa67qwj5nhhabkjiaxna5mag15ljyrqzpivimvny92";
|
||||
|
||||
configureFlags = [ "--enable-igbinary" ];
|
||||
makeFlags = [ "phpincludedir=$(dev)/include" ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ buildPecl, lib, fetchFromGitHub, libmaxminddb }:
|
||||
let
|
||||
pname = "maxminddb";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
in
|
||||
buildPecl {
|
||||
inherit pname version;
|
||||
@ -10,7 +10,7 @@ buildPecl {
|
||||
owner = "maxmind";
|
||||
repo = "MaxMind-DB-Reader-php";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2SnajDdO5uAYcuVpEbOuFlZzMxwo/EqFtUSr9XxT0KQ=";
|
||||
sha256 = "1m5y733x4ykldi1pym54mdahfwfnwy2r1n6fnndwi8jz9px9pa5k";
|
||||
};
|
||||
|
||||
buildInputs = [ libmaxminddb ];
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
buildPecl {
|
||||
pname = "mongodb";
|
||||
|
||||
version = "1.9.0";
|
||||
sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs";
|
||||
version = "1.9.1";
|
||||
sha256 = "1mzyssy2a89grw7rwmh0x22lql377nmnqlcv9piam1c32qiwxlg9";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "pcov";
|
||||
|
||||
version = "1.0.8";
|
||||
sha256 = "sha256-6rbniyxLIHPW/e+eWZN1qS8F1rOB7ld1N8JKUS1geRQ=";
|
||||
version = "1.0.9";
|
||||
sha256 = "0q2ig5lxzpwz3qgr05wcyh5jzhfxlygkv6nj6jagkhiialng2710";
|
||||
|
||||
buildInputs = [ pcre' ];
|
||||
|
||||
|
||||
@ -1,30 +1,13 @@
|
||||
{ buildPecl, lib, pcre', fetchpatch }:
|
||||
{ buildPecl, lib, pcre' }:
|
||||
|
||||
buildPecl {
|
||||
pname = "protobuf";
|
||||
|
||||
version = "3.14.0";
|
||||
sha256 = "1ldc4s28hq61cfg8l4c06pgicj0ng7k37f28a0dnnbs7xkr7cibd";
|
||||
version = "3.17.2";
|
||||
sha256 = "0i4npj4sl8ihkzxc6m3vv3nlqk952z9bfwnrk90a9yakw5gfhlz5";
|
||||
|
||||
buildInputs = [ pcre' ];
|
||||
|
||||
patches = [
|
||||
# TODO: remove with next update
|
||||
(fetchpatch {
|
||||
url = "https://github.com/protocolbuffers/protobuf/commit/823f351448f7c432bed40b89ee3309e0a94c1855.patch";
|
||||
sha256 = "sha256-ozHtO8s9zvmh/+wBEge3Yn3n0pbpR3dAojJcuAg/G3s=";
|
||||
stripLen = 4;
|
||||
includes = [
|
||||
"array.c"
|
||||
"def.c"
|
||||
"map.c"
|
||||
"message.c"
|
||||
"protobuf.h"
|
||||
"wkt.inc"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "redis";
|
||||
|
||||
version = "5.3.3";
|
||||
sha256 = "sha256-N3iRYeFkzVIjmjDJojjaYf7FyDlc2sOFtu2PDFD9kvA=";
|
||||
version = "5.3.4";
|
||||
sha256 = "1k5l7xxb06rlwq9jbmbbr03pc74d75vgv7h5bqjkbwan6dphafab";
|
||||
|
||||
internalDeps = with php.extensions; [
|
||||
session
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "swoole";
|
||||
|
||||
version = "4.6.4";
|
||||
sha256 = "0hgndnn27q7fbsb0nw6bfdg0kyy5di9vrmf7g53jc6lsnf73ha31";
|
||||
version = "4.6.7";
|
||||
sha256 = "107wp403z8skkqrcm240vyyy6wqx5a4v2bqhlshlknyi14r2v165";
|
||||
|
||||
buildInputs = [ valgrind pcre' ];
|
||||
internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ];
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
buildPecl {
|
||||
pname = "xdebug";
|
||||
|
||||
version = "3.0.3";
|
||||
sha256 = "sha256-5yZagVGOOX+XLcki50bRpIRTcXf/SJVDUWfRCeKTJDI=";
|
||||
version = "3.0.4";
|
||||
sha256 = "1bvjmnx9bcfq4ikp02kiqg0f7ccgx4mkmz5d7g6v0d263x4r0wmj";
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
|
||||
@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "radare2";
|
||||
version = "5.3.0";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radare";
|
||||
repo = "radare2";
|
||||
rev = version;
|
||||
sha256 = "sha256-xndnRVlqTB/NH1ROo7xkftLP7DufsJu4CCA9MCOEeng=";
|
||||
sha256 = "sha256-VS8eG5RXwKtJSLmyaSifopJU7WYGMUcznn+burPqEYE=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
48
pkgs/games/multimc/0001-pick-latest-java-first.patch
Normal file
48
pkgs/games/multimc/0001-pick-latest-java-first.patch
Normal file
@ -0,0 +1,48 @@
|
||||
From 44e1b2a19a869b907b40e56c85c8a47aa6c22097 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <musfay@protonmail.com>
|
||||
Date: Tue, 22 Jun 2021 21:50:11 +0300
|
||||
Subject: [PATCH] pick latest java first
|
||||
|
||||
---
|
||||
api/logic/java/JavaInstallList.cpp | 4 ++--
|
||||
api/logic/java/JavaUtils.cpp | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/api/logic/java/JavaInstallList.cpp b/api/logic/java/JavaInstallList.cpp
|
||||
index 0bded03c..40898e20 100644
|
||||
--- a/api/logic/java/JavaInstallList.cpp
|
||||
+++ b/api/logic/java/JavaInstallList.cpp
|
||||
@@ -120,8 +120,8 @@ void JavaInstallList::updateListData(QList<BaseVersionPtr> versions)
|
||||
|
||||
bool sortJavas(BaseVersionPtr left, BaseVersionPtr right)
|
||||
{
|
||||
- auto rleft = std::dynamic_pointer_cast<JavaInstall>(left);
|
||||
- auto rright = std::dynamic_pointer_cast<JavaInstall>(right);
|
||||
+ auto rleft = std::dynamic_pointer_cast<JavaInstall>(right);
|
||||
+ auto rright = std::dynamic_pointer_cast<JavaInstall>(left);
|
||||
return (*rleft) > (*rright);
|
||||
}
|
||||
|
||||
diff --git a/api/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp
|
||||
index 5f004a10..6d633631 100644
|
||||
--- a/api/logic/java/JavaUtils.cpp
|
||||
+++ b/api/logic/java/JavaUtils.cpp
|
||||
@@ -350,7 +350,6 @@ QList<QString> JavaUtils::FindJavaPaths()
|
||||
qDebug() << "Linux Java detection incomplete - defaulting to \"java\"";
|
||||
|
||||
QList<QString> javas;
|
||||
- javas.append(this->GetDefaultJava()->path);
|
||||
auto scanJavaDir = [&](const QString & dirPath)
|
||||
{
|
||||
QDir dir(dirPath);
|
||||
@@ -379,6 +378,7 @@ QList<QString> JavaUtils::FindJavaPaths()
|
||||
// general locations used by distro packaging
|
||||
scanJavaDir("/usr/lib/jvm");
|
||||
scanJavaDir("/usr/lib32/jvm");
|
||||
+ javas.append(this->GetDefaultJava()->path);
|
||||
// javas stored in MultiMC's folder
|
||||
scanJavaDir("java");
|
||||
return javas;
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,20 +1,28 @@
|
||||
{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }:
|
||||
{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }:
|
||||
|
||||
let
|
||||
jdk = jdk8;
|
||||
libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ];
|
||||
in mkDerivation rec {
|
||||
pname = "multimc";
|
||||
version = "0.6.12";
|
||||
version = "unstable-2021-06-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MultiMC";
|
||||
repo = "MultiMC5";
|
||||
rev = version;
|
||||
sha256 = "h2T023vrqemWhHiA2/gFleuUhIOucjwTgoExliFiYig=";
|
||||
rev = "8179a89103833805d5374399d80a4305be1b8355";
|
||||
sha256 = "lPz6ZM7TjaixfwWMPaXijKZJQKFPrCegBhvbJ8Xg4P8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
nativeBuildInputs = [ cmake file makeWrapper ];
|
||||
buildInputs = [ qtbase jdk zlib ];
|
||||
buildInputs = [ qtbase jdk8 zlib ];
|
||||
|
||||
patches = [ ./0001-pick-latest-java-first.patch ];
|
||||
|
||||
postPatch = ''
|
||||
# hardcode jdk paths
|
||||
substituteInPlace api/logic/java/JavaUtils.cpp \
|
||||
--replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \
|
||||
--replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")'
|
||||
'';
|
||||
|
||||
cmakeFlags = [ "-DMultiMC_LAYOUT=lin-system" ];
|
||||
|
||||
@ -23,7 +31,9 @@ in mkDerivation rec {
|
||||
install -Dm755 ../application/package/linux/multimc.desktop $out/share/applications/multimc.desktop
|
||||
|
||||
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
|
||||
wrapProgram $out/bin/multimc --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/
|
||||
wrapProgram $out/bin/multimc \
|
||||
--set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \
|
||||
--prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, cups, busybox }:
|
||||
{ lib, stdenv, fetchurl, cups }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epson-inkjet-printer-escpr2";
|
||||
version = "1.1.25";
|
||||
version = "1.1.34";
|
||||
|
||||
src = fetchurl {
|
||||
# To find new versions, visit
|
||||
@ -11,22 +11,15 @@ stdenv.mkDerivation rec {
|
||||
# version.
|
||||
# NOTE: Don't forget to update the webarchive link too!
|
||||
urls = [
|
||||
"https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm"
|
||||
"https://web.archive.org/web/20210212220538if_/https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm"
|
||||
"https://download3.ebz.epson.net/dsc/f/03/00/12/85/48/fd5de1ecd7270b0398399355e265c99dfd1dbafb/epson-inkjet-printer-escpr2-1.1.34.tar.gz"
|
||||
"https://web.archive.org/web/20210627160654/https://download3.ebz.epson.net/dsc/f/03/00/12/85/48/fd5de1ecd7270b0398399355e265c99dfd1dbafb/epson-inkjet-printer-escpr2-1.1.34.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-8hgafO/1qOTVdfAdx7FpOOSLqfTl0sBFunuN/2q7KHw=";
|
||||
sha256 = "sha256-sHBGWbkZ+zolHehyXQR8U2AyKSrgDSPmrkrcfcx/bAs=";
|
||||
};
|
||||
|
||||
patches = [ ./cups-filter-ppd-dirs.patch ];
|
||||
|
||||
buildInputs = [ cups busybox ];
|
||||
|
||||
unpackPhase = ''
|
||||
rpm2cpio $src | cpio -idmv
|
||||
|
||||
tar xvf ${pname}-${version}-1lsb3.2.tar.gz
|
||||
cd ${pname}-${version}
|
||||
'';
|
||||
buildInputs = [ cups ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://download.ebz.epson.net/dsc/search/01/search/";
|
||||
|
||||
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
||||
# --whole-archive linker flag is required to be sure that linker
|
||||
# correctly chooses strong version of symbol regardless of order of
|
||||
# object files at command line.
|
||||
+ lib.optionalString stdenv.targetPlatform.isStatic ''
|
||||
+ lib.optionalString stdenv.hostPlatform.isStatic ''
|
||||
export LDFLAGS=-Wl,--whole-archive
|
||||
'';
|
||||
meta = {
|
||||
|
||||
@ -2,9 +2,6 @@
|
||||
|
||||
with lib;
|
||||
|
||||
# The Magewell Pro Capture drivers are not supported for kernels older than 3.2
|
||||
assert versionAtLeast kernel.version "3.2.0";
|
||||
|
||||
let
|
||||
bits =
|
||||
if stdenv.is64bit then "64"
|
||||
@ -14,15 +11,15 @@ let
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mwprocapture-1.2.${version}-${kernel.version}";
|
||||
version = "4177";
|
||||
name = "mwprocapture-1.3.0.${version}-${kernel.version}";
|
||||
version = "4236";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz";
|
||||
sha256 = "1nf51w9yixpvr767k49sfdb9n9rv5qc72f5yki1mkghbmabw7vys";
|
||||
url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz";
|
||||
sha256 = "1mfgj84km276sq5i8dny1vqp2ycqpvgplrmpbqwnk230d0w3qs74";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ kernel.moduleBuildDependencies ];
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
@ -63,5 +60,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.unfreeRedistributable;
|
||||
maintainers = with maintainers; [ MP2E ];
|
||||
platforms = platforms.linux;
|
||||
broken = kernel.kernelOlder "3.2.0";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jetty";
|
||||
version = "9.4.39.v20210325";
|
||||
version = "9.4.41.v20210516";
|
||||
src = fetchurl {
|
||||
url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
|
||||
sha256 = "0mn3ranh599w946cnykj7sbkj4w7ddpdhly7njmalsgabfbk8qv5";
|
||||
sha256 = "sha256-hFQC1UiqZbbvyMf1FC3eqvVga3QdPWh0fbotatkVHBI=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -11,15 +11,15 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "pomerium";
|
||||
version = "0.13.3";
|
||||
version = "0.13.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pomerium";
|
||||
repo = "pomerium";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-g0w1aIHvf2rJANvGWHeUxdnyCDsvy/PQ9Kp8nDdT/0w=";
|
||||
hash = "sha256:0bpqxbsb4cw12kp1f4a4r1ls292m5wwcmhy69rplyv11i61in4y2";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-grihU85OcGyf9/KKrv87xZonX5r+Z1oHQTf84Ya61fg=";
|
||||
vendorSha256 = "sha256:1y6mpa3f3z1p843mlrzyk9gjg6n57gzsx2pjyygnqw2frr9s3f42";
|
||||
subPackages = [
|
||||
"cmd/pomerium"
|
||||
"cmd/pomerium-cli"
|
||||
|
||||
@ -12,11 +12,11 @@ let
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.36.0";
|
||||
version = "1.37.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-OMbSd64mD2+6GVUxGL4lvQlKAiBuen0PjvyVdk/ePbI=";
|
||||
sha256 = "sha256-BWGbfDBB1jX0PJSR8WCZE3FE1pDs0fRg8/fML3FsJHA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
let
|
||||
versions = {
|
||||
matomo = {
|
||||
version = "4.2.1";
|
||||
sha256 = "d3ea7572c5b42f2636da89b9c15dd7ae16da1d06dab0cea2ed93304a960277ac";
|
||||
version = "4.3.1";
|
||||
sha256 = "Ve4P1cVV/uZ59BcQaUZLTTOwpjX7veof9jR0l3Y9xOQ=";
|
||||
};
|
||||
|
||||
matomo-beta = {
|
||||
version = "4.2.1";
|
||||
version = "4.3.1";
|
||||
# `beta` examples: "b1", "rc1", null
|
||||
# TOOD when updating: use null if stable version is >= latest beta or release candidate
|
||||
beta = null;
|
||||
sha256 = "d3ea7572c5b42f2636da89b9c15dd7ae16da1d06dab0cea2ed93304a960277ac";
|
||||
sha256 = "Ve4P1cVV/uZ59BcQaUZLTTOwpjX7veof9jR0l3Y9xOQ=";
|
||||
};
|
||||
};
|
||||
common = pname: { version, sha256, beta ? null }:
|
||||
|
||||
@ -9,11 +9,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "blueman";
|
||||
version = "2.1.4";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1nk46s1s8yrlqv37sc7la05nnn7sdgqhkrcdm98qin34llwkv70x";
|
||||
sha256 = "0whs1bqnn1fgzrq7y2w1d06ldvfafq6h2xzmcfncbwmyb4i0mhgw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -27,18 +27,6 @@ in stdenv.mkDerivation rec {
|
||||
++ pythonPath
|
||||
++ lib.optional withPulseAudio libpulseaudio;
|
||||
|
||||
patches = [
|
||||
# Don't use etc/dbus-1/system.d
|
||||
(fetchpatch {
|
||||
url = "https://github.com/blueman-project/blueman/commit/ae2be5a70cdea1d1aa0e3ab1c85c1d3a0c4affc6.patch";
|
||||
sha256 = "0nb6jzlxhgjvac52cjwi0pi40b8v4h6z6pwz5vkyfmaj86spygg3";
|
||||
excludes = [
|
||||
"meson.build"
|
||||
"Dependencies.md"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString withPulseAudio ''
|
||||
sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py
|
||||
'';
|
||||
|
||||
23
pkgs/tools/filesystems/exfatprogs/default.nix
Normal file
23
pkgs/tools/filesystems/exfatprogs/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, file }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exfatprogs";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "19pbybgbfnvjb3n944ihrn1r8ch4dm8dr0d44d6w7p63dcp372xy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook file ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "exFAT filesystem userspace utilities";
|
||||
homepage = "https://github.com/exfatprogs/exfatprogs";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ zane ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,24 +2,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tinc";
|
||||
version = "1.1pre17";
|
||||
version = "1.1pre18";
|
||||
|
||||
src = fetchgit {
|
||||
rev = "refs/tags/release-${version}";
|
||||
rev = "release-${version}";
|
||||
url = "git://tinc-vpn.org/tinc";
|
||||
sha256 = "12abmx9qglchgn94a1qwgzldf2kaz77p8705ylpggzyncxv6bw2q";
|
||||
sha256 = "0a7d1xg34p54sv66lckn8rz2bpg7bl01najm2rxiwbsm956y7afm";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "info" ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "tinc-openssl-1.0.2r.patch";
|
||||
url = "http://git.tinc-vpn.org/git/browse?p=tinc;a=patch;h=2b0aeec02d64bb4724da9ff1dbc19b7d35d7c904";
|
||||
sha256 = "0kidzlmgl0cin4g54ygcxa0jbq9vwlk3dyq5f65nkjd8yvayfzi8";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook texinfo ];
|
||||
buildInputs = [ ncurses readline zlib lzo openssl ];
|
||||
|
||||
|
||||
@ -4822,6 +4822,8 @@ in
|
||||
|
||||
exfat = callPackage ../tools/filesystems/exfat { };
|
||||
|
||||
exfatprogs = callPackage ../tools/filesystems/exfatprogs { };
|
||||
|
||||
dos2unix = callPackage ../tools/text/dos2unix { };
|
||||
|
||||
uni2ascii = callPackage ../tools/text/uni2ascii { };
|
||||
@ -26878,7 +26880,6 @@ in
|
||||
unipicker = callPackage ../applications/misc/unipicker { };
|
||||
|
||||
unison = callPackage ../applications/networking/sync/unison {
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_09;
|
||||
enableX11 = config.unison.enableX11 or true;
|
||||
};
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user