b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2020-12-04 18:14:51 +00:00 committed by GitHub
parent 5524c43f2c b66ea6fc39
commit cb36dd7449
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 89 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/builders/packages/firefox.section.md
View file

@ -7,7 +7,7 @@ The `wrapFirefox` function allows to pass policies, preferences and extension th
```nix ```nix
{ {
myFirefox = wrapFirefox firefox-unwrapped { myFirefox = wrapFirefox firefox-unwrapped {
extraExtensions = [ nixExtensions = [
(fetchFirefoxAddon { (fetchFirefoxAddon {
name = "ublock"; name = "ublock";
url = "https://addons.mozilla.org/firefox/downloads/file/3679754/ublock_origin-1.31.0-an+fx.xpi"; url = "https://addons.mozilla.org/firefox/downloads/file/3679754/ublock_origin-1.31.0-an+fx.xpi";
@ -38,3 +38,12 @@ The `wrapFirefox` function allows to pass policies, preferences and extension th
}; };
} }
``` ```
If `nixExtensions != null` then all manually installed addons will be uninstalled from your browser profile.
To view available enterprise policies visit [enterprise policies](https://github.com/mozilla/policy-templates#enterprisepoliciesenabled)
or type into the Firefox url bar: `about:policies#documentation`.
Nix installed addons do not have a valid signature, which is why signature verification is disabled. This does not compromise security because downloaded addons are checksumed and manual addons can't be installed.
# Troubleshooting
If addons do not appear installed although they have been defined in your nix configuration file reset the local addon state of your Firefox profile by clicking `help -> restart with addons disabled -> restart -> refresh firefox`. This can happen if you switch from manual addon mode to nix addon mode and then back to manual mode and then again to nix addon mode.

2
nixos/modules/system/boot/loader/grub/grub.nix
View file

@ -741,7 +741,7 @@ in
+ "'boot.loader.grub.mirroredBoots' to make the system bootable."; + "'boot.loader.grub.mirroredBoots' to make the system bootable.";
} }
{ {
assertion = cfg.efiSupport || all (c: c < 2) (mapAttrsToList (_: c: c) bootDeviceCounters); assertion = cfg.efiSupport || all (c: c < 2) (mapAttrsToList (n: c: if n == "nodev" then 0 else c) bootDeviceCounters);
message = "You cannot have duplicated devices in mirroredBoots"; message = "You cannot have duplicated devices in mirroredBoots";
} }
{ {

4
pkgs/applications/misc/ausweisapp2/default.nix
View file

@ -3,13 +3,13 @@
mkDerivation rec { mkDerivation rec {
pname = "AusweisApp2"; pname = "AusweisApp2";
version = "1.20.2"; version = "1.22.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Governikus"; owner = "Governikus";
repo = "AusweisApp2"; repo = "AusweisApp2";
rev = version; rev = version;
sha256 = "1vibk3wmn54qr2mwz537hrr959y0r1zabp0gsijhzj2mk68g9pnb"; sha256 = "00isb8xcbm419nvxx2ri0n8x5d403733h2whjqjcd3hmpx3x4q1h";
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];

4
pkgs/applications/misc/dasel/default.nix
View file

@ -16,6 +16,10 @@ buildGoModule rec {
vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw";
buildFlagsArray = ''
-ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version}
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Query and update data structures from the command line"; description = "Query and update data structures from the command line";
longDescription = '' longDescription = ''

14
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -41,7 +41,7 @@ let
# https://github.com/mozilla/policy-templates#enterprisepoliciesenabled # https://github.com/mozilla/policy-templates#enterprisepoliciesenabled
, extraPolicies ? {} , extraPolicies ? {}
, firefoxLibName ? "firefox" # Important for tor package or the like , firefoxLibName ? "firefox" # Important for tor package or the like
, extraExtensions ? [ ] , nixExtensions ? null
}: }:
assert forceWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used assert forceWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used
@ -100,19 +100,21 @@ let
policiesJson = builtins.toFile "policies.json" policiesJson = builtins.toFile "policies.json"
(builtins.toJSON enterprisePolicies); (builtins.toJSON enterprisePolicies);
usesNixExtensions = nixExtensions != null;
extensions = builtins.map (a: extensions = builtins.map (a:
if ! (builtins.hasAttr "extid" a) then if ! (builtins.hasAttr "extid" a) then
throw "extraExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon"
else else
a a
) extraExtensions; ) (if usesNixExtensions then nixExtensions else []);
enterprisePolicies = enterprisePolicies =
{ {
policies = { policies = lib.optionalAttrs usesNixExtensions {
DisableAppUpdate = true; DisableAppUpdate = true;
} // } //
{ lib.optionalAttrs usesNixExtensions {
ExtensionSettings = { ExtensionSettings = {
"*" = { "*" = {
blocked_install_message = "You can't have manual extension mixed with nix extensions"; blocked_install_message = "You can't have manual extension mixed with nix extensions";
@ -137,7 +139,7 @@ let
// to be able to install addons that do not have an extid // to be able to install addons that do not have an extid
// Security is maintained because only user whitelisted addons // Security is maintained because only user whitelisted addons
// with a checksum can be installed // with a checksum can be installed
lockPref("xpinstall.signatures.required", false); ${ lib.optionalString usesNixExtensions ''lockPref("xpinstall.signatures.required", false)'' };
${extraPrefs} ${extraPrefs}
''; '';

6
pkgs/applications/office/espanso/default.nix
View file

@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "espanso"; pname = "espanso";
version = "0.7.2"; version = "0.7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "federico-terzi"; owner = "federico-terzi";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "11b02i254dn5nwk8m2g21ixz22qcqgcf90vwll0n3yny78p40hn0"; sha256 = "1q47r43midkq9574gl8gdv3ylvrnbhdc39rrw4y4yk6jbdf5wwkm";
}; };
cargoSha256 = "1cnz6rbqbb08j67bw485qi22pi31b3l3yzgr6w1qx780ldf1zd54"; cargoSha256 = "0mxksifjagx25qkyg6ym0zlhal8014j8iim54cd44ndbkkiqlyxc";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules

6
pkgs/applications/window-managers/i3/status-rust.nix
View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "i3status-rust"; pname = "i3status-rust";
version = "0.14.2"; version = "0.14.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "greshake"; owner = "greshake";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1f1gvgb1zk8gw596vaz9iihbpybwzs5shd25qq7bn2bhr4hqlbb9"; sha256 = "1k9dgmd4wz9950kr35da31rhph43gmvg8dif7hg1xw41xch6bi60";
}; };
cargoSha256 = "1dcfclk8lbqvq2hywr80jm63p1i1kz3893zq99ipgryia46vd397"; cargoSha256 = "0qqkcgl9iz4kxl1a2vv2p7vy7wxn970y28jynf3n7hfp16i3liy2";
nativeBuildInputs = [ pkgconfig makeWrapper ]; nativeBuildInputs = [ pkgconfig makeWrapper ];

4
pkgs/data/themes/greybird/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "greybird"; pname = "greybird";
version = "3.22.12"; version = "3.22.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shimmerproject"; owner = "shimmerproject";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1j66ddvl3pmwh2v8ajm8r5g5nbsr7r262ff1qn2nf3i0gy8b3lq8"; sha256 = "154qawiga792iimkpk3a6q8f4gm4r158wmsagkbqqbhj33kxgxhg";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/development/dhall-modules/Prelude.nix
View file

@ -1,11 +1,11 @@
{ buildDhallGitHubPackage }: { buildDhallGitHubPackage }:
buildDhallGitHubPackage { buildDhallGitHubPackage {
name = "Prelude-19.0.0"; name = "Prelude-20.0.0";
owner = "dhall-lang"; owner = "dhall-lang";
repo = "dhall-lang"; repo = "dhall-lang";
directory = "Prelude"; directory = "Prelude";
file = "package.dhall"; file = "package.dhall";
rev = "v19.0.0"; rev = "v20.0.0";
sha256 = "04m29f5xlks6rarv1gy909j68bsflwl18l9bg7kyy1vpwap0avkp"; sha256 = "1smk57xki1cj24xpp0s3gv85radl6ry76ybsjkqak8h13s79lwla";
} }

4
pkgs/development/libraries/cpp-utilities/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cpp-utilities"; pname = "cpp-utilities";
version = "5.8.0"; version = "5.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Martchus"; owner = "Martchus";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "06mpag2hg2vb03pdc5f9cjkpgw3kdh3bh29xfrbb16ixk4rhv0j7"; sha256 = "0lcbvmighmc03qxcf03vqmn6188wx4dr3m9d5ldxm2v7mw5xbq82";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/draco/default.nix
View file

@ -2,14 +2,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.3.6"; version = "1.4.0";
pname = "draco"; pname = "draco";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "draco"; repo = "draco";
rev = version; rev = version;
sha256 = "06adhz8gsnns6q98yzjm64xs04qp2fhm9bv0wxny68rkw0bh95a0"; sha256 = "0s65il754fpiygbg0yq2xynpbnmhiiaxghkzprjqxziyz6gi87lm";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/development/libraries/faudio/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "faudio"; pname = "faudio";
version = "20.11"; version = "20.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FNA-XNA"; owner = "FNA-XNA";
repo = "FAudio"; repo = "FAudio";
rev = version; rev = version;
sha256 = "0mc8dkdmvkaq418vwn6y9d7fbcdp47djc38rly7b4zarl8hwmc4q"; sha256 = "1iwfsfbd2ji7lkk5fh0wla287gph0sadlf0pz2j0vyddpkvr0xgx";
}; };
nativeBuildInputs = [cmake]; nativeBuildInputs = [cmake];

4
pkgs/development/python-modules/certbot/default.nix
View file

@ -9,13 +9,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "certbot"; pname = "certbot";
version = "1.9.0"; version = "1.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1y04mchxybmy197lgj2rz53fx29s248hirsmb3zk2vdzlbbbs1b6"; sha256 = "035cdw2h3f511drc0q1j65j911m1pj6c5ghywavkhib0chim044c";
}; };
sourceRoot = "source/${pname}"; sourceRoot = "source/${pname}";

2
pkgs/development/python-modules/pytorch/default.nix
View file

@ -297,6 +297,6 @@ in buildPythonPackage rec {
homepage = "https://pytorch.org/"; homepage = "https://pytorch.org/";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin; platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin;
maintainers = with lib.maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds maintainers = with lib.maintainers; [ danieldk teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds
}; };
} }

6
pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
View file

@ -2,7 +2,7 @@
makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }:
buildGoModule rec { buildGoModule rec {
name = "buildkite-agent-${version}"; name = "buildkite-agent-${version}";
version = "3.25.0"; version = "3.26.0";
goPackagePath = "github.com/buildkite/agent"; goPackagePath = "github.com/buildkite/agent";
@ -10,10 +10,10 @@ buildGoModule rec {
owner = "buildkite"; owner = "buildkite";
repo = "agent"; repo = "agent";
rev = "v${version}"; rev = "v${version}";
sha256 = "VxAGi2NpXpc3U+GNIvGJSkdHGODrX2s8oY+dQ8QXIHQ="; sha256 = "1z8hiamg3h1fnsmr8j5l9q6c8cd81lqmd00gcmz4spw73pqfxg3r";
}; };
vendorSha256 = "X1K6uKiMFXTDT1PcedGQ8HLGox8ePP7Cz0Ihf4m9ts8="; vendorSha256 = "1kxnpn4py8a2rz1gwg0y3yiwcwphj38pkp2k9z1p85ccm2wblljz";
postPatch = '' postPatch = ''
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash

2
pkgs/development/tools/misc/stlink/default.nix
View file

@ -5,7 +5,7 @@ let
libusb1' = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; libusb1' = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1;
# IMPORTANT: You need permissions to access the stlink usb devices. # IMPORTANT: You need permissions to access the stlink usb devices.
# Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix # Add services.udev.packages = [ pkgs.stlink ] to your configuration.nix
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "stlink"; pname = "stlink";

6
pkgs/development/web/flyctl/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "flyctl"; pname = "flyctl";
version = "0.0.151"; version = "0.0.153";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "superfly"; owner = "superfly";
repo = "flyctl"; repo = "flyctl";
rev = "v${version}"; rev = "v${version}";
sha256 = "0gd0cgzhikwa11mfpmvk0dp198vhlh09kjgk67xjj4gg9g61nkg9"; sha256 = "1an6j4bv9ib5rn78dbn8h1pdkw3fcd3fdrymhvr6909pvcz7bbgy";
}; };
preBuild = '' preBuild = ''
@ -17,7 +17,7 @@ buildGoModule rec {
subPackages = [ "." ]; subPackages = [ "." ];
vendorSha256 = "018vffgi85aqzb93hbld2f3lrc01jxb9aj5j5ss5c0a689g83gmq"; vendorSha256 = "0fmbwk0j2aayvi3cx8cfp4b3h89v88qm4kslbmhlj8mny9rd7lys";
doCheck = false; doCheck = false;

4
pkgs/servers/jackett/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jackett"; pname = "jackett";
version = "0.16.2269"; version = "0.16.2291";
src = fetchurl { src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
sha256 = "0bzyp2jjbfjh1xr2ga8vl6vyjhwks824sa8r1g5iydn9y36am7pf"; sha256 = "1ybjssrj73qf34v66cv32gnlpvppp8kg2bwdv0r7qdy2vj5dx14a";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

4
pkgs/servers/monitoring/prometheus/nginx-exporter.nix
View file

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
pname = "nginx_exporter"; pname = "nginx_exporter";
version = "0.6.0"; version = "0.8.0";
goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter";
@ -14,7 +14,7 @@ buildGoPackage rec {
rev = "v${version}"; rev = "v${version}";
owner = "nginxinc"; owner = "nginxinc";
repo = "nginx-prometheus-exporter"; repo = "nginx-prometheus-exporter";
sha256 = "1rwafmm9x0sxj4z7x4axhrjgdy15z70a1y00hw6smq30fcpkazhq"; sha256 = "sha256-fFzwJXTwtI0NXZYwORRZomj/wADqxW+wvDH49QK0IZw=";
}; };
doCheck = true; doCheck = true;

6
pkgs/servers/sql/dolt/default.nix
View file

@ -2,18 +2,18 @@
buildGoModule rec { buildGoModule rec {
pname = "dolt"; pname = "dolt";
version = "0.22.1"; version = "0.22.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "liquidata-inc"; owner = "liquidata-inc";
repo = "dolt"; repo = "dolt";
rev = "v${version}"; rev = "v${version}";
sha256 = "1n0yxnjxlz2bvybdvba8cqqv702ry3crq114l2bni7q7llfs5y08"; sha256 = "04lsmh80br1cr26dp11ai0f96lmjdkc9mjdwnmwkkc0d7igv7rc0";
}; };
modRoot = "./go"; modRoot = "./go";
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
vendorSha256 = "0avk20g7ic1gw1qr8bp4rbl7m822q2kphwc9f6ld6p5yl6pwqv3h"; vendorSha256 = "0hyp44gzmp49mv26xa9j2nc64y2v3np1x1iqc4vsryf3ajsy2720";
doCheck = false; doCheck = false;

4
pkgs/tools/graphics/gromit-mpx/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gromit-mpx"; pname = "gromit-mpx";
version = "1.3.1"; version = "1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bk138"; owner = "bk138";
repo = "gromit-mpx"; repo = "gromit-mpx";
rev = version; rev = version;
sha256 = "1dvn7vwg4fg1a3lfj5f7nij1vcxm27gyf2wr817f3qb4sx5xmjwy"; sha256 = "1xn14r7lhay720y78j1fs4amp5lia39kpq7vzv02x4nnwhgbsd9r";
}; };
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

37
pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
View file

@ -1,5 +1,5 @@
{ clangStdenv, fetchFromGitHub, fetchpatch, which, ninja, python, gyp, pkgconfig { stdenv, fetchFromGitHub, which, ninja, python, pkgconfig, protobuf
, protobuf, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese }: , ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }:
let let
japanese_usage_dictionary = fetchFromGitHub { japanese_usage_dictionary = fetchFromGitHub {
@ -8,11 +8,11 @@ let
rev = "e5b3425575734c323e1d947009dd74709437b684"; rev = "e5b3425575734c323e1d947009dd74709437b684";
sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm";
}; };
in clangStdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "ibus-mozc-${version}"; name = "ibus-mozc-${version}";
version = "2.23.2815.102"; version = "2.23.4206.102";
meta = with clangStdenv.lib; { meta = with stdenv.lib; {
isIbusEngine = true; isIbusEngine = true;
description = "Japanese input method from Google"; description = "Japanese input method from Google";
homepage = "https://github.com/google/mozc"; homepage = "https://github.com/google/mozc";
@ -21,37 +21,28 @@ in clangStdenv.mkDerivation rec {
maintainers = with maintainers; [ gebner ericsagnes ]; maintainers = with maintainers; [ gebner ericsagnes ];
}; };
nativeBuildInputs = [ which ninja python gyp pkgconfig qt5.wrapQtAppsHook ]; nativeBuildInputs = [ which ninja python3Packages.python python3Packages.six
python3Packages.gyp pkgconfig qt5.wrapQtAppsHook ];
buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ]; buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "mozc"; repo = "mozc";
rev = "afb03ddfe72dde4cf2409863a3bfea160f7a66d8"; rev = "91cc1e19ef34aeb12888b697fefa52907f1a834d";
sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx"; sha256 = "1fyy9g1pnaq6s5nkf56aqmp5mgyibbmp1ylc64fqc6g1plg90zk2";
fetchSubmodules = true;
}; };
patches = [
# https://github.com/google/mozc/pull/444 - fix for gcc8 STL
(fetchpatch {
url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch";
sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla";
})
# Support dates after 2019
(fetchpatch {
url = "https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/add_support_new_japanese_era.patch";
sha256 = "1dsiiglrmm8i8shn2hv0j2b8pv6miysjrimj4569h606j4lwmcw2";
})
];
postUnpack = '' postUnpack = ''
rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/ rm -rf $sourceRoot/src/third_party/japanese_usage_dictionary/
ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary
'' + stdenv.lib.optionalString stdenv.isLinux ''
sed -i 's/-lc++/-lstdc++/g' $sourceRoot/src/gyp/common.gypi
''; '';
configurePhase = '' configurePhase = ''
export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model" export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model"
cd src && python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc cd src && python build_mozc.py gyp --gypdir=${python3Packages.gyp}/bin --server_dir=$out/lib/mozc
''; '';
buildPhase = '' buildPhase = ''

