diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md
index 1a8924082bf..f4f6c086a80 100644
--- a/doc/languages-frameworks/android.section.md
+++ b/doc/languages-frameworks/android.section.md
@@ -191,6 +191,8 @@ androidenv.emulateApp {
}
```
+Additional flags may be applied to the Android SDK's emulator through the runtime environment variable `$NIX_ANDROID_EMULATOR_FLAGS`.
+
It is also possible to specify an APK to deploy inside the emulator
and the package and activity names to launch it:
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 75a8a8ef9ff..0acf720c4eb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4190,6 +4190,12 @@
githubId = 87115;
name = "Wael Nasreddine";
};
+ kalekseev = {
+ email = "mail@kalekseev.com";
+ github = "kalekseev";
+ githubId = 367259;
+ name = "Konstantin Alekseev";
+ };
kamadorueda = {
name = "Kevin Amado";
email = "kamadorueda@gmail.com";
@@ -4427,6 +4433,12 @@
githubId = 524268;
name = "Koral";
};
+ koslambrou = {
+ email = "koslambrou@gmail.com";
+ github = "koslambrou";
+ githubId = 2037002;
+ name = "Konstantinos";
+ };
kovirobi = {
email = "kovirobi@gmail.com";
github = "kovirobi";
@@ -5957,6 +5969,12 @@
githubId = 1224006;
name = "Roberto Abdelkader Martínez Pérez";
};
+ nilsirl = {
+ email = "nils@nilsand.re";
+ github = "NilsIrl";
+ githubId = 26231126;
+ name = "Nils ANDRÉ-CHANG";
+ };
ninjatrappeur = {
email = "felix@alternativebit.fr";
github = "ninjatrappeur";
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 7a06c06fed1..59a4d78c27e 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -202,9 +202,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
likekly to break with future versions of go. As a result
buildGoModule switched from
modSha256 to the vendorSha256
- attribute to pin fetched version data. buildGoModule
- still accepts modSha256 with a warning, but support will
- be removed in the next release.
+ attribute to pin fetched version data.
@@ -907,6 +905,11 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
Fontconfig 2.10.x was removed from Nixpkgs - it hasn't been used in any nixpkgs package anymore.
+
+
+ The packages perl, rsync and strace were removed from . If you need them, install them again with = with pkgs; [ perl rsync strace ]; in your configuration.nix.
+
+
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index ae9710e3518..b3c5c6f93f3 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -33,14 +33,11 @@ let
pkgs.ncurses
pkgs.netcat
config.programs.ssh.package
- pkgs.perl
pkgs.procps
- pkgs.rsync
- pkgs.strace
pkgs.su
pkgs.time
pkgs.utillinux
- pkgs.which # 88K size
+ pkgs.which
pkgs.zstd
];
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 2a2fe119d30..3b67d628f9f 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -26,6 +26,7 @@
pkgs.fuse
pkgs.fuse3
pkgs.sshfs-fuse
+ pkgs.rsync
pkgs.socat
pkgs.screen
diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix
index 6ecdfb57dc3..0493dadea94 100644
--- a/nixos/modules/services/misc/jellyfin.nix
+++ b/nixos/modules/services/misc/jellyfin.nix
@@ -16,6 +16,14 @@ in
description = "User account under which Jellyfin runs.";
};
+ package = mkOption {
+ type = types.package;
+ example = literalExample "pkgs.jellyfin";
+ description = ''
+ Jellyfin package to use.
+ '';
+ };
+
group = mkOption {
type = types.str;
default = "jellyfin";
@@ -35,11 +43,16 @@ in
Group = cfg.group;
StateDirectory = "jellyfin";
CacheDirectory = "jellyfin";
- ExecStart = "${pkgs.jellyfin}/bin/jellyfin --datadir '/var/lib/${StateDirectory}' --cachedir '/var/cache/${CacheDirectory}'";
+ ExecStart = "${cfg.package}/bin/jellyfin --datadir '/var/lib/${StateDirectory}' --cachedir '/var/cache/${CacheDirectory}'";
Restart = "on-failure";
};
};
+ services.jellyfin.package = mkDefault (
+ if versionAtLeast config.system.stateVersion "20.09" then pkgs.jellyfin
+ else pkgs.jellyfin_10_5
+ );
+
users.users = mkIf (cfg.user == "jellyfin") {
jellyfin = {
group = cfg.group;
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index e1d1217943b..46660151f76 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -10,6 +10,12 @@ let
pkg = cfg.package.out;
+ apachectl = pkgs.runCommand "apachectl" { meta.priority = -1; } ''
+ mkdir -p $out/bin
+ cp ${pkg}/bin/apachectl $out/bin/apachectl
+ sed -i $out/bin/apachectl -e 's|$HTTPD -t|$HTTPD -t -f ${httpdConf}|'
+ '';
+
httpdConf = cfg.configFile;
php = cfg.phpPackage.override { apacheHttpd = pkg; };
@@ -650,10 +656,10 @@ in
postRun = "systemctl reload httpd.service";
}) (filterAttrs (name: hostOpts: hostOpts.enableACME) cfg.virtualHosts);
- environment.systemPackages = [ pkg ];
-
- # required for "apachectl configtest"
- environment.etc."httpd/httpd.conf".source = httpdConf;
+ environment.systemPackages = [
+ apachectl
+ pkg
+ ];
services.httpd.phpOptions =
''
diff --git a/pkgs/applications/audio/molot-lite/default.nix b/pkgs/applications/audio/molot-lite/default.nix
new file mode 100644
index 00000000000..5c5aa505537
--- /dev/null
+++ b/pkgs/applications/audio/molot-lite/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, unzip, lv2 }:
+
+stdenv.mkDerivation {
+ pname = "molot-lite";
+ version = "unstable-2014-04-23";
+
+ src = fetchurl {
+ # fetchzip does not accept urls that do not end with .zip.
+ url = "https://sourceforge.net/p/molot/code/ci/c4eddc426f8d5821e8ebcf1d67265365e4c8c52a/tree/molot_src.zip?format=raw";
+ sha256 = "1c47dwfgrmn9459px8s5zikcqyr0777v226qzcxlr6azlcjwr51b";
+ };
+
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ lv2 ];
+
+ unpackPhase = ''
+ unzip $src
+ '';
+
+ buildPhase = ''
+ make -C Molot_Mono_Lite
+ make -C Molot_Stereo_Lite
+ '';
+
+ installPhase = ''
+ make install INSTALL_DIR=$out/lib/lv2 -C Molot_Mono_Lite
+ make install INSTALL_DIR=$out/lib/lv2 -C Molot_Stereo_Lite
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Stereo and mono audio signal dynamic range compressor in LV2 format";
+ homepage = "https://sourceforge.net/projects/molot/";
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainers.magnetophon ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index 12ab8ce2e06..a3ee0e23ec6 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -30,14 +30,12 @@
, zita-convolver
, zam-plugins
, rubberband
-, mda_lv2
, lsp-plugins
}:
let
lv2Plugins = [
calf # limiter, compressor exciter, bass enhancer and others
- mda_lv2 # loudness
lsp-plugins # delay
];
ladspaPlugins = [
@@ -46,13 +44,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "pulseeffects";
- version = "4.7.3";
+ version = "4.8.0";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
- sha256 = "1xsw3v9vapd8q1dxacdgy2wk0xf3adqwbmcqiimdkd34llbdv88f";
+ sha256 = "9dQNYWBx8iAifRTZr2FRlYv4keZt5Cfahwi/w01duFg=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index ba3c9c4de83..f278b68b922 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -35,13 +35,13 @@
mkDerivation rec {
pname = "strawberry";
- version = "0.6.13";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
- sha256 = "1v0334aivqyqx611cmhgshknzmrgyynbmxcg70qzrs2lyybw2fc1";
+ sha256 = "sha256-YUR9SDiRV/gJKx4H1cgdDnKGulTQPVP7MpHyihUEgqg=";
};
buildInputs = [
diff --git a/pkgs/applications/audio/tamgamp.lv2/default.nix b/pkgs/applications/audio/tamgamp.lv2/default.nix
new file mode 100644
index 00000000000..9f51f9d022d
--- /dev/null
+++ b/pkgs/applications/audio/tamgamp.lv2/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchFromGitHub, pkg-config, lv2, zita-resampler }:
+
+stdenv.mkDerivation rec {
+ pname = "tamgamp.lv2";
+ version = "unstable-2020-06-14";
+
+ src = fetchFromGitHub {
+ owner = "sadko4u";
+ repo = pname;
+ rev = "426da74142fcb6b7687a35b2b1dda3392e171b92";
+ sha256 = "0dqsnim7v79rx13bkkh143gqz0xg26cpf6ya3mrwwprpf5hns2bp";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ lv2 zita-resampler ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/sadko4u/tamgamp.lv2";
+ description = "Guitar amplifier simulator";
+ longDescription = ''
+ Tamgamp (Pronouncement: "Damage Amp") is an LV2 guitar amp simulator that provides two plugins:
+
+ - Tamgamp - a plugin based on Guitarix DK Builder simulated chains.
+ - TamgampGX - a plugin based on tuned Guitarix internal amplifiers implementation.
+
+ The reference to the original Guitarix project: https://guitarix.org/
+
+ It simulates the set of the following guitar amplifiers:
+
+ - Fender Princeton Reverb-amp AA1164 (without reverb module)
+ - Fender Twin Reverb-Amp AA769 (Normal channel, bright off)
+ - Fender Twin Reverb-Amp AA769 (Vibrato channel, bright on)
+ - Marshall JCM-800 High-gain input
+ - Marshall JCM-800 Low-gain input
+ - Mesa/Boogie DC3 preamplifier (lead channel)
+ - Mesa/Boogie DC3 preamplifier (rhythm channel)
+ - Mesa Dual Rectifier preamplifier (orange channel, less gain)
+ - Mesa Dual Rectifier preamplifier (red channel, more gain)
+ - Peavey 5150II crunch channel
+ - Peavey 5150II lead channel
+ - VOX AC-30 Brilliant channel
+ - VOX AC-30 normal channel
+ '';
+ maintainers = [ maintainers.magnetophon ];
+ platforms = platforms.linux;
+ license = licenses.lgpl3Plus;
+ };
+}
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index c699f111e1e..c622a1fcead 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, makeFontsConf, gnome2 }:
+{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv }:
let
mkStudio = opts: callPackage (import ./common.nix opts) {
@@ -6,6 +6,7 @@ let
fontDirectories = [];
};
inherit (gnome2) GConf gnome_vfs;
+ inherit buildFHSUserEnv;
};
stableVersion = {
version = "4.0.1.0"; # "Android Studio 4.0.1"
diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix
index 8660f6f218e..337b8f4cba6 100644
--- a/pkgs/applications/graphics/gnome-photos/default.nix
+++ b/pkgs/applications/graphics/gnome-photos/default.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
};
tests = {
- installed-tests = nixosTests.gnome-photos;
+ installed-tests = nixosTests.installed-tests.gnome-photos;
};
};
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 324c010b8b5..70ac55ed5ad 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "dbeaver-ce";
- version = "7.1.4";
+ version = "7.1.5";
desktopItem = makeDesktopItem {
name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "0a11hjwngm9i05wjx3qavf1zmlaz13dvhqm54ci4d27qrczywcyr";
+ sha256 = "14pdkg9xxnldr7qwpb61hp2dgsd5h9scjn59ajqsqn4f4sgcpba0";
};
installPhase = ''
diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix
similarity index 100%
rename from pkgs/applications/misc/lutris/chrootenv.nix
rename to pkgs/applications/misc/lutris/fhsenv.nix
diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index 293f1d16b1c..9ec5018c4e3 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "nnn";
- version = "3.3";
+ version = "3.4";
src = fetchFromGitHub {
owner = "jarun";
repo = pname;
rev = "v${version}";
- sha256 = "1dxa5blpdf0s03znhnr23zzpsz8yzqpnwknycz42h1w9g9s9jz1v";
+ sha256 = "0lyrpyhzzs2bdgx3ifq1c5dq3s2v30xdiaq0j8zjc64s6bghfxnd";
};
configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf);
diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index 396a7845112..98eb76d9be1 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -2,7 +2,7 @@
let
pname = "obsidian";
- version = "0.7.3";
+ version = "0.8.2";
in
appimageTools.wrapType2 rec {
@@ -11,7 +11,7 @@ appimageTools.wrapType2 rec {
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/Obsidian-${version}.AppImage";
- sha256 = "1qiag5szagalik72j8s2dmp7075g48jxgcdy0wgd02kfv90ai0y6";
+ sha256 = "04jgsd97ivdm84diiafwqxzc9vvga1gsr7xicmqhdq05ns3xsfyz";
};
profile = ''
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index d8203b9e7b5..4e172e5fd7c 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "pdfpc";
- version = "4.3.4";
+ version = "4.4.0";
src = fetchFromGitHub {
repo = product;
owner = product;
rev = "v${version}";
- sha256 = "07aafsm4jzdgpahz83p0ajv40hry7gviyadqi13ahr8xdhhwy2sd";
+ sha256 = "0vh2r32akvasdrghkaq7ard24r2qncp34jfiyshi3zxabm9bhfaa";
};
nativeBuildInputs = [
@@ -31,14 +31,6 @@ stdenv.mkDerivation rec {
cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DMOVIES=OFF";
- patches = [
- # Fix build vala 0.46
- (fetchpatch {
- url = "https://github.com/pdfpc/pdfpc/commit/bbc16b97ecbdcdd22c2dc827a5c0e8b569073312.patch";
- sha256 = "0wi1rqcvg65cxnxvmvavcvghqyksnpijq1p91m57jaby3hb0pdcy";
- })
- ];
-
meta = with stdenv.lib; {
description = "A presenter console with multi-monitor support for PDF files";
homepage = "https://pdfpc.github.io/";
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 9784e24187b..837e30ee8f2 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -5,15 +5,15 @@ let
if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
name = "rescuetime-installer.deb";
url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb";
- sha256 = "1yzbs2lg04bq0clkr6gfkx3j6wrahpnxqfiq4askk9k76y4ncd4m";
+ sha256 = "157yg4n5ppgnrd5wrz06qfx391vggp3wifla39rvcaaysvvisl8v";
} else fetchurl {
name = "rescuetime-installer.deb";
url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
- sha256 = "1njxsh601d0p6n0hxv44gcg8gd43xwym83xwqba26vj6xw82bknv";
+ sha256 = "17gjiwf0qbh1zbrxxsilnpg0qxy5kdpqxlnl28namp671rv0aic8";
};
in mkDerivation {
# https://www.rescuetime.com/updates/linux_release_notes.html
- name = "rescuetime-2.15.0.1";
+ name = "rescuetime-2.16.2.1";
inherit src;
nativeBuildInputs = [ dpkg ];
# avoid https://github.com/NixOS/patchelf/issues/99
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 17c3c188a48..14e9f306bf9 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "0qvcp47m3mc1lw22sq1a4pvaxxi5wlmwzjz23ak01wj3v1xifsh6";
- sha256bin64 = "1a06yhaifbjs88wskfb3mcx06klhvdvz2mnkzz6szhkypz8mi3dp";
- version = "85.0.4183.59";
+ sha256 = "0i7vd0w1swvxw46wiy1xrni02xa7yvccw4cp9v2dc2lm5r43dw5q";
+ sha256bin64 = "0by3fgmd54zj5q5znazrl3vf42ik3rhirwy5815i7isqiq7bb6lq";
+ version = "85.0.4183.69";
};
dev = {
- sha256 = "0nirf72i3zdqsy201qzinfn9k40iy315i6z0a8xn3ciagh10p5j4";
- sha256bin64 = "1ss36w8bsqfswnqddhn2aamjmsyh2vr0y9gjlzrh702mda8yraq1";
- version = "86.0.4221.3";
+ sha256 = "1yasmx3alal3gygyjvvjk799z0b6p6nm7q10m0qyls2mpfvxpcyw";
+ sha256bin64 = "0lp93z9qwdbjblmj0d514plk44hs0yqw1v7vr5mnrrx6l9gm0yg0";
+ version = "86.0.4229.0";
};
stable = {
- sha256 = "1xdg9pnnvbzasmra09rl7wdrir61rfcqml46jj7kv39drwk9chwq";
- sha256bin64 = "1fbn9vkz4kf1dhivi1sfnfi8dady9qjmfr44hvfmb8aibh9kzc8w";
- version = "84.0.4147.125";
+ sha256 = "1n4n95gllqmsrzxmcp9p4gz95gndq2v3vknfvm8p1qfhjqah0hfx";
+ sha256bin64 = "1ak903wm8zq6pri88md2wdij3izr6kz9d4avyqnpmd68ch16vfnj";
+ version = "84.0.4147.135";
};
}
diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch
index 7d129dc78f9..1380c7dc9a2 100644
--- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch
+++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch
@@ -1,3 +1,4 @@
+Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies.
diff -ur firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp firefox-65.0/docshell/base/nsAboutRedirector.cpp
--- firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp 2019-01-23 00:48:28.988747428 +0100
+++ firefox-65.0/docshell/base/nsAboutRedirector.cpp 2019-01-23 00:51:13.378188397 +0100
diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch
index 2fe30980a35..3530954ea5c 100644
--- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch
+++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch
@@ -1,3 +1,4 @@
+Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies.
diff -ur firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp firefox-65.0/docshell/base/nsAboutRedirector.cpp
--- firefox-76.0.orig/docshell/base/nsAboutRedirector.cpp 2020-05-03 19:01:29.926544735 +0200
+++ firefox-76.0/docshell/base/nsAboutRedirector.cpp 2020-05-03 19:12:00.845035570 +0200
diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix
index 8236525ef9c..9a607b54b9c 100644
--- a/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/pkgs/applications/networking/mailreaders/aerc/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
};
runVend = true;
- vendorSha256 = "0avdvbhv1jlisiicpi5vshz28a2p2fgnlrag9zngzglcrbhdd1rn";
+ vendorSha256 = "13zs5113ip85yl6sw9hzclxwlnrhy18d39vh9cwbq97dgnh9rz89";
doCheck = false;
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix
index 4b1efef027e..3143c7f62bb 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix
@@ -62,12 +62,9 @@
, waylandSupport ? true
, libxkbcommon, calendarSupport ? true
-, # If you want the resulting program to call itself "Thunderbird" instead
-# of "Earlybird" or whatever, enable this option. However, those
-# binaries may not be distributed without permission from the
-# Mozilla Foundation, see
-# http://www.mozilla.org/foundation/trademarks/.
-enableOfficialBranding ? false
+# Use official trademarked branding. Permission obtained at:
+# https://github.com/NixOS/nixpkgs/pull/94880#issuecomment-675907971
+, enableOfficialBranding ? true
}:
assert waylandSupport -> gtk3Support == true;
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 961806fa9ab..53d337067d7 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -60,12 +60,9 @@
, waylandSupport ? true
, libxkbcommon, calendarSupport ? true
-, # If you want the resulting program to call itself "Thunderbird" instead
-# of "Earlybird" or whatever, enable this option. However, those
-# binaries may not be distributed without permission from the
-# Mozilla Foundation, see
-# http://www.mozilla.org/foundation/trademarks/.
-enableOfficialBranding ? false
+# Use official trademarked branding. Permission obtained at:
+# https://github.com/NixOS/nixpkgs/pull/94880#issuecomment-675907971
+, enableOfficialBranding ? true
}:
assert waylandSupport -> gtk3Support == true;
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch
index fe3a93ebda7..482c10bd1cf 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch
+++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch
@@ -1,3 +1,4 @@
+Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies.
diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
--- a/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200
+++ b/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch
index efbddd3fba8..d413a06475d 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch
+++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch
@@ -1,3 +1,4 @@
+Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies.
diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
--- a/docshell/base/nsAboutRedirector.cpp
+++ b/docshell/base/nsAboutRedirector.cpp
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 3896e06838d..46221ac1478 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -5,8 +5,8 @@
let
sha256 = {
- x86_64-linux = "1vpfyffg1g7f1m4mxmqghswihml9rm1cipm7krmr5wvxdmcphxnk";
- i386-linux = "0vjxbg5hwkqkh600rr75xviwy848r1xw9mxwf6bb6l8b0isvlsgg";
+ x86_64-linux = "19c6blkkqpyjf330v16mdmsh7q6x087p6gw5ag8r2mc6jwq5ixlx";
+ i386-linux = "0dwc7v4p1dz51444zwn0kds23yi87r4h2d3isfj9xwkn90pxb7in";
}.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
arch = {
@@ -28,7 +28,7 @@ let
in stdenv.mkDerivation rec {
pname = "anydesk";
- version = "5.5.6";
+ version = "6.0.0";
src = fetchurl {
urls = [
diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index 0613a5c5bcd..ac242eb9dc9 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "syncplay";
- version = "1.6.4a";
+ version = "1.6.5";
format = "other";
@@ -10,7 +10,7 @@ buildPythonApplication rec {
owner = "Syncplay";
repo = "syncplay";
rev = "v${version}";
- sha256 = "0zz4a3vzfg808z1qkqz31z4818wzpfa2lika7wl0jgpmw4zi85ix";
+ sha256 = "107dgsrjv95ww6gj77q89dirl604b2ljlpjg79gffm9c4gkmjj2m";
};
propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls;
diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
index e3db0054647..eeeafdd3d98 100644
--- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
+++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "finalfusion-utils";
- version = "0.11.2";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "finalfusion";
repo = pname;
rev = version;
- sha256 = "1y2ik3qj2wbjnnk7bbglwbvyvbm5zfk7mbd1gpxg4495nzlf2jhf";
+ sha256 = "0gxcjrhfa86kz5qmdf5h278ydc3nc0nfj61brnykb723mg45jj41";
};
- cargoSha256 = "19yay31f76ns1d6b6k9mgw5mrl8zg69y229ca6ssyb2z82gyhsnw";
+ cargoSha256 = "03p786hh54zql61vhmsqcdgvz23v2rm12cgwf7clfmk6a6yj6ibx";
# Enables build against a generic BLAS.
cargoBuildFlags = [
diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index 470a532ac72..6b77914539c 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -8,14 +8,14 @@
buildPythonApplication rec {
pname = "glances";
- version = "3.1.4.1";
+ version = "3.1.5";
disabled = isPyPy;
src = fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "v${version}";
- sha256 = "04dc3pwj9qbbhxpihf13ckdgwz0qc771c7v7awni4vyzk3a9cdfb";
+ sha256 = "0l91nvlwyabxlsy5p533dqnc68mmvykfsrcsnxylcpjjl1nzy931";
};
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index 37c06d3a85e..dd4e6e011a6 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
@@ -1,36 +1,32 @@
-{ stdenv, lib, fetchFromGitHub, mercurial, makeWrapper
+{ stdenv, lib, fetchFromGitHub, python3Packages
, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2
}:
-stdenv.mkDerivation rec {
+python3Packages.buildPythonApplication rec {
pname = "git-remote-hg";
- version = "1.0.1";
+ version = "unstable-2020-06-12";
src = fetchFromGitHub {
owner = "mnauw";
repo = "git-remote-hg";
- rev = "v${version}";
- sha256 = "1by5ygqvq9ww990kdrjndaqsssyf2jc4n380f9pfh2avsr7871wc";
+ rev = "28ed63b707919734d230cb13bff7d231dfeee8fc";
+ sha256 = "0dw48vbnk7pp0w6fzgl29mq8fyn52pacbya2w14z9c6jfvh5sha1";
};
- buildInputs = [ mercurial.python mercurial makeWrapper
+ nativeBuildInputs = [
asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt libxml2
];
-
- doCheck = false;
-
- installFlags = [ "HOME=\${out}" "install-doc" ];
+ propagatedBuildInputs = with python3Packages; [ mercurial ];
postInstall = ''
- wrapProgram $out/bin/git-remote-hg \
- --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages or []}"
+ make install-doc prefix=$out
'';
meta = with lib; {
homepage = "https://github.com/mnauw/git-remote-hg";
description = "Semi-official Mercurial bridge from Git project";
license = licenses.gpl2;
- maintainers = [ ];
+ maintainers = with maintainers; [ qyliss ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix
index 148f122f7c8..01ea365b76c 100644
--- a/pkgs/applications/version-management/p4v/default.nix
+++ b/pkgs/applications/version-management/p4v/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebkit, openssl_1_0_2, xkeyboard_config, wrapQtAppsHook }:
+{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtscript, qtsensors, qtwebengine, qtwebkit, openssl, xkeyboard_config, patchelfUnstable, wrapQtAppsHook }:
stdenv.mkDerivation rec {
pname = "p4v";
- version = "2017.3.1601999";
+ version = "2020.1.1966006";
src = fetchurl {
- url = "https://cdist2.perforce.com/perforce/r17.3/bin.linux26x86_64/p4v.tgz";
- sha256 = "9ded42683141e1808535ec3e87d3149f890315c192d6e97212794fd54862b9a4";
+ url = "https://cdist2.perforce.com/perforce/r20.1/bin.linux26x86_64/p4v.tgz";
+ sha256 = "0zc70d7jgdrd2jli338n1h05hgb7jmmv8hvq205wh78vvllrlv10";
};
dontBuild = true;
- nativeBuildInputs = [ wrapQtAppsHook ];
+ nativeBuildInputs = [ patchelfUnstable wrapQtAppsHook ];
ldLibraryPath = lib.makeLibraryPath [
stdenv.cc.cc.lib
@@ -18,26 +18,33 @@ stdenv.mkDerivation rec {
qtmultimedia
qtscript
qtsensors
+ qtwebengine
qtwebkit
- openssl_1_0_2
+ openssl
];
dontWrapQtApps = true;
installPhase = ''
mkdir $out
cp -r bin $out
- mkdir -p $out/lib/p4v
- cp -r lib/p4v/P4VResources $out/lib/p4v
+ mkdir -p $out/lib
+ cp -r lib/P4VResources $out/lib
for f in $out/bin/*.bin ; do
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f
-
+ patchelf --set-rpath $ldLibraryPath --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f
+ # combining this with above breaks rpath (patchelf bug?)
+ patchelf --add-needed libstdc++.so $f \
+ --clear-symbol-version _ZNSt20bad_array_new_lengthD1Ev \
+ --clear-symbol-version _ZTVSt20bad_array_new_length \
+ --clear-symbol-version _ZTISt20bad_array_new_length \
+ $f
wrapQtApp $f \
- --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \
--suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb
done
'';
+ dontFixup = true;
+
meta = {
description = "Perforce Visual Client";
homepage = "https://www.perforce.com";
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 91fb36c3974..e655e0fbff4 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -25,11 +25,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wra
stdenv.mkDerivation rec {
pname = "vlc";
- version = "3.0.11";
+ version = "3.0.11.1";
src = fetchurl {
url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz";
- sha256 = "06a9hfl60f6l0fs5c9ma5s8np8kscm4ala6m2pdfji9lyfna351y";
+ sha256 = "1f46h0hv7fk35zg4iczlp7ib7h2jmh8m4r5klw3g2558ib9134qq";
};
# VLC uses a *ton* of libraries for various pieces of functionality, many of
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index 85bc7c428ff..7112a8b33e8 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -6,13 +6,13 @@
mkDerivation rec {
pname = "virt-manager-qt";
- version = "0.70.91";
+ version = "0.71.95";
src = fetchFromGitHub {
owner = "F1ash";
repo = "qt-virt-manager";
rev = version;
- sha256 = "1z2kq88lljvr24z1kizvg3h7ckf545h4kjhhrjggkr0w4wjjwr43";
+ sha256 = "1s8753bzsjyixpv1c2l9d1xjcn8i47k45qj7pr50prc64ldf5f47";
};
cmakeFlags = [
diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix
index 1e8f7ecd987..9bf68adaef4 100644
--- a/pkgs/applications/window-managers/hikari/default.nix
+++ b/pkgs/applications/window-managers/hikari/default.nix
@@ -12,7 +12,7 @@
let
pname = "hikari";
- version = "2.1.1";
+ version = "2.1.2";
in
stdenv.mkDerivation {
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchzip {
url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz";
- sha256 = "0m9akxk5kwbdi04wch4xfaahl7h3k7c6a67yjmdzqxh3bqwa8igj";
+ sha256 = "1qzbwc8dgsvp5jb4faapcrg9npsl11gq8jvhbbk2h7hj52c5lgmv";
};
nativeBuildInputs = [ pkgconfig bmake ];
diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix
index ade3904b95c..06ebd7e0e92 100644
--- a/pkgs/applications/window-managers/leftwm/default.nix
+++ b/pkgs/applications/window-managers/leftwm/default.nix
@@ -6,16 +6,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "leftwm";
- version = "0.2.2";
+ version = "0.2.4";
src = fetchFromGitHub {
owner = "leftwm";
repo = "leftwm";
rev = version;
- sha256 = "0x8cqc7zay19jxy7cshayjjwwjrcblqpmqrxipm2g5hhyjghk6q0";
+ sha256 = "0xmkhkdpz1bpczrar9y6assdzhd7qxybnkjqs36h099fk9xqmsav";
};
- cargoSha256 = "1kphv3vnr8ij7raf0niwz3rwly986xi5fgwqg2ya0r46ifqkgvrc";
+ cargoSha256 = "06wnx81fhs19pz5qnir6h2v2kmj73y1g354nadcx6650q9pnhdv4";
buildInputs = [ makeWrapper libX11 libXinerama ];
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
new file mode 100644
index 00000000000..c7cfd27d3fa
--- /dev/null
+++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
@@ -0,0 +1,123 @@
+{ callPackage, runCommandLocal, writeShellScriptBin, stdenv, coreutils, bubblewrap }:
+
+let buildFHSEnv = callPackage ./env.nix { }; in
+
+args @ {
+ name,
+ runScript ? "bash",
+ extraInstallCommands ? "",
+ meta ? {},
+ passthru ? {},
+ ...
+}:
+
+with builtins;
+let
+ env = buildFHSEnv (removeAttrs args [
+ "runScript" "extraInstallCommands" "meta" "passthru"
+ ]);
+
+ chrootenv = callPackage ./chrootenv {};
+
+ etcBindFlags = let
+ files = [
+ # NixOS Compatibility
+ "static"
+ # Users, Groups, NSS
+ "passwd"
+ "group"
+ "shadow"
+ "hosts"
+ "resolv.conf"
+ "nsswitch.conf"
+ # Sudo & Su
+ "login.defs"
+ "sudoers"
+ "sudoers.d"
+ # Time
+ "localtime"
+ "zoneinfo"
+ # Other Core Stuff
+ "machine-id"
+ "os-release"
+ # PAM
+ "pam.d"
+ # Fonts
+ "fonts"
+ # ALSA
+ "asound.conf"
+ # SSL
+ "ssl/certs"
+ "pki"
+ ];
+ in concatStringsSep " \\\n "
+ (map (file: "--ro-bind-try /etc/${file} /etc/${file}") files);
+
+ init = run: writeShellScriptBin "${name}-init" ''
+ source /etc/profile
+ exec ${run} "$@"
+ '';
+
+ bwrapCmd = { initArgs ? "" }: ''
+ blacklist="/nix /dev /proc /etc"
+ ro_mounts=""
+ for i in ${env}/*; do
+ path="/''${i##*/}"
+ if [[ $path == '/etc' ]]; then
+ continue
+ fi
+ ro_mounts="$ro_mounts --ro-bind $i $path"
+ blacklist="$blacklist $path"
+ done
+
+ if [[ -d ${env}/etc ]]; then
+ for i in ${env}/etc/*; do
+ path="/''${i##*/}"
+ ro_mounts="$ro_mounts --ro-bind $i /etc$path"
+ done
+ fi
+
+ auto_mounts=""
+ # loop through all directories in the root
+ for dir in /*; do
+ # if it is a directory and it is not in the blacklist
+ if [[ -d "$dir" ]] && grep -v "$dir" <<< "$blacklist" >/dev/null; then
+ # add it to the mount list
+ auto_mounts="$auto_mounts --bind $dir $dir"
+ fi
+ done
+
+ exec ${bubblewrap}/bin/bwrap \
+ --dev-bind /dev /dev \
+ --proc /proc \
+ --chdir "$(pwd)" \
+ --unshare-all \
+ --share-net \
+ --die-with-parent \
+ --ro-bind /nix /nix \
+ ${etcBindFlags} \
+ $ro_mounts \
+ $auto_mounts \
+ ${init runScript}/bin/${name}-init ${initArgs}
+ '';
+
+ bin = writeShellScriptBin name (bwrapCmd { initArgs = ''"$@"''; });
+
+in runCommandLocal name {
+ inherit meta;
+
+ passthru = passthru // {
+ env = runCommandLocal "${name}-shell-env" {
+ shellHook = bwrapCmd {};
+ } ''
+ echo >&2 ""
+ echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
+ echo >&2 ""
+ exit 1
+ '';
+ };
+} ''
+ mkdir -p $out/bin
+ ln -s ${bin}/bin/${name} $out/bin/${name}
+ ${extraInstallCommands}
+''
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix
new file mode 100644
index 00000000000..8b2d46c4ae9
--- /dev/null
+++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix
@@ -0,0 +1,167 @@
+{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }:
+
+{ name, profile ? ""
+, targetPkgs ? pkgs: [], multiPkgs ? pkgs: []
+, extraBuildCommands ? "", extraBuildCommandsMulti ? ""
+, extraOutputsToInstall ? []
+}:
+
+# HOWTO:
+# All packages (most likely programs) returned from targetPkgs will only be
+# installed once--matching the host's architecture (64bit on x86_64 and 32bit on
+# x86).
+#
+# Packages (most likely libraries) returned from multiPkgs are installed
+# once on x86 systems and twice on x86_64 systems.
+# On x86 they are merged with packages from targetPkgs.
+# On x86_64 they are added to targetPkgs and in addition their 32bit
+# versions are also installed. The final directory structure looks as
+# follows:
+# /lib32 will include 32bit libraries from multiPkgs
+# /lib64 will include 64bit libraries from multiPkgs and targetPkgs
+# /lib will link to /lib32
+
+let
+ is64Bit = stdenv.hostPlatform.parsed.cpu.bits == 64;
+ isMultiBuild = multiPkgs != null && is64Bit;
+ isTargetBuild = !isMultiBuild;
+
+ # list of packages (usually programs) which are only be installed for the
+ # host's architecture
+ targetPaths = targetPkgs pkgs ++ (if multiPkgs == null then [] else multiPkgs pkgs);
+
+ # list of packages which are installed for both x86 and x86_64 on x86_64
+ # systems
+ multiPaths = multiPkgs pkgsi686Linux;
+
+ # base packages of the chroot
+ # these match the host's architecture, glibc_multi is used for multilib
+ # builds. glibcLocales must be before glibc or glibc_multi as otherwiese
+ # the wrong LOCALE_ARCHIVE will be used where only C.UTF-8 is available.
+ basePkgs = with pkgs;
+ [ glibcLocales
+ (if isMultiBuild then glibc_multi else glibc)
+ (toString gcc.cc.lib) bashInteractive coreutils less shadow su
+ gawk diffutils findutils gnused gnugrep
+ gnutar gzip bzip2 xz
+ ];
+ baseMultiPkgs = with pkgsi686Linux;
+ [ (toString gcc.cc.lib)
+ ];
+
+ etcProfile = writeText "profile" ''
+ export PS1='${name}-chrootenv:\u@\h:\w\$ '
+ export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
+ export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
+ export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH"
+ export TZDIR='/etc/zoneinfo'
+
+ # Force compilers and other tools to look in default search paths
+ unset NIX_ENFORCE_PURITY
+ export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1
+ export NIX_CFLAGS_COMPILE='-idirafter /usr/include'
+ export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32'
+ export NIX_LDFLAGS='-L/usr/lib -L/usr/lib32'
+ export PKG_CONFIG_PATH=/usr/lib/pkgconfig
+ export ACLOCAL_PATH=/usr/share/aclocal
+
+ ${profile}
+ '';
+
+ # Compose /etc for the chroot environment
+ etcPkg = stdenv.mkDerivation {
+ name = "${name}-chrootenv-etc";
+ buildCommand = ''
+ mkdir -p $out/etc
+ cd $out/etc
+
+ # environment variables
+ ln -s ${etcProfile} profile
+
+ # symlink /etc/mtab -> /proc/mounts (compat for old userspace progs)
+ ln -s /proc/mounts mtab
+ '';
+ };
+
+ # Composes a /usr-like directory structure
+ staticUsrProfileTarget = buildEnv {
+ name = "${name}-usr-target";
+ paths = [ etcPkg ] ++ basePkgs ++ targetPaths;
+ extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall;
+ ignoreCollisions = true;
+ };
+
+ staticUsrProfileMulti = buildEnv {
+ name = "${name}-usr-multi";
+ paths = baseMultiPkgs ++ multiPaths;
+ extraOutputsToInstall = [ "out" "lib" ] ++ extraOutputsToInstall;
+ ignoreCollisions = true;
+ };
+
+ # setup library paths only for the targeted architecture
+ setupLibDirsTarget = ''
+ # link content of targetPaths
+ cp -rsHf ${staticUsrProfileTarget}/lib lib
+ ln -s lib lib${if is64Bit then "64" else "32"}
+ '';
+
+ # setup /lib, /lib32 and /lib64
+ setupLibDirsMulti = ''
+ mkdir -m0755 lib32
+ mkdir -m0755 lib64
+ ln -s lib64 lib
+
+ # copy glibc stuff
+ cp -rsHf ${staticUsrProfileTarget}/lib/32/* lib32/ && chmod u+w -R lib32/
+
+ # copy content of multiPaths (32bit libs)
+ [ -d ${staticUsrProfileMulti}/lib ] && cp -rsHf ${staticUsrProfileMulti}/lib/* lib32/ && chmod u+w -R lib32/
+
+ # copy content of targetPaths (64bit libs)
+ cp -rsHf ${staticUsrProfileTarget}/lib/* lib64/ && chmod u+w -R lib64/
+
+ # symlink 32-bit ld-linux.so
+ ln -Ls ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/
+ '';
+
+ setupLibDirs = if isTargetBuild then setupLibDirsTarget
+ else setupLibDirsMulti;
+
+ # the target profile is the actual profile that will be used for the chroot
+ setupTargetProfile = ''
+ mkdir -m0755 usr
+ cd usr
+ ${setupLibDirs}
+ for i in bin sbin share include; do
+ if [ -d "${staticUsrProfileTarget}/$i" ]; then
+ cp -rsHf "${staticUsrProfileTarget}/$i" "$i"
+ fi
+ done
+ cd ..
+
+ for i in var etc; do
+ if [ -d "${staticUsrProfileTarget}/$i" ]; then
+ cp -rsHf "${staticUsrProfileTarget}/$i" "$i"
+ fi
+ done
+ for i in usr/{bin,sbin,lib,lib32,lib64}; do
+ if [ -d "$i" ]; then
+ ln -s "$i"
+ fi
+ done
+ '';
+
+in stdenv.mkDerivation {
+ name = "${name}-fhs";
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+ ${setupTargetProfile}
+ cd $out
+ ${extraBuildCommands}
+ cd $out
+ ${if isMultiBuild then extraBuildCommandsMulti else ""}
+ '';
+ preferLocalBuild = true;
+ allowSubstitutes = false;
+}
diff --git a/pkgs/data/documentation/anarchism/default.nix b/pkgs/data/documentation/anarchism/default.nix
new file mode 100644
index 00000000000..5b63e104d9d
--- /dev/null
+++ b/pkgs/data/documentation/anarchism/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitLab, xdg_utils }:
+
+stdenv.mkDerivation rec {
+ pname = "anarchism";
+ version = "15.3-1";
+
+ src = fetchFromGitLab {
+ domain = "salsa.debian.org";
+ owner = "debian";
+ repo = pname;
+ rev = "debian%2F${version}"; # %2F = urlquote("/")
+ sha256 = "04ylk0y5b3jml2awmyz7m1hnymni8y1n83m0k6ychdh0px8frhm5";
+ };
+
+ phases = [ "unpackPhase" "postPatch" "installPhase" ];
+
+ postPatch = ''
+ substituteInPlace debian/anarchism.desktop \
+ --replace "/usr/bin/xdg-open" "${xdg_utils}/bin/xdg-open"
+ substituteInPlace debian/anarchism.desktop \
+ --replace "file:///usr" "file://$out"
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/doc/anarchism $out/share/applications $out/share/icons/hicolor/scalable/apps
+ cp -r {html,markdown} $out/share/doc/anarchism
+ cp debian/anarchism.svg $out/share/icons/hicolor/scalable/apps
+ cp debian/anarchism.desktop $out/share/applications
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "http://www.anarchistfaq.org/";
+ changelog = "http://anarchism.pageabode.com/afaq/new.html";
+ description = "Exhaustive exploration of Anarchist theory and practice";
+ longDescription = ''
+ The Anarchist FAQ is an excellent source of information regarding Anarchist
+ (libertarian socialist) theory and practice. It covers all major topics,
+ from the basics of Anarchism to very specific discussions of politics,
+ social organization, and economics.
+ '';
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ davidak ];
+ platforms = with platforms; all;
+ };
+}
diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix
index 0d57b8e261c..345fb99b7bb 100644
--- a/pkgs/data/documentation/scheme-manpages/default.nix
+++ b/pkgs/data/documentation/scheme-manpages/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "scheme-manpages-unstable";
- version = "2020-05-17";
+ version = "2020-08-14";
src = fetchFromGitHub {
owner = "schemedoc";
- repo = "scheme-manpages";
- rev = "e97bd240d398e4e5ffc62305e506a2f2428322a4";
- sha256 = "0c0n3mvghm9c2id8rxfd829plb64nf57jkqgmxf83w7x9jczbqqb";
+ repo = "manpages";
+ rev = "2e99a0aea9c0327e3c2dcfb9b7a2f8f528b4fe43";
+ sha256 = "0ykj4i8mx50mgyz9q63glfnc0mw1lf89hwsflpnbizjda5b4s0fp";
};
dontBuild = true;
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Manpages for Scheme";
- homepage = "https://github.com/schemedoc/scheme-manpages";
+ description = "Unix manual pages for R6RS and R7RS";
+ homepage = "https://github.com/schemedoc/manpages";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
platforms = platforms.all;
diff --git a/pkgs/development/compilers/elm/packages/elm-json.nix b/pkgs/development/compilers/elm/packages/elm-json.nix
index 299e887ecff..44d300d254b 100644
--- a/pkgs/development/compilers/elm/packages/elm-json.nix
+++ b/pkgs/development/compilers/elm/packages/elm-json.nix
@@ -15,7 +15,6 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ];
cargoSha256 = "0ylniriq073kpiykamkn9mxdaa6kyiza4pvf7gnfq2h1dvbqa6z7";
- verifyCargoDeps = true;
# Tests perform networking and therefore can't work in sandbox
doCheck = false;
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 96ab512db61..a167b7988dc 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -33,9 +33,15 @@ let params =
};
"8.11" = rec {
- version = "1.3.1";
+ version = "1.3.2";
rev = "v${version}";
- sha256 = "0cajan9w52faqrg42r9rxai4wzsggs86qar88w7lcb928jvcakml";
+ sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs";
+ };
+
+ "8.12" = rec {
+ version = "1.4.0";
+ rev = "v${version}";
+ sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc";
};
};
param = params.${coq.coq-version};
diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix
index 17f9c2c4611..9cf30e277f3 100644
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix
@@ -5,10 +5,11 @@ let params =
"8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; };
"8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
"8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; };
- "8.8" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; };
- "8.9" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; };
- "8.10" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; };
- "8.11" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; };
+ "8.8" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; };
+ "8.9" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; };
+ "8.10" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; };
+ "8.11" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; };
+ "8.12" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; };
};
param = params.${coq.coq-version};
in
diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix
index 16813ac4f11..56fce9ac526 100644
--- a/pkgs/development/coq-modules/coqhammer/default.nix
+++ b/pkgs/development/coq-modules/coqhammer/default.nix
@@ -13,12 +13,16 @@ let
buildInputs = [ coq.ocamlPackages.camlp5 ];
};
"8.10" = {
- version = "1.2";
- sha256 = "1ir313mmkgp2c65wgw8c681a15clvri1wb1hyjqmj7ymx4shkl56";
+ version = "1.3";
+ sha256 = "1fj8497ir4m79hyrmmmmrag01001wrby0h24wv6525vz0w5py3cd";
};
"8.11" = {
- version = "1.2";
- sha256 = "1w317h7r5llyamzn1kqb8j6p5sxks2j8vq8wnpzrx01jqbyibxgy";
+ version = "1.3";
+ sha256 = "08zf8qfna7b9p2myfaz4g7bas3a1q1156x78n5isqivlnqfrjc1b";
+ };
+ "8.12" = {
+ version = "1.3";
+ sha256 = "1q1y3cwhd98pkm98g71fsdjz85bfwgcz2xn7s7wwmiraifv5l6z8";
};
};
param = params.${coq.coq-version};
diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix
index bc020174daa..82fa215ee9c 100644
--- a/pkgs/development/coq-modules/simple-io/default.nix
+++ b/pkgs/development/coq-modules/simple-io/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
};
passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" "8.11" ];
+ compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ];
};
}
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index c1550238721..402c3e781ad 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -24,8 +24,6 @@
# This is useful if any dependency contain C files.
, runVend ? false
-, modSha256 ? null
-
# We want parallel builds by default
, enableParallelBuilding ? true
@@ -257,8 +255,5 @@ let
});
in if disabled then
throw "${package.name} not supported for go ${go.meta.branch}"
-else if modSha256 != null then
- lib.warn "modSha256 is deprecated and will be removed in the next release (20.09), use vendorSha256 instead" (
- import ./old.nix { inherit go cacert git lib removeReferencesTo stdenv; } args')
else
package
diff --git a/pkgs/development/go-modules/generic/old.nix b/pkgs/development/go-modules/generic/old.nix
deleted file mode 100644
index 42b446b9fa8..00000000000
--- a/pkgs/development/go-modules/generic/old.nix
+++ /dev/null
@@ -1,229 +0,0 @@
-{ go, cacert, git, lib, removeReferencesTo, stdenv }:
-
-{ name ? "${args'.pname}-${args'.version}"
-, src
-, buildInputs ? []
-, nativeBuildInputs ? []
-, passthru ? {}
-, patches ? []
-
-# A function to override the go-modules derivation
-, overrideModAttrs ? (_oldAttrs : {})
-
-# path to go.mod and go.sum directory
-, modRoot ? "./"
-
-# modSha256 is the sha256 of the vendored dependencies
-#
-# CAUTION: if `null` is used as a value, the derivation won't be a
-# fixed-output derivation but disable the build sandbox instead. Don't use
-# this in nixpkgs as Hydra won't build those packages.
-, modSha256
-
-# We want parallel builds by default
-, enableParallelBuilding ? true
-
-# Disabled flag
-, disabled ? false
-
-# Do not enable this without good reason
-# IE: programs coupled with the compiler
-, allowGoReference ? false
-
-, meta ? {}
-
-, ... }@args':
-
-with builtins;
-
-let
- args = removeAttrs args' [ "overrideModAttrs" "modSha256" "disabled" ];
-
- removeReferences = [ ] ++ lib.optional (!allowGoReference) go;
-
- removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}'';
-
- go-modules = go.stdenv.mkDerivation (let modArgs = {
- name = "${name}-go-modules";
-
- nativeBuildInputs = [ go git cacert ];
-
- inherit (args) src;
- inherit (go) GOOS GOARCH;
-
- patches = args.patches or [];
-
- GO111MODULE = "on";
-
- impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
- "GIT_PROXY_COMMAND" "SOCKS_SERVER"
- ];
-
- configurePhase = args.modConfigurePhase or ''
- runHook preConfigure
-
- export GOCACHE=$TMPDIR/go-cache
- export GOPATH="$TMPDIR/go"
- mkdir -p "''${GOPATH}/pkg/mod/cache/download"
- cd "${modRoot}"
- runHook postConfigure
- '';
-
- buildPhase = args.modBuildPhase or ''
- runHook preBuild
-
- go mod download
-
- runHook postBuild
- '';
-
- installPhase = args.modInstallPhase or ''
- runHook preInstall
-
- # remove cached lookup results and tiles
- rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb"
- cp -r "''${GOPATH}/pkg/mod/cache/download" $out
-
- runHook postInstall
- '';
-
- dontFixup = true;
- }; in modArgs // (
- if modSha256 == null then
- { __noChroot = true; }
- else
- {
- outputHashMode = "recursive";
- outputHashAlgo = "sha256";
- outputHash = modSha256;
- }
- ) // overrideModAttrs modArgs);
-
- package = go.stdenv.mkDerivation (args // {
- nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs;
-
- inherit (go) GOOS GOARCH;
-
- GO111MODULE = "on";
-
- configurePhase = args.configurePhase or ''
- runHook preConfigure
-
- export GOCACHE=$TMPDIR/go-cache
- export GOPATH="$TMPDIR/go"
- export GOSUMDB=off
- export GOPROXY=file://${go-modules}
-
- cd "$modRoot"
-
- runHook postConfigure
- '';
-
- buildPhase = args.buildPhase or ''
- runHook preBuild
-
- buildGoDir() {
- local d; local cmd;
- cmd="$1"
- d="$2"
- . $TMPDIR/buildFlagsArray
- echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0
- [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
- local OUT
- if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v -p $NIX_BUILD_CORES $d 2>&1)"; then
- if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
- echo "$OUT" >&2
- return 1
- fi
- fi
- if [ -n "$OUT" ]; then
- echo "$OUT" >&2
- fi
- return 0
- }
-
- getGoDirs() {
- local type;
- type="$1"
- if [ -n "$subPackages" ]; then
- echo "$subPackages" | sed "s,\(^\| \),\1./,g"
- else
- find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique
- fi
- }
-
- if (( "''${NIX_DEBUG:-0}" >= 1 )); then
- buildFlagsArray+=(-x)
- fi
-
- if [ ''${#buildFlagsArray[@]} -ne 0 ]; then
- declare -p buildFlagsArray > $TMPDIR/buildFlagsArray
- else
- touch $TMPDIR/buildFlagsArray
- fi
- if [ -z "$enableParallelBuilding" ]; then
- export NIX_BUILD_CORES=1
- fi
- for pkg in $(getGoDirs ""); do
- echo "Building subPackage $pkg"
- buildGoDir install "$pkg"
- done
- '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
- # normalize cross-compiled builds w.r.t. native builds
- (
- dir=$GOPATH/bin/${go.GOOS}_${go.GOARCH}
- if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then
- mv $dir/* $dir/..
- fi
- if [[ -d $dir ]]; then
- rmdir $dir
- fi
- )
- '' + ''
- runHook postBuild
- '';
-
- doCheck = args.doCheck or false;
- checkPhase = args.checkPhase or ''
- runHook preCheck
-
- for pkg in $(getGoDirs test); do
- buildGoDir test "$pkg"
- done
-
- runHook postCheck
- '';
-
- installPhase = args.installPhase or ''
- runHook preInstall
-
- mkdir -p $out
- dir="$GOPATH/bin"
- [ -e "$dir" ] && cp -r $dir $out
-
- runHook postInstall
- '';
-
- preFixup = (args.preFixup or "") + ''
- find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
- '';
-
- strictDeps = true;
-
- disallowedReferences = lib.optional (!allowGoReference) go;
-
- passthru = passthru // { inherit go go-modules modSha256; };
-
- meta = {
- # Add default meta information
- platforms = go.meta.platforms or lib.platforms.all;
- } // meta // {
- # add an extra maintainer to every package
- maintainers = (meta.maintainers or []) ++
- [ lib.maintainers.kalbasit ];
- };
- });
-in if disabled then
- throw "${package.name} not supported for go ${go.meta.branch}"
-else
- package
diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/development/interpreters/alda/default.nix
new file mode 100644
index 00000000000..3e5273d6329
--- /dev/null
+++ b/pkgs/development/interpreters/alda/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, jre }:
+
+stdenv.mkDerivation rec {
+ pname = "alda";
+ version = "1.4.2";
+
+ src = fetchurl {
+ url = "https://github.com/alda-lang/alda/releases/download/${version}/alda";
+ sha256 = "1d0412jw37gh1y7i8cmaml8r4sn516i6pxmm8m16yprqmz6glx28";
+ };
+
+ dontUnpack = true;
+
+ installPhase = ''
+ install -Dm755 $src $out/bin/alda
+ sed -i -e '1 s!java!${jre}/bin/java!' $out/bin/alda
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A music programming language for musicians.";
+ homepage = "https://alda.io";
+ license = licenses.epl10;
+ maintainers = [ maintainers.ericdallo ];
+ platforms = jre.meta.platforms;
+ };
+
+}
diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix
index f559a4e5050..0b0524e163c 100644
--- a/pkgs/development/libraries/libxmlb/default.nix
+++ b/pkgs/development/libraries/libxmlb/default.nix
@@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "libxmlb";
- version = "0.1.15";
+ version = "0.2.0";
outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "libxmlb";
rev = version;
- sha256 = "1mb73pnfwqc4mm0lm16yfn0lj495h8hcciprb2v6wgy3ifnnjxib";
+ sha256 = "VBIQo+6WqJUbkBZnG6eihx3eJFFWF68A7RpZ7gPVbEI=";
};
patches = [
diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix
index 2f8765f9a72..4a01de54a6d 100644
--- a/pkgs/development/libraries/orcania/default.nix
+++ b/pkgs/development/libraries/orcania/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, cmake, check, subunit }:
stdenv.mkDerivation rec {
pname = "orcania";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "babelouest";
repo = pname;
rev = "v${version}";
- sha256 = "1zp2rk267dfmfap6qsyn7maivrpid8s3rkicwk1q5v6j20cgh1f8";
+ sha256 = "0l035zbzyv623h5186rk6iq1097rxx64iwnk4s2c7l9gzv9wyapp";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch
index f2f4ee77354..8f5b5d4790f 100644
--- a/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch
+++ b/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch
@@ -1,3 +1,23 @@
+diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
+index 005db4248..685c5b1b2 100644
+--- a/src/qml/qml/qqmlimport.cpp
++++ b/src/qml/qml/qqmlimport.cpp
+@@ -1760,6 +1760,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
+ QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
+ addImportPath(installImportsPath);
+
++ // Add import paths derived from PATH
++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
++ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX);
++ for (const QString &path: paths) {
++ if (!path.isEmpty()) {
++ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir));
++ }
++ }
++
+ // env import paths
+ if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
+ const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH");
diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf
index 537eaf62e..e21de58f6 100644
--- a/tools/qmlcachegen/qmlcache.prf
diff --git a/pkgs/development/libraries/science/math/osqp/default.nix b/pkgs/development/libraries/science/math/osqp/default.nix
new file mode 100644
index 00000000000..9cd062d21f2
--- /dev/null
+++ b/pkgs/development/libraries/science/math/osqp/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+ pname = "osqp";
+ version = "0.6.0";
+
+ src = fetchFromGitHub {
+ owner = "oxfordcontrol";
+ repo = "osqp";
+ rev = "v${version}";
+ sha256 = "1gwk1bqsk0rd85zf7xplbwq822y5pnxjmqc14jj6knqbab9afvrs";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with stdenv.lib; {
+ description = "A quadratic programming solver using operator splitting";
+ homepage = "https://osqp.org";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ taktoa ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/snap7/default.nix b/pkgs/development/libraries/snap7/default.nix
new file mode 100644
index 00000000000..3419c4c6c2a
--- /dev/null
+++ b/pkgs/development/libraries/snap7/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, lib, fetchFromGitHub, fetchzip, p7zip }:
+
+stdenv.mkDerivation rec {
+ pname = "snap7";
+ version = "1.4.2";
+
+ src = fetchzip {
+ url = "mirror://sourceforge/snap7/${version}/snap7-full-${version}.7z";
+ sha256 = "1n5gs8bwb6g9vfllf3x12r5yzqzapmlq1bmc6hl854b8vkg30y8c";
+ postFetch = ''
+ ${p7zip}/bin/7z x $downloadedFile
+ mkdir $out
+ cp -r snap7-full-${version}/* $out/
+ '';
+ };
+
+ outputs = [ "out" "dev" "doc" ];
+
+ makefile = "x86_64_linux.mk";
+ makeFlags = [ "LibInstall=$(out)/lib" ];
+
+ preBuild = "cd build/unix";
+ preInstall = ''
+ mkdir -p $out/lib
+ mkdir -p $dev/include
+ mkdir -p $doc/share
+ cp $src/examples/cpp/snap7.h $dev/include
+ cp -r $src/doc $doc/share/
+ '';
+
+ meta = with lib; {
+ homepage = "http://snap7.sourceforge.net/";
+ description = "Step7 Open Source Ethernet Communication Suite";
+ license = licenses.lgpl3;
+ maintainers = with maintainers; [ freezeboy ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/mobile/androidenv/convertaddons.xsl b/pkgs/development/mobile/androidenv/convertaddons.xsl
index 73f58ff5cde..20f007eca04 100644
--- a/pkgs/development/mobile/androidenv/convertaddons.xsl
+++ b/pkgs/development/mobile/androidenv/convertaddons.xsl
@@ -36,13 +36,13 @@
archives = {
all = fetchurl {
- url = ;
+ url = "";
sha1 = "";
};
= fetchurl {
- url = ;
+ url = "";
sha1 = "";
};
@@ -60,13 +60,13 @@
archives = {
all = fetchurl {
- url = ;
+ url = "";
sha1 = "";
};
= fetchurl {
- url = ;
+ url = "";
sha1 = "";
};
@@ -108,13 +108,13 @@
archives = {
all = fetchurl {
- url = ;
+ url = "";
sha1 = "";
};
= fetchurl {
- url = ;
+ url = "";
sha1 = "";
};
diff --git a/pkgs/development/mobile/androidenv/convertpackages.xsl b/pkgs/development/mobile/androidenv/convertpackages.xsl
index 5c36deb73c0..edc9074a898 100644
--- a/pkgs/development/mobile/androidenv/convertpackages.xsl
+++ b/pkgs/development/mobile/androidenv/convertpackages.xsl
@@ -98,13 +98,13 @@
archives = {
all = fetchurl {
- url = ;
+ url = !";
sha1 = "";
};
= fetchurl {
- url = ;
+ url = "";
sha1 = "";
};
diff --git a/pkgs/development/mobile/androidenv/convertsystemimages.xsl b/pkgs/development/mobile/androidenv/convertsystemimages.xsl
index de57041f192..947950badb4 100644
--- a/pkgs/development/mobile/androidenv/convertsystemimages.xsl
+++ b/pkgs/development/mobile/androidenv/convertsystemimages.xsl
@@ -64,7 +64,7 @@
displayName = "";
archives.all = fetchurl {
- url = ;
+ url = "";
sha1 = "";
};
diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix
index 641f16f69b0..8a45e617677 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix
@@ -1,14 +1,14 @@
{ lib, fetchurl, pkgconfig, buildDunePackage, gtk3, cairo2 }:
buildDunePackage rec {
- version = "3.1.0";
+ version = "3.1.1";
pname = "lablgtk3";
minimumOCamlVersion = "4.05";
src = fetchurl {
url = "https://github.com/garrigue/lablgtk/releases/download/${version}/lablgtk3-${version}.tbz";
- sha256 = "1fn04qwgkwc86jndlrnv4vxcmasjsp1mmcgfznahj1ccc7bv47sv";
+ sha256 = "1ygc1yh99gh44h958yffw1vxdlfpn799d4x1s36c2jfbi8f0dir2";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix
index 6ef440da0ac..c2a329e08f3 100644
--- a/pkgs/development/python-modules/coloredlogs/default.nix
+++ b/pkgs/development/python-modules/coloredlogs/default.nix
@@ -1,4 +1,13 @@
-{ lib, buildPythonPackage, fetchFromGitHub, stdenv, isPy3k, fetchpatch, humanfriendly, verboselogs, capturer, pytest, mock, utillinux }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, humanfriendly
+, verboselogs
+, capturer
+, pytest
+, mock
+, utillinux
+}:
buildPythonPackage rec {
pname = "coloredlogs";
@@ -11,13 +20,6 @@ buildPythonPackage rec {
sha256 = "0rnmxwrim4razlv4vi3krxk5lc5ksck6h5374j8avqwplika7q2x";
};
- # patch by risicle
- patches = lib.optional (stdenv.isDarwin && isPy3k) (fetchpatch {
- name = "darwin-py3-capture-fix.patch";
- url = "https://github.com/xolox/python-coloredlogs/pull/74.patch";
- sha256 = "0pk7k94iz0gdripw623vzdl4hd83vwhsfzshl8pbvh1n6swi0xx9";
- });
-
checkPhase = ''
PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \
and not test_auto_install"
diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix
index 44142ca9441..4981440c7cc 100644
--- a/pkgs/development/python-modules/dogtail/default.nix
+++ b/pkgs/development/python-modules/dogtail/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage {
pname = "dogtail";
- version = "0.9.10";
+ version = "0.9.11";
# https://gitlab.com/dogtail/dogtail/issues/1
# src = fetchPypi {
@@ -26,7 +26,7 @@ buildPythonPackage {
# };
src = fetchurl {
url = "https://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.10.tar.gz";
- sha256 = "14sycidl8ahj3fwlhpwlpnyd43c302yqr7nqg2hj39pyj7kgk15b";
+ sha256 = "EGyxYopupfXPYtTL9mm9ujZorvh8AGaNXVKBPWsGy3c=";
};
patches = [
@@ -54,7 +54,7 @@ buildPythonPackage {
meta = {
description = "GUI test tool and automation framework that uses Accessibility technologies to communicate with desktop applications";
homepage = "https://gitlab.com/dogtail/dogtail";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ jtojnar ];
};
}
diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix
index 1f03b1dd725..fea7d226a1c 100644
--- a/pkgs/development/python-modules/geoip2/default.nix
+++ b/pkgs/development/python-modules/geoip2/default.nix
@@ -1,24 +1,29 @@
{ buildPythonPackage, lib, fetchPypi, isPy27
-, ipaddress
+, aiohttp
, maxminddb
, mock
+, mocket
, requests
, requests-mock
}:
buildPythonPackage rec {
- version = "3.0.0";
+ version = "4.0.2";
pname = "geoip2";
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1q1ciqqd0qjkpgwsg9fws8wcqchkcq84gv2g4q3xgh2lpj3yjsaq";
+ sha256 = "06q9r5sdmncj4yaxrdf0mls05jb5n6pwhf8j8r74825cks4mvysa";
};
- propagatedBuildInputs = [ requests maxminddb ]
- ++ lib.optionals isPy27 [ ipaddress ];
+ patchPhase = ''
+ substituteInPlace requirements.txt --replace "requests>=2.24.0,<3.0.0" "requests"
+ '';
- checkInputs = [ requests-mock ];
+ propagatedBuildInputs = [ aiohttp requests maxminddb ];
+
+ checkInputs = [ mocket requests-mock ];
meta = with lib; {
description = "MaxMind GeoIP2 API";
diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix
index 0e079dd832c..f3ca43f5e9a 100644
--- a/pkgs/development/python-modules/m2crypto/default.nix
+++ b/pkgs/development/python-modules/m2crypto/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
- version = "0.35.2";
+ version = "0.36.0";
pname = "M2Crypto";
src = fetchPypi {
inherit pname version;
- sha256 = "09yirf3w77w6f49q6nxhrjm9c3a4y9s30s1k09chqrw8zdgx8sjc";
+ sha256 = "1hadbdckmjzfb8qzbkafypin6sakfx35j2qx0fsivh757s7c2hhm";
};
patches = [
diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix
index a5ec28f3448..f92b96c9ada 100644
--- a/pkgs/development/python-modules/maxminddb/default.nix
+++ b/pkgs/development/python-modules/maxminddb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, pythonAtLeast
+{ stdenv, lib, buildPythonPackage, pythonOlder, pythonAtLeast
, fetchPypi
, libmaxminddb
, ipaddress
@@ -7,12 +7,13 @@
}:
buildPythonPackage rec {
- version = "1.5.4";
+ version = "2.0.2";
pname = "maxminddb";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "f4d28823d9ca23323d113dc7af8db2087aa4f657fafc64ff8f7a8afda871425b";
+ sha256 = "15z5557rn4yvrhnpdm9l4kczr151qv9px736hd361rlr2z98wpdr";
};
buildInputs = [ libmaxminddb ];
diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
new file mode 100644
index 00000000000..fa469b619a1
--- /dev/null
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -0,0 +1,43 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27
+, decorator
+, importlib-metadata
+, python
+, python_magic
+, six
+, urllib3 }:
+
+buildPythonPackage rec {
+ pname = "mocket";
+ version = "3.8.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1zj2p20blf4p071kcs86h2c9sc964x6sahff60gg7y4d2c0iq3rs";
+ };
+
+ patchPhase = ''
+ substituteInPlace requirements.txt \
+ --replace "python-magic==0.4.18" "python-magic" \
+ --replace "urllib3==1.25.10" "urllib3"
+ substituteInPlace setup.py --replace 'setup_requires=["pipenv"]' "setup_requires=[]"
+ '';
+
+ propagatedBuildInputs = [
+ decorator
+ python_magic
+ urllib3
+ six
+ ] ++ lib.optionals (isPy27) [ six ];
+
+ # Pypi has no runtests.py, github has no requirements.txt. No way to test, no way to install.
+ doCheck = false;
+
+ pythonImportsCheck = [ "mocket" ];
+
+ meta = with lib; {
+ description = "A socket mock framework - for all kinds of socket animals, web-clients included";
+ homepage = "https://github.com/mindflayer/python-mocket";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix
index c9ce8324b18..cae6a468c77 100644
--- a/pkgs/development/python-modules/osc/default.nix
+++ b/pkgs/development/python-modules/osc/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, buildPythonPackage , fetchFromGitHub , bashInteractive , urlgrabber, m2crypto, rpm }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, bashInteractive, urlgrabber
+, m2crypto, rpm, chardet
+}:
buildPythonPackage rec {
pname = "osc";
- version = "0.167.1";
+ version = "0.170.0";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "osc";
rev = version;
- sha256 = "0f3c6mzvk9yjicwfdh47j4s2l1wrfgpa6lmqdchasdqfsacps4r6";
+ sha256 = "10dj9kscz59qm8rw5084gf0m8ail2rl7r8rg66ij92x88wvi9mbz";
};
buildInputs = [ bashInteractive ]; # needed for bash-completion helper
checkInputs = [ rpm ];
- propagatedBuildInputs = [ urlgrabber m2crypto ];
+ propagatedBuildInputs = [ urlgrabber m2crypto chardet ];
postInstall = ''
ln -s $out/bin/osc-wrapper.py $out/bin/osc
diff --git a/pkgs/development/python-modules/rdflib-jsonld/default.nix b/pkgs/development/python-modules/rdflib-jsonld/default.nix
new file mode 100644
index 00000000000..6e038dd3343
--- /dev/null
+++ b/pkgs/development/python-modules/rdflib-jsonld/default.nix
@@ -0,0 +1,21 @@
+{ buildPythonPackage, fetchPypi, lib, rdflib, nose }:
+
+buildPythonPackage rec {
+ pname = "rdflib-jsonld";
+ version = "0.5.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "4f7d55326405071c7bce9acf5484643bcb984eadb84a6503053367da207105ed";
+ };
+
+ nativeBuildInputs = [ nose ];
+ propagatedBuildInputs = [ rdflib ];
+
+ meta = with lib; {
+ homepage = "https://github.com/RDFLib/rdflib-jsonld";
+ license = licenses.bsdOriginal;
+ description = "rdflib extension adding JSON-LD parser and serializer";
+ maintainers = [ maintainers.koslambrou ];
+ };
+}
diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix
index a2ea9dc28be..61a0414a998 100644
--- a/pkgs/development/python-modules/sopel/default.nix
+++ b/pkgs/development/python-modules/sopel/default.nix
@@ -5,20 +5,21 @@
, praw
, pyenchant
, pygeoip
-, pytest
+, pytestCheckHook
, python
, pytz
+, sqlalchemy
, xmltodict
}:
buildPythonPackage rec {
pname = "sopel";
- version = "7.0.5";
+ version = "7.0.6";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "6ebe85aa5441c5ddeb48bfd320d57ed0bc002bbd779c50b1b15883022964284d";
+ sha256 = "0f0aixwjh5nax0hzar4993rg9yn1x23rksz5jl5gj8g2jyblsfay";
};
propagatedBuildInputs = [
@@ -29,20 +30,26 @@ buildPythonPackage rec {
pyenchant
pygeoip
pytz
+ sqlalchemy
xmltodict
];
# remove once https://github.com/sopel-irc/sopel/pull/1653 lands
postPatch = ''
substituteInPlace requirements.txt \
- --replace "praw<6.0.0" "praw<7.0.0"
+ --replace "praw>=4.0.0,<6.0.0" "praw"
'';
- checkInputs = [ pytest ];
+ checkInputs = [ pytestCheckHook ];
- checkPhase = ''
- HOME=$PWD # otherwise tries to create tmpdirs at root
- pytest .
+ preCheck = ''
+ export TESTDIR=$(mktemp -d)
+ cp -R ./test $TESTDIR
+ pushd $TESTDIR
+ '';
+
+ postCheck = ''
+ popd
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/wtf-peewee/default.nix b/pkgs/development/python-modules/wtf-peewee/default.nix
index dc0e47ff2dc..69db4e50f67 100644
--- a/pkgs/development/python-modules/wtf-peewee/default.nix
+++ b/pkgs/development/python-modules/wtf-peewee/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "wtf-peewee";
- version = "3.0.1";
+ version = "3.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "4ac1b457f3255ee2d72915267884a16e5fb502e1e7bb793f2f1301c926e3599a";
+ sha256 = "03qs6np5s9r0nmsryfzll29ajcqk27b18kcbgd9plf80ys3nb6kd";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/xpybutil/default.nix b/pkgs/development/python-modules/xpybutil/default.nix
new file mode 100644
index 00000000000..60c96582ea6
--- /dev/null
+++ b/pkgs/development/python-modules/xpybutil/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchFromGitHub, xcffib, pillow }:
+
+buildPythonPackage rec {
+ pname = "xpybutil";
+ version = "0.0.6";
+
+ # Pypi only offers a wheel
+ src = fetchFromGitHub {
+ owner = "BurntSushi";
+ repo = pname;
+ rev = version;
+ sha256 = "17gbqq955fcl29aayn8l0x14azc60cxgkvdxblz9q8x3l50w0xpg";
+ };
+
+ # pillow is a dependency in image.py which is not listed in setup.py
+ propagatedBuildInputs = [ xcffib pillow ];
+
+ meta = with lib; {
+ homepage = "https://github.com/BurntSushi/xpybutil";
+ description = "An incomplete xcb-util port plus some extras";
+ license = licenses.wtfpl;
+ maintainers = with maintainers; [ artturin ];
+ };
+}
diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix
index c3eace89174..1d8e53ba525 100644
--- a/pkgs/development/tools/buildpack/default.nix
+++ b/pkgs/development/tools/buildpack/default.nix
@@ -1,26 +1,33 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "pack";
- version = "0.7.0";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "buildpacks";
repo = pname;
rev = "v${version}";
- sha256 = "0glfxrw3x35m4nmhr9xwlc14y5g9zni85rcrcn3dvkvgh4m6ipaj";
+ sha256 = "0h7lgsg5d74pfa15kx0y3ngnvmz64znqk2k73iyjya9pi9h8hh88";
};
- goPackagePath = "github.com/buildpacks/pack";
+ vendorSha256 = "1c38g169kq9kv6x0x1rlg39ywbc1q66fndby0v85b3ri3xb52869";
+
+ nativeBuildInputs = [ installShellFiles ];
subPackages = [ "cmd/pack" ];
- buildFlagsArray = [ "-ldflags=-s -w -X github.com/buildpacks/pack/cmd.Version=${version}" ];
+ buildFlagsArray = [ "-ldflags=-s -w -X github.com/buildpacks/pack.Version=${version}" ];
+
+ postInstall = ''
+ installShellCompletion --bash --name pack.bash $(PACK_HOME=$PWD $out/bin/pack completion --shell bash)
+ installShellCompletion --zsh --name _pack $(PACK_HOME=$PWD $out/bin/pack completion --shell zsh)
+ '';
meta = with lib; {
homepage = "https://buildpacks.io/";
changelog = "https://github.com/buildpacks/pack/releases/tag/v${version}";
- description = "Local CLI for building apps using Cloud Native Buildpacks";
+ description = "CLI for building apps using Cloud Native Buildpacks";
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
};
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 07803d6bd7c..890c561cadc 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
- version = "13.2.2";
+ version = "13.3.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
- sha256 = "1m45jipn0lmlc4ynmm7g4nd1ryr5bzz1wvr8spd6gxvq5577i4pk";
+ sha256 = "0pi33mgcmw1n5myyczg1nx1s8rqx6b4vr7s09jsjd6z81irhc87c";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
- sha256 = "10nx0gjhbl4gz2n3yl8m7w60pmgdywgzins6y2pa7wvj5dkm04ax";
+ sha256 = "071bsfnkasdj7lfidfhwcklycan2zpyalqia3rmbwd93m5rwqgrd";
};
in
buildGoPackage rec {
@@ -30,7 +30,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
- sha256 = "1jii9rm11kcdh7hg9rif27b7rlj2cip6q9viknvs3ha1rf9fw96q";
+ sha256 = "0idbj8jmycrh61bvkzjl5xffhvv9jnjqv9q0ivl457sn2jii9bhi";
};
patches = [ ./fix-shell-path.patch ];
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index 858e8e5a9b8..0d9eeb84bfb 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "patchelf-${version}";
- version = "2020-06-03";
+ version = "2020-07-11";
src = fetchFromGitHub {
owner = "NixOS";
repo = "patchelf";
- rev = "4aff679d9eaa1a3ec0228901a4e79b57361b4094";
- sha256 = "1i47z2dl6pgv5krl58lwy3xs327jmhy9cni3b8yampab1kh9ad1l";
+ rev = "126372b636733b160e693c9913e871f6755c02e";
+ sha256 = "07cn40ypys5pyc3jfgxvqj7qk5v6m2rr5brnpmxdsl1557ryx226";
};
# Drop test that fails on musl (?)
diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix
index 729985f87fd..675f66dcf47 100644
--- a/pkgs/development/tools/ocaml/ocp-indent/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix
@@ -1,12 +1,12 @@
{ lib, fetchzip, buildDunePackage, cmdliner }:
buildDunePackage rec {
- version = "1.8.1";
+ version = "1.8.2";
pname = "ocp-indent";
src = fetchzip {
url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz";
- sha256 = "0h4ysh36q1fxc40inhsdq2swqpfm15lpilqqcafs5ska42pn7s68";
+ sha256 = "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3";
};
minimumOCamlVersion = "4.02";
diff --git a/pkgs/development/tools/vend/default.nix b/pkgs/development/tools/vend/default.nix
index 7a257110327..ef59ea8dd65 100644
--- a/pkgs/development/tools/vend/default.nix
+++ b/pkgs/development/tools/vend/default.nix
@@ -1,27 +1,37 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
-buildGoModule {
+buildGoModule rec {
pname = "vend";
- version = "unstable-2020-06-04";
- patches = [./remove_tidy.patch];
+ /*
+ This package is used to generate vendor folders for
+ packages that use the `runVend` option with `buildGoModule`.
+
+ Do not update this package without checking that the vendorSha256
+ hashes of packages using the `runVend` option are unchanged
+ or updating their vendorSha256 hashes if necessary.
+ */
+ version = "1.0.2";
+ # Disable the bot
+ # nixpkgs-update: no auto update
+
+ # Disable `mod tidy`, patch was refused upstream
+ # https://github.com/nomad-software/vend/pull/9
+ patches = [ ./remove_tidy.patch ];
- # A permanent fork from master is maintained to avoid non deterministic go tidy
src = fetchFromGitHub {
- owner = "c00w";
+ owner = "nomad-software";
repo = "vend";
- rev = "24fdebfdb2c3cc0516321a9cf33a3fd81c209c04";
- sha256 = "112p9dz9by2h2m3jha2bv1bvzn2a86bpg1wphgmf9gksjpwy835l";
+ rev = "v${version}";
+ sha256 = "0h9rwwb56nzs46xsvl92af71i8b3wz3pf9ngi8v0i2bpk7p3p89d";
};
vendorSha256 = null;
- doCheck = false;
-
meta = with stdenv.lib; {
- homepage = "https://github.com/c00w/vend";
+ homepage = "https://github.com/nomad-software/vend";
description = "A utility which vendors go code including c dependencies";
- maintainers = with maintainers; [ c00w ];
+ maintainers = with maintainers; [ c00w mic92 zowoq ];
license = licenses.mit;
};
}
diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix
index d8197fae156..59e044b482b 100644
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@@ -99,7 +99,11 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Rhythm is just a *click* away";
homepage = "https://osu.ppy.sh";
- license = with licenses; [ mit cc-by-nc-40 ];
+ license = with licenses; [
+ mit
+ cc-by-nc-40
+ unfreeRedistributable # osu-framework contains libbass.so in repository
+ ];
maintainers = with maintainers; [ oxalica ];
platforms = [ "x86_64-linux" ];
};
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 5aab54b8322..ff2c6e13288 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, newScope }:
+{ pkgs, newScope, buildFHSUserEnv }:
let
callPackage = newScope self;
@@ -12,12 +12,13 @@ let
steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { };
steam = callPackage ./steam.nix { };
steam-fonts = callPackage ./fonts.nix { };
- steam-chrootenv = callPackage ./chrootenv.nix {
+ steam-fhsenv = callPackage ./fhsenv.nix {
glxinfo-i686 = pkgs.pkgsi686Linux.glxinfo;
steam-runtime-wrapped-i686 =
if steamArch == "amd64"
then pkgs.pkgsi686Linux.steamPackages.steam-runtime-wrapped
else null;
+ inherit buildFHSUserEnv;
};
steamcmd = callPackage ./steamcmd.nix { };
};
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/fhsenv.nix
similarity index 100%
rename from pkgs/games/steam/chrootenv.nix
rename to pkgs/games/steam/fhsenv.nix
diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix
new file mode 100644
index 00000000000..98f368132a9
--- /dev/null
+++ b/pkgs/misc/flashfocus/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonApplication, fetchPypi, xcffib, pyyaml, click, i3ipc, marshmallow, cffi, xpybutil, pytestrunner }:
+
+
+buildPythonApplication rec {
+ pname = "flashfocus";
+ version = "2.2.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1z20d596rnc7cs0rrd221gjn14dmbr11djv94y9p4v7rr788sswv";
+ };
+
+ nativeBuildInputs = [ pytestrunner ];
+ propagatedBuildInputs = [ i3ipc xcffib click cffi xpybutil marshmallow pyyaml ];
+
+ # Tests require access to a X session
+ doCheck = false;
+
+ pythonImportsCheck = [ "flashfocus" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/fennerm/flashfocus";
+ description = "Simple focus animations for tiling window managers";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ artturin ];
+ };
+}
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index ac8ab628680..36277dd74cd 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -5,18 +5,18 @@
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.193.a/linux-hardened-4.14.193.a.patch"
},
"4.19": {
- "name": "linux-hardened-4.19.139.a.patch",
- "sha256": "02kzzzk09kiwimwmq437079kqrh4n76jc7a6q5y33wpvgpacdmc9",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.139.a/linux-hardened-4.19.139.a.patch"
+ "name": "linux-hardened-4.19.140.a.patch",
+ "sha256": "03y0kp89wka9bjw44y2jqralnwi7rjxbgm7wym1ad5yqd4q29l4d",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.140.a/linux-hardened-4.19.140.a.patch"
},
"5.4": {
- "name": "linux-hardened-5.4.58.a.patch",
- "sha256": "0f2ll67skk78jxz7h8mxppq11giy2y0h2xw3pcp01dmnsci67vzj",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.58.a/linux-hardened-5.4.58.a.patch"
+ "name": "linux-hardened-5.4.59.a.patch",
+ "sha256": "138kms73rlj5zmsb2ivjzz1jr5aa8y8pmwzx02c7j1qk08v82823",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.59.a/linux-hardened-5.4.59.a.patch"
},
"5.7": {
- "name": "linux-hardened-5.7.15.a.patch",
- "sha256": "052zwbgx2jbby7cqab45hvbnqr6mbkz0i17hncj94jsy15ghp6ir",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.15.a/linux-hardened-5.7.15.a.patch"
+ "name": "linux-hardened-5.7.16.a.patch",
+ "sha256": "1fiyd6qsf8r84p05cxhwma7zwi81xyn9pl6yci93n583z8n1k2sw",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.16.a/linux-hardened-5.7.16.a.patch"
}
}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index ff3699a5cba..6b9629edca7 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.139";
+ version = "4.19.140";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "01anspwh3vskmcqf4xclx0jx6h0h33zfgmmvrzxq17wlzqhvyklw";
+ sha256 = "1a4fy48jb16qdx165n48qch6nikfvmxqwys7mw8fynq0pykzj3ya";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index c6fec5fcdbd..d1fe6b47890 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.4.58";
+ version = "5.4.59";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0iqnn98hj3lq1avlrbjv9qdyfwffv01vd0a465xkhxck26py4bvh";
+ sha256 = "1zdjqkm6sniy718dgqzbc1w1sgwpy2x64n1p91cjwps3wjr9vjwv";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix
index db137f0dc45..927940df9a0 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.7.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.7.15";
+ version = "5.7.16";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "04jj7vmwd1fjpfnwrhnc92qnskj7i150dyxvilfmkg3ki521gsqf";
+ sha256 = "0lypik2wvkl3z60zi1x4dxrh646jn0c4x0cg5z9yp33504q4x1ip";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 9fd107661c0..d3ea80ecb22 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
- rev = "17583";
- sha256 = "0d65in4ggnqyc0s2qry883y6pjkakd2h7rdaai1763jsq6inm3ha";
+ rev = "17624";
+ sha256 = "0gs3mpiffny408l9kdrxpj48axarfb2fxvcw4w8zsz5wr7yig0n2";
}
, ...
}:
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index deecc4c4a7b..df71a953fee 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -22,10 +22,10 @@ rec {
# Policy: use the highest stable version as the default (on our master).
stable = if stdenv.hostPlatform.system == "x86_64-linux"
then generic {
- version = "450.57";
- sha256_64bit = "04fp0p5f11hrgjzhvbvxpmvl08d3m16m4r5gn9d5qans9zy7f36m";
- settingsSha256 = "1clbj9a3kv3j8jg35c197gd7b3f9f9f4h9ll5hlax95hdg12lgan";
- persistencedSha256 = "17747z1fsbiznfsmahxmz8kmhwwcjanpfih60v5mwzk63gy4i3d5";
+ version = "450.66";
+ sha256_64bit = "1a6va0gvbzpkyza693v2ml1is4xbv8wxasqk0zd5y7rxin94c1ms";
+ settingsSha256 = "0mkgs91gx7xb7f24xkq9fl7i8d4l7s0wr9a44b1gm1vkw82fm7lj";
+ persistencedSha256 = "02id8cg8fba7c1j4m6vj4gp2mv39lz2k557kdjw8lszcpw6f1fhh";
}
else legacy_390;
diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix
index 909a972efa3..c6527ac285d 100644
--- a/pkgs/os-specific/linux/rtl8192eu/default.nix
+++ b/pkgs/os-specific/linux/rtl8192eu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, kernel }:
+{ stdenv, lib, fetchFromGitHub, kernel, bc }:
with lib;
@@ -6,19 +6,21 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
in stdenv.mkDerivation rec {
name = "rtl8192eu-${kernel.version}-${version}";
- version = "4.4.1.20190319";
+ version = "4.4.1.20200620";
src = fetchFromGitHub {
owner = "Mange";
repo = "rtl8192eu-linux-driver";
- rev = "0a7199b";
- sha256 = "0xxb8z7fd997ny53bgmf95hyqsmwjplbj6fry0rf65k9x9nggx71";
+ rev = "925ac2be34dd608a7ca42daebf9713f0c1bcec74";
+ sha256 = "159vg0scq47wnn600karpgzx3naaiyl1rg8608c8d28nhm62gvjz";
};
hardeningDisable = [ "pic" ];
nativeBuildInputs = kernel.moduleBuildDependencies;
+ buildInputs = [ bc ];
+
makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
enableParallelBuilding = true;
diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index 1460daa95ee..116b8b935b1 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null);
stdenvNoCC.mkDerivation rec {
pname = "atlassian-confluence";
- version = "7.6.0";
+ version = "7.6.1";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
- sha256 = "1s69b19kz8z8dbac3dsj9yvkvynlygzgnlpm72fbnqg6knp95fyz";
+ sha256 = "0ipkr0d4mwsah698fg320h9g5il9xcnwlifbfvfnsijs60y9ps8x";
};
buildPhase = ''
diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix
index 514b6873a1a..675792da680 100644
--- a/pkgs/servers/demoit/default.nix
+++ b/pkgs/servers/demoit/default.nix
@@ -1,19 +1,21 @@
{ stdenv
-, buildGoPackage
+, buildGoModule
, fetchFromGitHub
}:
-buildGoPackage {
+buildGoModule {
pname = "demoit";
- version = "unstable-2019-05-10";
+ version = "unstable-2020-06-11";
goPackagePath = "github.com/dgageot/demoit";
src = fetchFromGitHub {
owner = "dgageot";
repo = "demoit";
- rev = "c1d4780620ebf083cb4a81b83c80e7547ff7bc23";
- sha256 = "0l0pw0kzgnrk6a6f4ls3s82icjp7q9djbaxwfpjswbcfdzrsk4p2";
+ rev = "5762b169e7f2fc18913874bf52323ffbb906ce84";
+ sha256 = "1jcjqr758d29h3y9ajvzhy1xmxfix5mwhylz6jwhy5nmk28bjzx9";
};
+ vendorSha256 = null;
+ subPackages = [ "." ];
meta = with stdenv.lib; {
description = "Live coding demos without Context Switching";
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 5797889df21..4290599cbf8 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "0.114.0";
+ version = "0.114.2";
components = {
"abode" = ps: with ps; [ ]; # missing inputs: abodepy
"accuweather" = ps: with ps; [ ]; # missing inputs: accuweather
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 6eaf1bc45d1..f0a664dd635 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -72,7 +72,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "0.114.0";
+ hassVersion = "0.114.2";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -91,7 +91,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- sha256 = "0g7jwhdvdcam7gvrj72aknrsvdwm5i5hs93nngqm26m1g4sng0ma";
+ sha256 = "0llyf3icdgb9mh7x02309m35hxhinzsbd6i31mmb9fjfzp0d27q9";
};
propagatedBuildInputs = [
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 867723018d3..4b63b589ea9 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
prePatch = ''
sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|'
- sed -i support/apachectl.in -e 's|$HTTPD -t|$HTTPD -t -f /etc/httpd/httpd.conf|'
'';
# Required for ‘pthread_cancel’.
diff --git a/pkgs/servers/jellyfin/10.5.x.nix b/pkgs/servers/jellyfin/10.5.x.nix
new file mode 100644
index 00000000000..17903871c8d
--- /dev/null
+++ b/pkgs/servers/jellyfin/10.5.x.nix
@@ -0,0 +1,61 @@
+{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnetCorePackages, ffmpeg,
+ fontconfig, freetype, nixosTests }:
+
+let
+ os = if stdenv.isDarwin then "osx" else "linux";
+ arch =
+ with stdenv.hostPlatform;
+ if isx86_32 then "x86"
+ else if isx86_64 then "x64"
+ else if isAarch32 then "arm"
+ else if isAarch64 then "arm64"
+ else lib.warn "Unsupported architecture, some image processing features might be unavailable" "unknown";
+ musl = lib.optionalString stdenv.hostPlatform.isMusl
+ (if (arch != "x64")
+ then lib.warn "Some image processing features might be unavailable for non x86-64 with Musl" "musl-"
+ else "musl-");
+ runtimeDir = "${os}-${musl}${arch}";
+
+in stdenv.mkDerivation rec {
+ pname = "jellyfin";
+ version = "10.5.5";
+
+ # Impossible to build anything offline with dotnet
+ src = fetchurl {
+ url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";
+ sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27";
+ };
+
+ buildInputs = [
+ unzip
+ makeWrapper
+ ];
+
+ propagatedBuildInputs = [
+ dotnetCorePackages.aspnetcore_3_1
+ sqlite
+ ];
+
+ preferLocalBuild = true;
+
+ installPhase = ''
+ install -dm 755 "$out/opt/jellyfin"
+ cp -r * "$out/opt/jellyfin"
+ makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
+ sqlite fontconfig freetype stdenv.cc.cc.lib
+ ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \
+ --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg"
+ '';
+
+ passthru.tests = {
+ smoke-test = nixosTests.jellyfin;
+ };
+
+ meta = with stdenv.lib; {
+ description = "The Free Software Media System";
+ homepage = "https://jellyfin.org/";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ nyanloutre minijackson ];
+ };
+}
diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix
index 35476db9215..9194681d63b 100644
--- a/pkgs/servers/jellyfin/default.nix
+++ b/pkgs/servers/jellyfin/default.nix
@@ -18,12 +18,12 @@ let
in stdenv.mkDerivation rec {
pname = "jellyfin";
- version = "10.5.5";
+ version = "10.6.2";
# Impossible to build anything offline with dotnet
src = fetchurl {
- url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";
- sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27";
+ url = "https://repo.jellyfin.org/releases/server/portable/stable/combined/jellyfin_${version}.tar.gz";
+ sha256 = "16yib2k9adch784p6p0whgfb6lrjzwiigg1n14cp88dx64hyhxhb";
};
buildInputs = [
@@ -41,7 +41,6 @@ in stdenv.mkDerivation rec {
installPhase = ''
install -dm 755 "$out/opt/jellyfin"
cp -r * "$out/opt/jellyfin"
-
makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
sqlite fontconfig freetype stdenv.cc.cc.lib
@@ -55,7 +54,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "The Free Software Media System";
- homepage = "https://jellyfin.github.io/";
+ homepage = "https://jellyfin.org/";
license = licenses.gpl2;
maintainers = with maintainers; [ nyanloutre minijackson ];
};
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 520d28715d5..722802a019d 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:
let
- version = "5.25.0";
+ version = "5.25.3";
mattermost-server = buildGoPackage rec {
pname = "mattermost-server";
@@ -11,7 +11,7 @@ let
owner = "mattermost";
repo = "mattermost-server";
rev = "v${version}";
- sha256 = "002mbpgsk988pfjla84ngixq4jmgjgr3gj3h874y1njgz8xq0d92";
+ sha256 = "03xcwlbb9ff5whsdn2m3kqskxpwpfciikjjndbhksc8k8963z07j";
};
goPackagePath = "github.com/mattermost/mattermost-server";
@@ -29,7 +29,7 @@ let
src = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
- sha256 = "08sp4idms7qyafk59plfzk380r72bphqa3ka648v25wh5h3293pn";
+ sha256 = "1p1qxzrd6rj1i43vj18ysknrw2v02s7llx94nrdd5lk10ayzmg63";
};
installPhase = ''
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index 782491a3023..813d1f18e8b 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
buildInputs = [ olm ];
- vendorSha256 = "05cqwprd1rcciw27wyz7lj1s3zmz2vq093vw1cx3kkjyf6lq8sk6";
+ vendorSha256 = "1dmlqhhwmc0k9nbab5j8sl20b8d6b5yrmcdf7ibaiqh7i16zrp3s";
doCheck = false;
diff --git a/pkgs/servers/monitoring/timescale-prometheus/default.nix b/pkgs/servers/monitoring/timescale-prometheus/default.nix
index 3af28b56dbf..f5f4a4fd417 100644
--- a/pkgs/servers/monitoring/timescale-prometheus/default.nix
+++ b/pkgs/servers/monitoring/timescale-prometheus/default.nix
@@ -5,16 +5,18 @@
buildGoModule rec {
pname = "timescale-prometheus";
- version = "0.1.0-beta.1";
+ version = "0.1.0-beta.2";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = "${version}";
- sha256 = "1q6xky4h9x4j2f0f6ajxwlnqq1pgd2n0z1ldrcifyamd90qkwcm5";
+ sha256 = "1rrr0qb27hh3kcmmxapr1j39dhfxf02vihpjf4b7zpwdf1mpvrbc";
};
- vendorSha256 = "sha256:1vp30y59w8mksqxy9ic37vj1jw4lbq24ahhb08a72rysylw94r57";
+ vendorSha256 = "sha256:0y5rq2y48kf2z1z3a8ags6rqzfvjs54klk2679fk8x0yjamj5x04";
+
+ buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/timescale-prometheus/pkg/version.Version=${version} -X github.com/timescale/timescale-prometheus/pkg/version.CommitHash=${src.rev}" ];
doCheck = false;
diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
new file mode 100644
index 00000000000..b95ef73308d
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, postgresql }:
+
+stdenv.mkDerivation rec {
+ pname = "plpgsql_check";
+ version = "1.13.1";
+
+ src = fetchFromGitHub {
+ owner = "okbob";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "19vcvfhxh0922qgibahmkyf7czniycqbzccxdw65j1ia7fd8yyc3";
+ };
+
+ buildInputs = [ postgresql ];
+
+ installPhase = ''
+ install -D -t $out/lib *.so
+ install -D -t $out/share/postgresql/extension *.sql
+ install -D -t $out/share/postgresql/extension *.control
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Linter tool for language PL/pgSQL";
+ homepage = "https://github.com/okbob/plpgsql_check";
+ platforms = postgresql.meta.platforms;
+ license = licenses.mit;
+ maintainers = [ maintainers.marsam ];
+ };
+}
diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix
index 44d8ff9cbb8..44e560a5f83 100644
--- a/pkgs/servers/sql/postgresql/packages.nix
+++ b/pkgs/servers/sql/postgresql/packages.nix
@@ -21,6 +21,8 @@ self: super: {
pgroonga = super.callPackage ./ext/pgroonga.nix { };
+ plpgsql_check = super.callPackage ./ext/plpgsql_check.nix { };
+
plv8 = super.callPackage ./ext/plv8.nix {
v8 = super.callPackage ../../../development/libraries/v8/plv8_6_x.nix {
python = self.python2;
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index a7e17df9dee..8fc189fbf15 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- version = "2020-08-17";
+ version = "2020-08-20";
pname = "oh-my-zsh";
- rev = "7deda85f8cf7fb3c2f36b771a2e8bd70a28bf0b3";
+ rev = "03b6a72576cb0f0b53abde25d409e8026d5c4ee9";
src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
- sha256 = "16czqfa01a1ak00ln37334q3gq811f5df2nqbvmj3129agnx28s4";
+ sha256 = "0bm043r3pffbv74drrv2xa66rsadrrsayscwwnfgp24svdmx7a6z";
};
pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 993ae68e9e8..5b1c380548f 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -247,7 +247,8 @@ in rec {
(/**/ if lib.isString cmakeFlags then [cmakeFlags]
else if cmakeFlags == null then []
else cmakeFlags)
- ++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" [ stdenv.hostPlatform.uname.system ]}" ]
+ ++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" (
+ lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"]
++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}"
++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.release}"
++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}"
diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix
new file mode 100644
index 00000000000..fb21bda4150
--- /dev/null
+++ b/pkgs/tools/admin/chamber/default.nix
@@ -0,0 +1,28 @@
+{ buildGoModule, lib, fetchFromGitHub }:
+buildGoModule rec {
+ pname = "chamber";
+ version = "2.8.2";
+
+ src = fetchFromGitHub {
+ owner = "segmentio";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-7L9RaE4LvHRR6MUimze5QpbnfasWJdY4arfS/Usy2q0=";
+ };
+
+ vendorSha256 = null;
+
+ # set the version. see: chamber's Makefile
+ buildFlagsArray = ''
+ -ldflags=
+ -X main.Version=v${version}
+ '';
+
+ meta = with lib; {
+ description =
+ "Chamber is a tool for managing secrets by storing them in AWS SSM Parameter Store.";
+ homepage = "https://github.com/segmentio/chamber";
+ license = licenses.mit;
+ maintainers = with maintainers; [ kalekseev ];
+ };
+}
diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix
index 3641893cf74..0eaabdb627d 100644
--- a/pkgs/tools/archivers/undmg/default.nix
+++ b/pkgs/tools/archivers/undmg/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchFromGitHub, zlib, bzip2 }:
+{ stdenv, fetchFromGitHub, zlib, bzip2, lzfse, pkg-config }:
stdenv.mkDerivation rec {
- version = "1.0.5";
+ version = "1.1.0";
pname = "undmg";
src = fetchFromGitHub {
owner = "matthewbauer";
repo = "undmg";
rev = "v${version}";
- sha256 = "0yz5fniaa5z33d8bdzgr263957r1c9l99237y2p8k0hdid207la1";
+ sha256 = "0rb4h89jrl04vwf6p679ipa4mp95hzmc1ca11wqbanv3xd1kcpxm";
};
- buildInputs = [ zlib bzip2 ];
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ zlib bzip2 lzfse ];
setupHook = ./setup-hook.sh;
diff --git a/pkgs/tools/archivers/undmg/setup-hook.sh b/pkgs/tools/archivers/undmg/setup-hook.sh
index e5c8dda23b6..bc7ed76107e 100644
--- a/pkgs/tools/archivers/undmg/setup-hook.sh
+++ b/pkgs/tools/archivers/undmg/setup-hook.sh
@@ -1,5 +1,5 @@
unpackCmdHooks+=(_tryUnpackDmg)
_tryUnpackDmg() {
if ! [[ "$curSrc" =~ \.dmg$ ]]; then return 1; fi
- undmg < "$curSrc"
+ undmg "$curSrc"
}
diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix
index 0a335b3602f..bd97620dba6 100644
--- a/pkgs/tools/compression/lzfse/default.nix
+++ b/pkgs/tools/compression/lzfse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "lzfse";
@@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1mfh6y6vpvxsdwmqmfbkqkwvxc0pz2dqqc72c6fk9sbsrxxaghd5";
};
- makeFlags = [ "INSTALL_PREFIX=$(out)" ];
-
- enableParallelBuilding = false; #bug
+ nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
homepage = "https://github.com/lzfse/lzfse";
diff --git a/pkgs/tools/misc/fet-sh/default.nix b/pkgs/tools/misc/fet-sh/default.nix
new file mode 100644
index 00000000000..3419a8d2850
--- /dev/null
+++ b/pkgs/tools/misc/fet-sh/default.nix
@@ -0,0 +1,28 @@
+{ stdenvNoCC, lib, fetchFromGitHub }:
+
+stdenvNoCC.mkDerivation rec {
+ pname = "fet-sh";
+ version = "1.5";
+
+ src = fetchFromGitHub {
+ owner = "6gk";
+ repo = "fet.sh";
+ rev = "v${version}";
+ sha256 = "15336cayv3rb79y7f0v0qvn6nhr5aqr8479ayp0r0sihn5mkfg35";
+ };
+
+ dontBuild = true;
+
+ installPhase = ''
+ install -m755 -D ./fet.sh $out/bin/fet.sh
+ '';
+
+ meta = with lib; {
+ description = "A fetch written in posix shell without any external commands (linux only)";
+ homepage = "https://github.com/6gk/fet.sh";
+ license = licenses.isc;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ elkowar ];
+ };
+
+}
diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index f4271e86b4c..a00fd7494d8 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lf";
- version = "15";
+ version = "16";
src = fetchFromGitHub {
owner = "gokcehan";
repo = "lf";
rev = "r${version}";
- sha256 = "1fjwkng6fnbl6dlicbxj0z92hl9xggni5zfi3nsxn3fa6rmzbiay";
+ sha256 = "174h6xnm3amayf0wfiai16m8qnkx54h5zy4rs7j3yzycd7sirs5b";
};
vendorSha256 = "10na3jzvln353ygcvbhj4243yr83skw5zf3r2n8p6d7i83i86c8w";
diff --git a/pkgs/tools/misc/psrecord/default.nix b/pkgs/tools/misc/psrecord/default.nix
index 7df2b47497f..728314e6e76 100644
--- a/pkgs/tools/misc/psrecord/default.nix
+++ b/pkgs/tools/misc/psrecord/default.nix
@@ -1,11 +1,11 @@
{ lib, buildPythonApplication, fetchPypi, psutil, matplotlib, pytest }:
buildPythonApplication rec {
pname = "psrecord";
- version = "1.1";
+ version = "1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "151rynca97v5wq1drl2yfrqmqil1km72cizn3159c2ip14626mp6";
+ sha256 = "5d48410e543b71e5dc4677705acc2a753db65814d3ccbdfbca8d5d3a09b053b1";
};
propagatedBuildInputs = [
diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index c83ba0afa4e..5b88030849d 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -4,11 +4,11 @@ let inherit (lib) getDev; in
mkDerivation rec {
pname = "qt5ct";
- version = "1.0";
+ version = "1.1";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "118sjzhb0z4vxfmvz93hpmsyqyav1z9k97m4q4wcx0l1myypnb59";
+ sha256 = "1lnx4wqk87lbr6lqc64w5g5ppjjv75kq2r0q0bz9gfpryzdw8xxg";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix
new file mode 100644
index 00000000000..533f2adab70
--- /dev/null
+++ b/pkgs/tools/networking/mozwire/default.nix
@@ -0,0 +1,23 @@
+{ rustPlatform, stdenv, fetchFromGitHub, Security }:
+rustPlatform.buildRustPackage rec {
+ pname = "MozWire";
+ version = "0.4.1";
+
+ src = fetchFromGitHub {
+ owner = "NilsIrl";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1slfb6m22vzglnrxahlhdcwzwpf3b817mskdx628s92mjzngzyih";
+ };
+
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+ cargoSha256 = "0b00j8vn1vvvphcyv8li7i73pq66sq6dr4wc1w4s3pppa151xr55";
+
+ meta = with stdenv.lib; {
+ description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN";
+ homepage = "https://github.com/NilsIrl/MozWire";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ siraben nilsirl ];
+ };
+}
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 250e7a2f7dd..82a22dd947d 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "mu";
- version = "1.4.12";
+ version = "1.4.13";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = version;
- sha256 = "0xc36z5k9c70jg5f2878ya5w45gb2gfxrfljzhs9pafk955j8ir9";
+ sha256 = "03cp2ppj07xpb0c43d3cr8m9jps07mfm8clmlk03sjbxg1widsh0";
};
postPatch = stdenv.lib.optionalString (batchSize != null) ''
diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix
index 7072fb96eda..5dd5f3c153f 100644
--- a/pkgs/tools/networking/tridactyl-native/default.nix
+++ b/pkgs/tools/networking/tridactyl-native/default.nix
@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
pname = "tridactyl-native";
# this is actually the version of tridactyl itself; the native messenger will
# probably not change with every tridactyl version
- version = "1.19.1";
+ version = "1.20.0";
src = fetchFromGitHub {
owner = "tridactyl";
repo = "tridactyl";
rev = version;
- sha256 = "19hldr6ii1z7gghc80h7qsnlz9na586gldm5y33i6lrs93193l82";
+ sha256 = "14p6jadw4yij45rrwjbyf1lq3zpsni4sph88c6mlwlf8w830s3q8";
};
sourceRoot = "source/native";
diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index 66c5b29f6ac..b68a8208de1 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-release";
- version = "0.13.3";
+ version = "0.13.5";
src = fetchFromGitHub {
owner = "sunng87";
repo = "cargo-release";
rev = "v${version}";
- sha256 = "0d9fgmy87xjl9kcmx9crmmg83iyybisg0gfwmnlxz5529slqng5r";
+ sha256 = "098p6yfq8nlfckr61j3pkimwzrg5xb2i34nxvk2hiv1njl1vrqng";
};
- cargoSha256 = "1a6ac4x51i1rg0bgrxbbdd54gmwldsiv7nn8vi81y20llnshgjk7";
+ cargoSha256 = "07rmp4j4jpzd1rz59wsjmzmj2qkc2x4wrs9pafqrym58ypm8i4gx";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix
deleted file mode 100644
index 2e0207e01ed..00000000000
--- a/pkgs/tools/package-management/cargo-tree/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }:
-
-rustPlatform.buildRustPackage rec {
- pname = "cargo-tree";
- version = "0.29.0";
-
- src = fetchFromGitHub {
- owner = "sfackler";
- repo = "cargo-tree";
- rev = "v${version}";
- sha256 = "16k41pj66m2221n1v2szir7x7qwx4i0g3svck2c8cj76h0bqyy15";
- };
-
- cargoSha256 = "0762gdj4n5mlflhzynnny1h8z792zyxmb4kcn54jj7qzdask4qdy";
-
- nativeBuildInputs = [ pkgconfig cmake ];
- buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
-
- meta = with lib; {
- description = "A cargo subcommand that visualizes a crate's dependency graph in a tree-like format";
- license = with licenses; [ asl20 mit ];
- maintainers = with maintainers; [ jD91mZM2 ma27 ];
- homepage = "https://crates.io/crates/cargo-tree";
- };
-}
diff --git a/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch b/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.1.patch
similarity index 83%
rename from pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch
rename to pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.1.patch
index 40cd310b643..9aa7d8b1cc9 100644
--- a/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch
+++ b/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.1.patch
@@ -1,26 +1,16 @@
-From 893ee8e76cc8b4096c84fe3a537e312304ce214b Mon Sep 17 00:00:00 2001
-From: Maximilian Bosch
-Date: Wed, 11 Mar 2020 22:32:47 +0100
-Subject: [PATCH] Generate lockfile for cargo-update v3.0.0
-
----
- Cargo.lock | 632 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 632 insertions(+)
- create mode 100644 Cargo.lock
-
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
-index 000000000..0b3a75632
+index 000000000..8d77f4824
--- /dev/null
+++ b/Cargo.lock
-@@ -0,0 +1,632 @@
+@@ -0,0 +1,641 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "aho-corasick"
-+version = "0.7.10"
++version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
++checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
+dependencies = [
+ "memchr",
+]
@@ -94,7 +84,7 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "cargo-update"
-+version = "3.0.0"
++version = "4.1.1"
+dependencies = [
+ "array_tool",
+ "clap",
@@ -117,9 +107,9 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "cc"
-+version = "1.0.50"
++version = "1.0.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
++checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381"
+dependencies = [
+ "jobserver",
+]
@@ -132,9 +122,9 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "clap"
-+version = "2.33.0"
++version = "2.33.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+dependencies = [
+ "ansi_term",
+ "atty",
@@ -174,11 +164,10 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "dirs-sys"
-+version = "0.3.4"
++version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
++checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
+dependencies = [
-+ "cfg-if",
+ "libc",
+ "redox_users",
+ "winapi",
@@ -186,9 +175,9 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "embed-resource"
-+version = "1.3.2"
++version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8398b939acbb266ade6939090e9f634147e7b426a33054a833d9ec935d814882"
++checksum = "1f6b0b4403da80c2fd32333937dd468292c001d778c587ae759b75432772715d"
+dependencies = [
+ "vswhom",
+ "winreg",
@@ -222,9 +211,9 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "hermit-abi"
-+version = "0.1.8"
++version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8"
++checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
+dependencies = [
+ "libc",
+]
@@ -275,9 +264,9 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "libc"
-+version = "0.2.67"
++version = "0.2.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
++checksum = "55821a41348652c211bf26f6453cb9397af531fc358a33752c864a4f5bccc20e"
+
+[[package]]
+name = "libgit2-sys"
@@ -295,9 +284,9 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "libssh2-sys"
-+version = "0.2.16"
++version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7bb70f29dc7c31d32c97577f13f41221af981b31248083e347b7f2c39225a6bc"
++checksum = "ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056"
+dependencies = [
+ "cc",
+ "libc",
@@ -309,9 +298,9 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "libz-sys"
-+version = "1.0.25"
++version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
++checksum = "af67924b8dd885cccea261866c8ce5b74d239d272e154053ff927dae839f5ae9"
+dependencies = [
+ "cc",
+ "libc",
@@ -321,9 +310,9 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "log"
-+version = "0.4.8"
++version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
++checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+dependencies = [
+ "cfg-if",
+]
@@ -353,14 +342,24 @@ index 000000000..0b3a75632
+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+
+[[package]]
-+name = "openssl-sys"
-+version = "0.9.54"
++name = "openssl-src"
++version = "111.10.2+1.1.1g"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
++checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70"
++dependencies = [
++ "cc",
++]
++
++[[package]]
++name = "openssl-sys"
++version = "0.9.58"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
+dependencies = [
+ "autocfg",
+ "cc",
+ "libc",
++ "openssl-src",
+ "pkg-config",
+ "vcpkg",
+]
@@ -373,33 +372,33 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "pkg-config"
-+version = "0.3.17"
++version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
++checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
+
+[[package]]
+name = "proc-macro2"
-+version = "1.0.9"
++version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
++checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
-+version = "1.0.3"
++version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
++checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
-+version = "0.1.56"
++version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+
+[[package]]
+name = "redox_users"
@@ -414,9 +413,9 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "regex"
-+version = "1.3.4"
++version = "1.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8"
++checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+dependencies = [
+ "aho-corasick",
+ "memchr",
@@ -426,9 +425,9 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "regex-syntax"
-+version = "0.6.16"
++version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1"
++checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+
+[[package]]
+name = "rust-argon2"
@@ -460,15 +459,15 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "serde"
-+version = "1.0.104"
++version = "1.0.115"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
++checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5"
+
+[[package]]
+name = "serde_derive"
-+version = "1.0.104"
++version = "1.0.115"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
++checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48"
+dependencies = [
+ "proc-macro2",
+ "quote",
@@ -492,9 +491,9 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "syn"
-+version = "1.0.16"
++version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859"
++checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4"
+dependencies = [
+ "proc-macro2",
+ "quote",
@@ -557,15 +556,15 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "unicode-width"
-+version = "0.1.7"
++version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+
+[[package]]
+name = "unicode-xid"
-+version = "0.2.0"
++version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+[[package]]
+name = "url"
@@ -580,15 +579,15 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "vcpkg"
-+version = "0.2.8"
++version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
++checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
+
+[[package]]
+name = "vec_map"
-+version = "0.8.1"
++version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
+name = "vswhom"
@@ -618,9 +617,9 @@ index 000000000..0b3a75632
+
+[[package]]
+name = "winapi"
-+version = "0.3.8"
++version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
@@ -646,6 +645,3 @@ index 000000000..0b3a75632
+dependencies = [
+ "winapi",
+]
---
-2.25.0
-
diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix
index b9f586ccc6a..d85a03fe49c 100644
--- a/pkgs/tools/package-management/cargo-update/default.nix
+++ b/pkgs/tools/package-management/cargo-update/default.nix
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-update";
- version = "3.0.0";
+ version = "4.1.1";
src = fetchFromGitHub {
owner = "nabijaczleweli";
repo = pname;
rev = "v${version}";
- sha256 = "1jyfv8aa0gp67pvv8l2vkqq4j9rgjl4rq1wn4nqxb44gmvkg15l3";
+ sha256 = "03yfn6jq33mykk2cicx54cpddilp62pb5ah75n96k1mwy7c46r6g";
};
- cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v3.0.0.patch ];
- cargoSha256 = "034v1ql5k3n3rgi3aqszkybvv3vc80v263c9nlwxcwbswsh9jpp1";
+ cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v4.1.1.patch ];
+ cargoSha256 = "1yaawp015gdnlfqkdmqsf95gszz0h5j1vpfjh763y7kk0bp7zswl";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libgit2 libssh2 openssl zlib ]
@@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec {
description = "A cargo subcommand for checking and applying updates to installed executables";
homepage = "https://github.com/nabijaczleweli/cargo-update";
license = licenses.mit;
- maintainers = with maintainers; [ gerschtli filalex77 ];
+ maintainers = with maintainers; [ gerschtli filalex77 johntitor ];
};
}
diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix
index 54a084ff596..39a84112d63 100644
--- a/pkgs/tools/security/genpass/default.nix
+++ b/pkgs/tools/security/genpass/default.nix
@@ -1,6 +1,9 @@
{ stdenv
, fetchFromGitHub
, rustPlatform
+, CoreFoundation
+, libiconv
+, Security
}:
rustPlatform.buildRustPackage rec {
pname = "genpass";
@@ -15,6 +18,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m";
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
+
meta = with stdenv.lib; {
description = "A simple yet robust commandline random password generator.";
homepage = "https://github.com/cyplo/genpass";
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 29c07408e7e..a2651c63e1d 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -99,8 +99,11 @@ let
urls = args.urls or (if args ? url then [ args.url ] else
lib.concatMap
(up: [
- "${up}/${urlName}.r${toString revision}.tar.xz"
- "${up}/${urlName}.tar.xz" # TODO To be removed for telive 2020
+ # Only ~11% of packages in texlive 2019 have revisions, so
+ # the number of requests is nearly doubled if we lookup
+ # the name with revision
+ # "${up}/${urlName}.r${toString revision}.tar.xz"
+ "${up}/${urlName}.tar.xz" # TODO To be removed for texlive 2020?
])
urlPrefixes);
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5882eadc73b..d1eb331c5bb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -67,6 +67,7 @@ mapAliases ({
buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26
bundler_HEAD = bundler; # added 2015-11-15
cantarell_fonts = cantarell-fonts; # added 2018-03-03
+ cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20
casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken.";
catfish = xfce.catfish; # added 2019-12-22
cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae5f9724619..9d2b8813a32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -134,6 +134,8 @@ in
addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };
+ alda = callPackage ../development/interpreters/alda { };
+
ankisyncd = callPackage ../servers/ankisyncd { };
avro-tools = callPackage ../development/tools/avro-tools { };
@@ -153,7 +155,10 @@ in
buildEnv = callPackage ../build-support/buildenv { }; # not actually a package
- buildFHSUserEnv = callPackage ../build-support/build-fhs-userenv { };
+ # TODO: eventually migrate everything to buildFHSUserEnvBubblewrap
+ buildFHSUserEnv = buildFHSUserEnvChroot;
+ buildFHSUserEnvChroot = callPackage ../build-support/build-fhs-userenv { };
+ buildFHSUserEnvBubblewrap = callPackage ../build-support/build-fhs-userenv-bubblewrap { };
buildMaven = callPackage ../build-support/build-maven.nix {};
@@ -269,6 +274,8 @@ in
etBook = callPackage ../data/fonts/et-book { };
+ fet-sh = callPackage ../tools/misc/fet-sh { };
+
fetchbower = callPackage ../build-support/fetchbower {
inherit (nodePackages) bower2nix;
};
@@ -819,6 +826,8 @@ in
boxes = callPackage ../tools/text/boxes { };
+ chamber = callPackage ../tools/admin/chamber { };
+
ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };
@@ -995,7 +1004,9 @@ in
fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
- genpass = callPackage ../tools/security/genpass { };
+ genpass = callPackage ../tools/security/genpass {
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+ };
genymotion = callPackage ../development/mobile/genymotion { };
@@ -1917,6 +1928,8 @@ in
fuzzel = callPackage ../applications/misc/fuzzel { };
+ flashfocus = python3Packages.callPackage ../misc/flashfocus { };
+
qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { };
fwup = callPackage ../tools/misc/fwup { };
@@ -2053,6 +2066,8 @@ in
jellyfin = callPackage ../servers/jellyfin { };
+ jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { };
+
jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { };
jotta-cli = callPackage ../applications/misc/jotta-cli { };
@@ -3212,6 +3227,10 @@ in
mcrcon = callPackage ../tools/networking/mcrcon {};
+ mozwire = callPackage ../tools/networking/mozwire {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
rage = callPackage ../tools/security/rage {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -5923,6 +5942,8 @@ in
osl = callPackage ../development/compilers/osl { };
+ osqp = callPackage ../development/libraries/science/math/osqp { };
+
ossec = callPackage ../tools/security/ossec {};
osslsigncode = callPackage ../development/tools/osslsigncode {};
@@ -9442,7 +9463,6 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { };
- cargo-tree = callPackage ../tools/package-management/cargo-tree { };
cargo-update = callPackage ../tools/package-management/cargo-update {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -18307,6 +18327,8 @@ in
amiri = callPackage ../data/fonts/amiri { };
+ anarchism = callPackage ../data/documentation/anarchism { };
+
andagii = callPackage ../data/fonts/andagii { };
andika = callPackage ../data/fonts/andika { };
@@ -18890,6 +18912,8 @@ in
sierra-gtk-theme = callPackage ../data/themes/sierra { };
+ snap7 = callPackage ../development/libraries/snap7 {};
+
snowblind = callPackage ../data/themes/snowblind { };
solarc-gtk-theme = callPackage ../data/themes/solarc { };
@@ -19187,7 +19211,9 @@ in
amsn = callPackage ../applications/networking/instant-messengers/amsn { };
androidStudioPackages = recurseIntoAttrs
- (callPackage ../applications/editors/android-studio { });
+ (callPackage ../applications/editors/android-studio {
+ buildFHSUserEnv = buildFHSUserEnvBubblewrap;
+ });
android-studio = androidStudioPackages.stable;
animbar = callPackage ../applications/graphics/animbar { };
@@ -21333,7 +21359,9 @@ in
inherit (gnome3) gnome-desktop libgnome-keyring;
wine = wineWowPackages.staging;
};
- lutris = callPackage ../applications/misc/lutris/chrootenv.nix { };
+ lutris = callPackage ../applications/misc/lutris/fhsenv.nix {
+ buildFHSUserEnv = buildFHSUserEnvBubblewrap;
+ };
lutris-free = lutris.override {
steamSupport = false;
};
@@ -21500,6 +21528,8 @@ in
xmrig-proxy = callPackage ../applications/misc/xmrig/proxy.nix { };
+ molot-lite = callPackage ../applications/audio/molot-lite { };
+
monkeysAudio = callPackage ../applications/audio/monkeys-audio { };
monkeysphere = callPackage ../tools/security/monkeysphere { };
@@ -22926,6 +22956,8 @@ in
tambura = callPackage ../applications/audio/tambura { };
+ tamgamp.lv2 = callPackage ../applications/audio/tamgamp.lv2 { };
+
tanka = callPackage ../applications/networking/cluster/tanka { };
teams = callPackage ../applications/networking/instant-messengers/teams { };
@@ -24786,9 +24818,11 @@ in
stockfish = callPackage ../games/stockfish { };
- steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { });
+ steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam {
+ buildFHSUserEnv = buildFHSUserEnvBubblewrap;
+ });
- steam = steamPackages.steam-chrootenv;
+ steam = steamPackages.steam-fhsenv;
steam-run = steam.run;
steam-run-native = (steam.override {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6b616af06c7..1000d615ac1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3371,6 +3371,10 @@ in {
measurement = callPackage ../development/python-modules/measurement {};
+ mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override {
+ python3Packages = self;
+ }));
+
midiutil = callPackage ../development/python-modules/midiutil {};
mido = callPackage ../development/python-modules/mido { };
@@ -4848,6 +4852,8 @@ in {
else
callPackage ../development/python-modules/mock { };
+ mocket = callPackage ../development/python-modules/mocket { };
+
mock-open = callPackage ../development/python-modules/mock-open { };
mockito = callPackage ../development/python-modules/mockito { };
@@ -5950,6 +5956,8 @@ in {
rdflib = callPackage ../development/python-modules/rdflib { };
+ rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { };
+
isodate = callPackage ../development/python-modules/isodate { };
owslib = callPackage ../development/python-modules/owslib { };
@@ -7161,6 +7169,8 @@ in {
xcffib = callPackage ../development/python-modules/xcffib {};
+ xpybutil = callPackage ../development/python-modules/xpybutil {};
+
pafy = callPackage ../development/python-modules/pafy { };
suds = callPackage ../development/python-modules/suds { };