mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-30 22:21:26 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
f515d91189
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, ninja
|
||||
, flex
|
||||
@ -57,23 +56,16 @@ let
|
||||
six
|
||||
];
|
||||
in mkDerivation rec {
|
||||
version = "3.16.10";
|
||||
version = "3.16.13";
|
||||
pname = "qgis-unwrapped";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
sha256 = "sha256-/lsfyTDlkZNIVHg5qgZW7qfOyTC2+1r3ZbsnQmEdy30=";
|
||||
sha256 = "13irzs89lknfxf2y7j931bh0zmqgiwifdbbzvwn8yxxr21gd68ac";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qgis/QGIS/commit/fc1ac8bef8dcc3194857ecd32519aca4867b4fa1.patch";
|
||||
sha256 = "106smg3drx8c7yxzfhd1c7xrq757l5cfxx8lklihyvr4a7wc9gpy";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit pythonBuildInputs;
|
||||
inherit python3Packages;
|
||||
|
||||
@ -148,6 +148,8 @@ in stdenv.mkDerivation rec {
|
||||
# test-eevl.c:64:36: error: initializer element is not a compile-time constant
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16";
|
||||
|
||||
# Check if librsvg was built with --disable-pixbuf-loader.
|
||||
PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ let
|
||||
|
||||
versions = {
|
||||
stable = { version = "2.3.56.9"; sha256 = "sha256-vv01wGQkrasKKjpGSDeDqZbd1X5/iTfGXYN5Jwz+FKE="; };
|
||||
staging = { version = "2.3.57.0"; sha256 = "sha256-7o0AqgQcKYc6c+Hi3x5pC/pKJZPlEsYOYk9sC21+mvM="; };
|
||||
staging = { version = "2.3.57.6"; sha256 = "sha256-ZCOtVmvNXDWLo9UMzxARCp+iyRTcy/ogd5sV0k86JG8="; };
|
||||
};
|
||||
|
||||
override = { version, sha256 }: super: {
|
||||
|
||||
@ -18,22 +18,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "96.0.4664.45",
|
||||
"sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328",
|
||||
"sha256bin64": "1vaazcrlx0999xd9yp25i9kzb8y8g0yqd28xssw7jqwrhz033wgr",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-09-24",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "0153d369bbccc908f4da4993b1ba82728055926a",
|
||||
"sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi"
|
||||
}
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "97.0.4692.20",
|
||||
"sha256": "1njgfz3kz1pyyaaskqc47ldy2gzc3c9a8mjib81nalzrqbmd3372",
|
||||
"sha256bin64": "06vsmzz8nvmx7hfqwvqfmq4h000dw22srxdrgrdfgh7mry0yvf4a",
|
||||
"sha256bin64": "0nsaf46a9pl8cxw5v2zsfp2ynja4m55qi1m4mhwhmyr50138655f",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-11-03",
|
||||
@ -43,6 +30,19 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "98.0.4710.4",
|
||||
"sha256": "0ay4bn9963k7bbv31wfc1iy2z6n6jjk1h2mn7m7893i81raisk8m",
|
||||
"sha256bin64": "0n4kb6iiv9aih7yzrnr9m7znqb2p37grlj8by6gpjfikx3fxf5gg",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-11-16",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e",
|
||||
"sha256": "0jwjfbxlbqxlz7wm46vyrxn3pgwyyd03as6gy5mcvvk9aialqh9f"
|
||||
}
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "96.0.4664.45",
|
||||
"sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328",
|
||||
|
||||
@ -1,16 +1,20 @@
|
||||
{ lib, stdenv, pkgs, fetchurl }:
|
||||
{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook }:
|
||||
let
|
||||
libPathNative = { packages }: lib.makeLibraryPath packages;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocketchat-desktop";
|
||||
version = "3.5.7";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb";
|
||||
sha256 = "1ri8a60fsbqgq83f8wkyfnd59nqk4d0gpz1vanj54769zflpl71s";
|
||||
sha256 = "1691mzg52hkvkzm4pvmjyc3n04ppxk36rjk7zxh8682ciszz9pl3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook #to fully work with gnome also needs programs.dconf.enable = true in your configuration.nix
|
||||
];
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
gtk3
|
||||
stdenv.cc.cc
|
||||
|
||||
@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
|
||||
url = "https://salsa.debian.org/debian/afterstep/raw/master/debian/patches/44-Fix-build-with-gcc-5.patch";
|
||||
sha256 = "1vipy2lzzd2gqrsqk85pwgcdhargy815fxlbn57hsm45zglc3lj4";
|
||||
})
|
||||
|
||||
# Fix pending upstream inclusion for binutils-2.36 support:
|
||||
# https://github.com/afterstep/afterstep/pull/7
|
||||
(fetchpatch {
|
||||
name = "binutils-2.36.patch";
|
||||
url = "https://github.com/afterstep/afterstep/commit/5e9e897cf8c455390dd6f5b27fec49707f6b9088.patch";
|
||||
sha256 = "1kk97max05r2p1a71pvpaza79ff0klz32rggik342p7ki3516qv8";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -10,7 +10,7 @@ let
|
||||
slug = lib.concatStringsSep "/" ((lib.optional (group != null) group) ++ [ owner repo ]);
|
||||
escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug;
|
||||
escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] rev;
|
||||
passthruAttrs = removeAttrs args [ "domain" "owner" "group" "repo" "rev" ];
|
||||
passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" ];
|
||||
|
||||
useFetchGit = deepClone || fetchSubmodules || leaveDotGit;
|
||||
fetcher = if useFetchGit then fetchgit else fetchzip;
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv, llvm_meta, cmake, fetch, libcxx, libunwind, llvm, version
|
||||
, fetchpatch
|
||||
, standalone ? stdenv.hostPlatform.useLLVM or false
|
||||
, withLibunwind ? !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm
|
||||
# on musl the shared objects don't build
|
||||
@ -21,6 +22,13 @@ stdenv.mkDerivation {
|
||||
export TRIPLE=x86_64-apple-darwin
|
||||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch}
|
||||
'' + lib.optionalString (!stdenv.cc.isClang) ''
|
||||
pushd libcxx-*
|
||||
patch -p2 < ${fetchpatch {
|
||||
url = "https://github.com/llvm/llvm-project/commit/76ccec07b4fa0cc68dfd07d557e7fb661804a468.patch";
|
||||
sha256 = "1lgzkfkp7qinfc6gd8x5di1iq1gqdv81249c6f02chn9q122sbq1";
|
||||
}}
|
||||
popd
|
||||
'';
|
||||
|
||||
patches = [
|
||||
|
||||
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc";
|
||||
};
|
||||
|
||||
configureFlags = lib.optional stdenv.isAarch64 "--with-atomictype=pthread";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
|
||||
@ -309,18 +309,18 @@ let
|
||||
|
||||
prisma = super.prisma.override rec {
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
|
||||
sha512 = "sha512-W0AFjVxPOLW5SEnf0ZwbOu4k8ElX98ioFC1E8Gb9Q/nuO2brEwxFJebXglfG+N6zphGbu2bG1I3VAu7aYzR3VA==";
|
||||
sha512 = "sha512-WEYQ+H98O0yigG+lI0gfh4iyBChvnM6QTXPDtY9eFraLXAmyb6tf/T2mUdrUAU1AEvHLVzQA5A+RpONZlQozBg==";
|
||||
};
|
||||
dependencies = [ rec {
|
||||
name = "_at_prisma_slash_engines";
|
||||
packageName = "@prisma/engines";
|
||||
version = "3.4.0-27.1c9fdaa9e2319b814822d6dbfd0a69e1fcc13a85";
|
||||
version = "3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@prisma/engines/-/engines-${version}.tgz";
|
||||
sha512 = "sha512-jyCjXhX1ZUbzA7+6Hm0iEdeY+qFfpD/RB7iSwMrMoIhkVYvnncSdCLBgbK0yqxTJR2nglevkDY2ve3QDxFciMA==";
|
||||
sha512 = "sha512-MqZUrxuLlIbjB3wu8LrRJOKcvR4k3dunKoI4Q2bPfAwLQY0XlpsLZ3TRVW1c32ooVk939p6iGNkaCUo63Et36g==";
|
||||
};
|
||||
}];
|
||||
postInstall = with pkgs; ''
|
||||
|
||||
@ -30,14 +30,15 @@
|
||||
let
|
||||
# Only the pinned release in setup.py works properly
|
||||
unicorn' = unicorn.overridePythonAttrs (old: rec {
|
||||
pname = "unicorn";
|
||||
version = "1.0.2-rc4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "unicorn-engine";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "17nyccgk7hpc4hab24yn57f1xnmr7kq4px98zbp2bkwcrxny8gwy";
|
||||
pname = "unicorn";
|
||||
version = "1.0.2-rc4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "unicorn-engine";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "17nyccgk7hpc4hab24yn57f1xnmr7kq4px98zbp2bkwcrxny8gwy";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
in
|
||||
|
||||
|
||||
@ -21,6 +21,10 @@ buildPythonPackage rec {
|
||||
requests
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"gistyc"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ThomasAlbin/gistyc";
|
||||
description = "A Python based GitHub GIST management tool";
|
||||
|
||||
@ -17,11 +17,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywlroots";
|
||||
version = "0.14.9";
|
||||
version = "0.14.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "jzHh5ubonn6pCaOp+Dnr7tA9n5DdZ28hBM+03jZZlvc=";
|
||||
sha256 = "Ey1B3tx6UufxZs8I64vaoPSNC+4LGdcPuyKrLBHxZa8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -1,34 +1,34 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
|
||||
# Test dependencies
|
||||
, pytest, pytest-mock
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "RestrictedPython";
|
||||
version = "5.1";
|
||||
pname = "restrictedpython";
|
||||
version = "5.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9ae16e500782b41bd1abefd8554ccb26330817bba9ce090d385aa226f1ca83e8";
|
||||
pname = "RestrictedPython";
|
||||
inherit version;
|
||||
sha256 = "sha256-Y02h9sXBIqJi9DOwg+49F6mgOfjxs3eFl++0dGHNNhs=";
|
||||
};
|
||||
|
||||
#propagatedBuildInputs = [ xmltodict requests ifaddr ];
|
||||
|
||||
checkInputs = [
|
||||
pytest pytest-mock
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"RestrictedPython"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Restricted execution environment for Python to run untrusted code";
|
||||
homepage = "https://github.com/zopefoundation/RestrictedPython";
|
||||
description = "A restricted execution environment for Python to run untrusted code";
|
||||
license = lib.licenses.zpl21;
|
||||
maintainers = with lib.maintainers; [ juaningan ];
|
||||
license = licenses.zpl21;
|
||||
maintainers = with maintainers; [ juaningan ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,12 +19,22 @@ buildPythonPackage rec {
|
||||
ln -s ${unicorn-emu}/lib/libunicorn.a prebuilt/
|
||||
'';
|
||||
|
||||
# needed on non-x86 linux
|
||||
setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
# No tests present
|
||||
doCheck = false;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
mv unicorn unicorn.hidden
|
||||
patchShebangs sample_*.py shellcode.py
|
||||
sh -e sample_all.sh
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"unicorn"
|
||||
|
||||
@ -10,19 +10,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "prisma-engines";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "prisma-engines";
|
||||
rev = version;
|
||||
sha256 = "sha256-EuGGGTHBXm6crnoh5h0DYZZHUtzY4W0wlNgMAxbEb5w=";
|
||||
sha256 = "sha256-c4t7r9Os0nmQEBpNeZ+XdTPc/5X6Dyw0dd7J4pw5s88=";
|
||||
};
|
||||
|
||||
# Use system openssl.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
cargoSha256 = "sha256-CwNe4Qsswh+jMFMpg7DEM9Hq2YeEMcN4UTFMd8AEekw=";
|
||||
cargoSha256 = "sha256-rjqFEY7GXXWzlw5E6Wg4KPz25BbvQPuLW5m8+3CbcRw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -5,32 +5,37 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.3.4.1";
|
||||
openrct2-version = "0.3.5";
|
||||
|
||||
# Those versions MUST match the pinned versions within the CMakeLists.txt
|
||||
# file. The REPLAYS repository from the CMakeLists.txt is not necessary.
|
||||
objects-version = "1.0.21";
|
||||
title-sequences-version = "0.1.2c";
|
||||
|
||||
openrct2-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "OpenRCT2";
|
||||
rev = "v${version}";
|
||||
sha256 = "0zjqn47pbgd2nrrbdl3lqk1mcdvwvvpjby2g0gfv6ssfw72fji7d";
|
||||
rev = "v${openrct2-version}";
|
||||
sha256 = "0xmj0qs49d1xlc8lbspr1vg66i0jdjlhcfxci72x6knjvd0vcgz0";
|
||||
};
|
||||
|
||||
objects-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "objects";
|
||||
rev = "v1.0.21";
|
||||
rev = "v${objects-version}";
|
||||
sha256 = "0r2vp2y67jc1mpfl4j83sx5khvvaddx7xs26ppkigmr2d1xpxgr7";
|
||||
};
|
||||
|
||||
title-sequences-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "title-sequences";
|
||||
rev = "v0.1.2c";
|
||||
rev = "v${title-sequences-version}";
|
||||
sha256 = "1qdrm4q75bznmgdrpjdaiqvbf3q4vwbkkmls45izxvyg1djrpsdf";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "openrct2";
|
||||
inherit version;
|
||||
version = openrct2-version;
|
||||
|
||||
src = openrct2-src;
|
||||
|
||||
@ -68,6 +73,15 @@ stdenv.mkDerivation {
|
||||
cp -r ${title-sequences-src} $sourceRoot/data/sequence
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
# Verify that the correct version of the third party repositories is used.
|
||||
|
||||
grep -q '^set(OBJECTS_VERSION "${objects-version}")$' CMakeLists.txt \
|
||||
|| (echo "OBJECTS_VERSION differs!"; exit 1)
|
||||
grep -q '^set(TITLE_SEQUENCE_VERSION "${title-sequences-version}")$' CMakeLists.txt \
|
||||
|| (echo "TITLE_SEQUENCE_VERSION differs!"; exit 1)
|
||||
'';
|
||||
|
||||
preFixup = "ln -s $out/share/openrct2 $out/bin/data";
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -11,7 +11,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ foomatic-filters bc ghostscript systemd vim ];
|
||||
|
||||
patches = [ ./no-hardcode-fw.diff ];
|
||||
patches = [
|
||||
./no-hardcode-fw.diff
|
||||
# Support HBPL1 printers https://www.dechifro.org/hbpl/
|
||||
./hbpl1.patch
|
||||
# Fix "Unimplemented paper code" error for hbpl1 printers
|
||||
# https://github.com/mikerr/foo2zjs/pull/2
|
||||
./papercode-format-fix.patch
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
|
||||
4676
pkgs/misc/drivers/foo2zjs/hbpl1.patch
Normal file
4676
pkgs/misc/drivers/foo2zjs/hbpl1.patch
Normal file
File diff suppressed because it is too large
Load Diff
101
pkgs/misc/drivers/foo2zjs/papercode-format-fix.patch
Normal file
101
pkgs/misc/drivers/foo2zjs/papercode-format-fix.patch
Normal file
@ -0,0 +1,101 @@
|
||||
From 29ac95ac76a9d9977561cef352f8b803579fea2a Mon Sep 17 00:00:00 2001
|
||||
From: Shinbar <richard.shine@gmail.com>
|
||||
Date: Thu, 26 Mar 2020 19:33:39 +0000
|
||||
Subject: [PATCH 1/3] PPDs (e.g. Del-1660.ppd) are specifying paper sizes as
|
||||
parameters e.g. -p1 which are then being picked up as an invalid paper size
|
||||
In cups error_log manifesting as: foo2hbpl1-wrapper: Unimplemented paper code
|
||||
1
|
||||
|
||||
Have amended foo2hbpl1-wrapper.in to intepret paper sizes
|
||||
paper parameters are also now being interpreted.
|
||||
This has fixed for a Dell 1660w printer, running on Ubuntu 18.04
|
||||
---
|
||||
foo2hbpl1-wrapper.in | 28 ++++++++++++++--------------
|
||||
1 file changed, 14 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/foo2hbpl1-wrapper.in b/foo2hbpl1-wrapper.in
|
||||
index 567e891..bb20ed5 100644
|
||||
--- a/foo2hbpl1-wrapper.in
|
||||
+++ b/foo2hbpl1-wrapper.in
|
||||
@@ -341,20 +341,20 @@ Custom*)
|
||||
# /usr/share/ghostscript/9.10/Resource/Init/gs_statd.ps
|
||||
# foo2hbpl1 will provide the appropriate numeric value
|
||||
|
||||
-letter) DIM=5100x6600 ;;
|
||||
-legal) DIM=5100x8400 ;;
|
||||
-a4) DIM=4961x7016 ;;
|
||||
-executive) DIM=4350x6300 ;;
|
||||
-env10) DIM=2475x5700 ;;
|
||||
-monarch) DIM=2325x4500 ;;
|
||||
-c5) DIM=3827x5409 ;;
|
||||
-envDL) DIM=2599x5197 ;;
|
||||
-isob5|b5) DIM=4158x5906 ;;
|
||||
-jisb5) DIM=4299x6071 ;;
|
||||
-a5) DIM=3496x4961 ;;
|
||||
-folio) DIM=5100x7800 ;;
|
||||
-pa4) DIM=4961x6600 ;;
|
||||
-archA) DIM=5400x7200 ;;
|
||||
+4|letter|Letter) DIM=5100x6600 ;;
|
||||
+7|legal|Legal) DIM=5100x8400 ;;
|
||||
+1|a4|A4) DIM=4961x7016 ;;
|
||||
+5|executive|Executive) DIM=4350x6300 ;;
|
||||
+9|env10|Env10) DIM=2475x5700 ;;
|
||||
+10|monarch|EnvMonarch) DIM=2325x4500 ;;
|
||||
+11|c5|EnvC5) DIM=3827x5409 ;;
|
||||
+12|envDL|EnvDL) DIM=2599x5197 ;;
|
||||
+isob5|b5) DIM=4158x5906 ;;
|
||||
+2|jisb5|B5jis) DIM=4299x6071 ;;
|
||||
+a5) DIM=3496x4961 ;;
|
||||
+6|folio|Folio) DIM=5100x7800 ;;
|
||||
+pa4) DIM=4961x6600 ;;
|
||||
+archA) DIM=5400x7200 ;;
|
||||
*) error "Unimplemented paper code $PAPER";;
|
||||
esac
|
||||
|
||||
|
||||
From 289d55ded5af7d84a91b0ecf26bbea18f3cb2d9e Mon Sep 17 00:00:00 2001
|
||||
From: Shinbar <richard.shine@gmail.com>
|
||||
Date: Fri, 27 Mar 2020 09:19:40 +0000
|
||||
Subject: [PATCH 2/3] Added A5 paper size parameter
|
||||
|
||||
---
|
||||
foo2hbpl1-wrapper.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/foo2hbpl1-wrapper.in b/foo2hbpl1-wrapper.in
|
||||
index bb20ed5..474972d 100644
|
||||
--- a/foo2hbpl1-wrapper.in
|
||||
+++ b/foo2hbpl1-wrapper.in
|
||||
@@ -351,7 +351,7 @@ Custom*)
|
||||
12|envDL|EnvDL) DIM=2599x5197 ;;
|
||||
isob5|b5) DIM=4158x5906 ;;
|
||||
2|jisb5|B5jis) DIM=4299x6071 ;;
|
||||
-a5) DIM=3496x4961 ;;
|
||||
+3|a5|A5) DIM=3496x4961 ;;
|
||||
6|folio|Folio) DIM=5100x7800 ;;
|
||||
pa4) DIM=4961x6600 ;;
|
||||
archA) DIM=5400x7200 ;;
|
||||
|
||||
From 393f7a7c70bbf9fa0c39ac1504b220793670d201 Mon Sep 17 00:00:00 2001
|
||||
From: Shinbar <richard.shine@gmail.com>
|
||||
Date: Sun, 29 Mar 2020 10:01:31 +0100
|
||||
Subject: [PATCH 3/3] Makefile now works in FreeBSD
|
||||
|
||||
---
|
||||
osx-hotplug/Makefile | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/osx-hotplug/Makefile b/osx-hotplug/Makefile
|
||||
index 4165085..a9aa06a 100644
|
||||
--- a/osx-hotplug/Makefile
|
||||
+++ b/osx-hotplug/Makefile
|
||||
@@ -64,8 +64,5 @@ clean:
|
||||
rm -f *.o *.1
|
||||
|
||||
uninstall:
|
||||
- ( \
|
||||
- echo "g/osx-hplj-hotplug/d"; \
|
||||
- echo "w"; \
|
||||
- ) | ex $(RC)
|
||||
+ -(echo "g/osx-hplj-hotplug/d"; echo "w") | ex $(RC)
|
||||
-rm -f $(BIN)/osx-hplj-hotplug
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nmon";
|
||||
version = "16m";
|
||||
version = "16n";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/nmon/lmon${version}.c";
|
||||
sha256 = "1hazgrq3m01dzv05639yis1mypcp0jf167n9gqwd3wgxzm2lvv9b";
|
||||
sha256 = "1wpm2f30414b87kpbr9hbidblr5cmfby5skwqd0fkpi5v712q0f0";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.11.4";
|
||||
version = "2021.11.5";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
|
||||
@ -152,7 +152,7 @@ let
|
||||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.11.4";
|
||||
hassVersion = "2021.11.5";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -169,7 +169,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "sha256-411oqzC8VTD7CM9vM/M3m4zW0Ygf2g2hoAXAxGBv7iw=";
|
||||
sha256 = "sha256-5MxArJLzOg9dU4Q2c6BDjvEzR2u7UVumNZjwE84+br8=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
||||
@ -1,17 +1,33 @@
|
||||
{ lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, zlib, lzo, bzip2, lz4, nasm, perl }:
|
||||
|
||||
let
|
||||
inherit (stdenv.hostPlatform) isx86;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lrzip";
|
||||
version = "0.641";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.xz";
|
||||
sha256 = "0ziyanspd96dc3lp2qdcylc7aq8dhb511jhqrhxvlp502fjqjqrc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ckolivas";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-253CH6TiHWyr13C76y9PXjyB7gj2Bhd2VRgJ5r+cm/g=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib lzo bzip2 lz4 nasm perl ];
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
# Building the ASM/x86 directory creates an empty archive,
|
||||
# which fails on darwin, so remove it
|
||||
# https://github.com/ckolivas/lrzip/issues/193
|
||||
# https://github.com/Homebrew/homebrew-core/pull/85360
|
||||
substituteInPlace lzma/Makefile.am --replace "SUBDIRS = C ASM/x86" "SUBDIRS = C"
|
||||
substituteInPlace configure.ac --replace "-f elf64" "-f macho64"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
nativeBuildInputs = [ autoreconfHook perl ] ++ lib.optionals isx86 [ nasm ];
|
||||
|
||||
buildInputs = [ zlib lzo bzip2 lz4 ];
|
||||
|
||||
configureFlags = lib.optionals (!isx86) [
|
||||
"--disable-asm"
|
||||
];
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user