4
pkgs/tools/misc/fluent-bit/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fluent-bit"; pname = "fluent-bit";
version = "1.6.6"; version = "1.6.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fluent"; owner = "fluent";
repo = "fluent-bit"; repo = "fluent-bit";
rev = "v${version}"; rev = "v${version}";
sha256 = "0hkl0wb1xsq7z7gbmblq4fj42llw58lxgvm41z7bliq8a2qg3hv9"; sha256 = "1rybz69yhjm1g8m6wmn6v143a65y69w2fvs62yr8n1r92cadzbia";
}; };
nativeBuildInputs = [ cmake flex bison ]; nativeBuildInputs = [ cmake flex bison ];

4
pkgs/tools/misc/goreleaser/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "goreleaser"; pname = "goreleaser";
version = "0.148.0"; version = "0.149.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "goreleaser"; owner = "goreleaser";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "11dzh5scfwf8lm0rw5f3z0plix5p4mmvgigzav2g59p0wdw3v3jy"; sha256 = "14yvxnl2ap1hizpk3pfzlh36399df1z2zgsc63qdh1h4ixyav6cy";
}; };
vendorSha256 = "17l15z2wyxzh7h7hvb1fysdnyg8wr8ww827vvmki73s1plfgr80d"; vendorSha256 = "17l15z2wyxzh7h7hvb1fysdnyg8wr8ww827vvmki73s1plfgr80d";

