This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{ stdenv | |
, fetchFromGitLab | |
, autoreconfHook | |
, pkg-config | |
, intltool | |
, itstool | |
, mono | |
, yelp-tools | |
, wrapGAppsHook | |
, enchant1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix | |
index f42baa2576a..a2aac1241cd 100644 | |
--- a/pkgs/development/libraries/utf8cpp/default.nix | |
+++ b/pkgs/development/libraries/utf8cpp/default.nix | |
@@ -8,17 +8,20 @@ stdenv.mkDerivation rec { | |
owner = "nemtrif"; | |
repo = "utfcpp"; | |
rev = "v${version}"; | |
- sha256 = "1d5p9l27mxhsmm4zlxjsbxngsmr5yxrzi66x550bf5g92sj52ffc"; | |
+ fetchSubmodules = true; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import math | |
import random | |
FAC3 = 6. | |
FAC5 = 120. | |
FAC7 = 5040. | |
def poorMenSine(x): | |
return x - (x ** 3 / FAC3) + (x ** 5 / FAC5) - (x ** 7 / FAC7) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- /nix/store/nbkx2qghlh05dscldwxbrbbjm0jl2xws-bert-base-german-cased-vocab.txt 1970-01-01 01:00:01.000000000 +0100 | |
+++ bert-base-german-cased-vocab.txt 2020-04-16 11:38:36.000000000 +0200 | |
@@ -121,7 +121,7 @@ | |
ver | |
##ls | |
Z | |
-( | |
+[unused_punctuation4] | |
##ir | |
Die |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- wc.c 2019-11-21 06:57:27.995567360 +0100 | |
+++ wc3.c 2019-11-21 08:05:08.386223937 +0100 | |
@@ -137,11 +137,10 @@ | |
struct stat sb; | |
uintmax_t linect, wordct, charct; | |
int fd, len, warned; | |
- size_t clen; | |
short gotsp; | |
u_char *p; | |
u_char buf[MAXBSIZE]; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/crate2nix.nix b/crate2nix.nix | |
index bca75df..9e0d364 100644 | |
--- a/crate2nix.nix | |
+++ b/crate2nix.nix | |
@@ -178,6 +178,7 @@ rec { | |
dependencies = { | |
"getrandom" = { | |
packageId = "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)"; | |
+ rename = "getrandom_package"; | |
optional = true; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix | |
index 2999c3d4c1d..d3f9ded4a04 100644 | |
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix | |
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix | |
@@ -3,11 +3,11 @@ | |
dependencies, | |
crateFeatures, libName, release, libPath, | |
crateType, metadata, crateBin, hasCrateBin, | |
- extraRustcOpts, verbose, colors }: | |
+ extraRustcOpts, verbose, colors, renames }: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/crate2nix.nix b/crate2nix.nix | |
index bca75df..8adad74 100644 | |
--- a/crate2nix.nix | |
+++ b/crate2nix.nix | |
@@ -123,6 +123,34 @@ rec { | |
}; | |
resolvedDefaultFeatures = [ "std" ]; | |
}; | |
+ "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index) renamed to getrandom_package" | |
+ = rec { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix | |
index 1eee203373a..6ead97e80f8 100644 | |
--- a/pkgs/applications/misc/kitty/default.nix | |
+++ b/pkgs/applications/misc/kitty/default.nix | |
@@ -1,6 +1,6 @@ | |
{ stdenv, substituteAll, fetchFromGitHub, python3Packages, glfw, libunistring, | |
harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, | |
- libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, | |
+ libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, | |
libxkbcommon, libXi, libXext, wayland-protocols, wayland, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --brief -r /nix/store/gicpd9gpwcvjw44qjp8j7szsf1malwmx-conllx-utils-0.4.3-vendor /nix/store/4dlg22k4dh73ab9amkbrkljscm8fr405-conllx-utils-0.4.3-vendor | |
Files /nix/store/gicpd9gpwcvjw44qjp8j7szsf1malwmx-conllx-utils-0.4.3-vendor/aho-corasick/.cargo-checksum.json and /nix/store/4dlg22k4dh73ab9amkbrkljscm8fr405-conllx-utils-0.4.3-vendor/aho-corasick/.cargo-checksum.json differ | |
Only in /nix/store/gicpd9gpwcvjw44qjp8j7szsf1malwmx-conllx-utils-0.4.3-vendor/aho-corasick: .cargo_vcs_info.json | |
Files /nix/store/gicpd9gpwcvjw44qjp8j7szsf1malwmx-conllx-utils-0.4.3-vendor/ansi_term/.cargo-checksum.json and /nix/store/4dlg22k4dh73ab9amkbrkljscm8fr405-conllx-utils-0.4.3-vendor/ansi_term/.cargo-checksum.json differ | |
Only in /nix/store/gicpd9gpwcvjw44qjp8j7szsf1malwmx-conllx-utils-0.4.3-vendor/ansi_term: .travis.yml | |
Files /nix/store/gicpd9gpwcvjw44qjp8j7szsf1malwmx-conllx-utils-0.4.3-vendor/approx/.cargo-checksum.json and /nix/store/4dlg22k4dh73ab9amkbrkljscm8fr405-conllx-utils-0.4.3-vendor/approx/.cargo-checksum.jso |