6
pkgs/tools/networking/gping/default.nix
View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gping"; pname = "gping";
version = "1.0.1-post2"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "orf"; owner = "orf";
repo = "gping"; repo = "gping";
rev = "v${version}"; rev = "v${version}";
sha256 = "0cvbwxvq1cj9xcjc3hnxrpq9yrmfkapy533cbjzsjmvgiqk11hps"; sha256 = "10hvzgn98qbzs7mmql9wlbll814mkki29lvg71lbvr81wlbdn6mr";
}; };
cargoSha256 = "0vdhincvfassj7gbiplwbi43yyic3l6wlc32s6ci68b2wjmff8pn"; cargoSha256 = "0kkfrdzyy5068k8nz08pfc4cl1dvn0vd6i01gax5dblk122ybbag";
meta = with lib; { meta = with lib; {
description = "Ping, but with a graph"; description = "Ping, but with a graph";

6
pkgs/tools/security/pass/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, pkgs, fetchurl, buildEnv { stdenv, lib, pkgs, fetchurl, buildEnv
, coreutils, gnused, getopt, git, tree, gnupg, openssl, which, procps , coreutils, findutils, gnugrep, gnused, getopt, git, tree, gnupg, openssl
, qrencode , makeWrapper, pass, symlinkJoin , which, procps , qrencode , makeWrapper, pass, symlinkJoin
, xclip ? null, xdotool ? null, dmenu ? null , xclip ? null, xdotool ? null, dmenu ? null
, x11Support ? !stdenv.isDarwin , dmenuSupport ? x11Support , x11Support ? !stdenv.isDarwin , dmenuSupport ? x11Support
@ -80,8 +80,10 @@ stdenv.mkDerivation rec {
wrapperPath = with stdenv.lib; makeBinPath ([ wrapperPath = with stdenv.lib; makeBinPath ([
coreutils coreutils
findutils
getopt getopt
git git
gnugrep
gnupg gnupg
gnused gnused
tree tree

3
pkgs/tools/security/pass/extensions/audit/default.nix
View file

@ -30,7 +30,8 @@ in stdenv.mkDerivation rec {
buildInputs = [ pythonEnv ]; buildInputs = [ pythonEnv ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
doCheck = true; # Tests freeze on darwin with: pass-audit-1.1 (checkPhase): EOFError
doCheck = !stdenv.isDarwin;
checkInputs = [ pythonPackages.green pass gnupg ]; checkInputs = [ pythonPackages.green pass gnupg ];
checkPhase = '' checkPhase = ''
${pythonEnv}/bin/python3 setup.py green -q ${pythonEnv}/bin/python3 setup.py green -q

3
pkgs/top-level/all-packages.nix
View file

@ -3044,8 +3044,7 @@ in
m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
python = python2; stdenv = clangStdenv;
inherit (python2Packages) gyp;
protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
}; };