public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into haskell-updates.

Browse Source
This commit is contained in:
Peter Simons 2020-06-26 12:53:30 +02:00
commit 50abe8b545
198 changed files with 3613 additions and 1306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/attrsets.nix
View File

@ -469,6 +469,7 @@ rec {
getBin = getOutput "bin"; getBin = getOutput "bin";
getLib = getOutput "lib"; getLib = getOutput "lib";
getDev = getOutput "dev"; getDev = getOutput "dev";
getMan = getOutput "man";
/* Pick the outputs of packages to place in buildInputs */ /* Pick the outputs of packages to place in buildInputs */
chooseDevOutputs = drvs: builtins.map getDev drvs; chooseDevOutputs = drvs: builtins.map getDev drvs;

2
lib/default.nix
View File

@ -77,7 +77,7 @@ let
genAttrs isDerivation toDerivation optionalAttrs genAttrs isDerivation toDerivation optionalAttrs
zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
recursiveUpdate matchAttrs overrideExisting getOutput getBin recursiveUpdate matchAttrs overrideExisting getOutput getBin
getLib getDev chooseDevOutputs zipWithNames zip getLib getDev getMan chooseDevOutputs zipWithNames zip
recurseIntoAttrs dontRecurseIntoAttrs; recurseIntoAttrs dontRecurseIntoAttrs;
inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1 inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1
concatMap flatten remove findSingle findFirst any all count concatMap flatten remove findSingle findFirst any all count

6
maintainers/maintainer-list.nix
View File

@ -7850,6 +7850,12 @@
githubId = 1141680; githubId = 1141680;
name = "Thane Gill"; name = "Thane Gill";
}; };
TheBrainScrambler = {
email = "esthromeris@riseup.net";
github = "TheBrainScrambler";
githubId = 34945377;
name = "John Smith";
};
thedavidmeister = { thedavidmeister = {
email = "thedavidmeister@gmail.com"; email = "thedavidmeister@gmail.com";
github = "thedavidmeister"; github = "thedavidmeister";

2
maintainers/scripts/debian-patches.sh
View File

@ -2,7 +2,7 @@
# Download patches from debian project # Download patches from debian project
# Usage $0 debian-patches.txt debian-patches.nix # Usage $0 debian-patches.txt debian-patches.nix
# An example input and output files can be found in applications/graphics/xara/ # An example input and output files can be found in tools/graphics/plotutils
DEB_URL=https://sources.debian.org/data/main DEB_URL=https://sources.debian.org/data/main
declare -a deb_patches declare -a deb_patches

1
maintainers/team-list.nix
View File

@ -40,6 +40,7 @@ with lib.maintainers; {
cstrahan cstrahan
Frostman Frostman
kalbasit kalbasit
mdlayher
mic92 mic92
orivej orivej
rvolosatovs rvolosatovs

9
nixos/doc/manual/release-notes/rl-2009.xml
View File

@ -110,6 +110,15 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];
</programlisting> </programlisting>
</para> </para>
</listitem> </listitem>
<listitem>
<para>
Two new option <link linkend="opt-documentation.man.generateCaches">documentation.man.generateCaches</link>
has been added to automatically generate the <literal>man-db</literal> caches, which are needed by utilities
like <command>whatis</command> and <command>apropos</command>. The caches are generated during the build of
the NixOS configuration: since this can be expensive when a large number of packages are installed, the
feature is disabled by default.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

38
nixos/modules/misc/documentation.nix
View File

@ -102,6 +102,16 @@ in
''; '';
}; };
man.generateCaches = mkOption {
type = types.bool;
default = false;
description = ''
Whether to generate the manual page index caches using
<literal>mandb(8)</literal>. This allows searching for a page or
keyword using utilities like <literal>apropos(1)</literal>.
'';
};
info.enable = mkOption { info.enable = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
@ -187,7 +197,33 @@ in
environment.systemPackages = [ pkgs.man-db ]; environment.systemPackages = [ pkgs.man-db ];
environment.pathsToLink = [ "/share/man" ]; environment.pathsToLink = [ "/share/man" ];
environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman"; environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman";
environment.etc."man.conf".source = "${pkgs.man-db}/etc/man_db.conf"; environment.etc."man_db.conf".text =
let
manualPages = pkgs.buildEnv {
name = "man-paths";
paths = config.environment.systemPackages;
pathsToLink = [ "/share/man" ];
extraOutputsToInstall = ["man"];
ignoreCollisions = true;
};
manualCache = pkgs.runCommandLocal "man-cache" { }
''
echo "MANDB_MAP ${manualPages}/share/man $out" > man.conf
${pkgs.man-db}/bin/mandb -C man.conf -psc
'';
in
''
# Manual pages paths for NixOS
MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man
MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man
${optionalString cfg.man.generateCaches ''
# Generated manual pages cache for NixOS (immutable)
MANDB_MAP /run/current-system/sw/share/man ${manualCache}
''}
# Manual pages caches for NixOS
MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos
'';
}) })
(mkIf cfg.info.enable { (mkIf cfg.info.enable {

2
nixos/modules/services/networking/corerad.nix
View File

@ -77,6 +77,8 @@ in {
AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW"; AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW";
NoNewPrivileges = true; NoNewPrivileges = true;
DynamicUser = true; DynamicUser = true;
Type = "notify";
NotifyAccess = "main";
ExecStart = "${getBin cfg.package}/bin/corerad -c=${cfg.configFile}"; ExecStart = "${getBin cfg.package}/bin/corerad -c=${cfg.configFile}";
Restart = "on-failure"; Restart = "on-failure";
}; };

25
nixos/modules/virtualisation/containers.nix
View File

@ -34,6 +34,25 @@ in
''; '';
}; };
containersConf = mkOption {
default = {};
description = "containers.conf configuration";
type = types.submodule {
options = {
extraConfig = mkOption {
type = types.lines;
default = "";
description = ''
Extra configuration that should be put in the containers.conf
configuration file
'';
};
};
};
};
registries = { registries = {
search = mkOption { search = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
@ -93,6 +112,12 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.etc."containers/containers.conf".text = ''
[network]
cni_plugin_dirs = ["${pkgs.cni-plugins}/bin/"]
'' + cfg.containersConf.extraConfig;
environment.etc."containers/registries.conf".source = toTOML "registries.conf" { environment.etc."containers/registries.conf".source = toTOML "registries.conf" {
registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries; registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries;
}; };

28
nixos/modules/virtualisation/podman.nix
View File

@ -28,6 +28,10 @@ let
in in
{ {
imports = [
(lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ])
];
meta = { meta = {
maintainers = lib.teams.podman.members; maintainers = lib.teams.podman.members;
}; };
@ -67,25 +71,6 @@ in
''; '';
}; };
libpod = mkOption {
default = {};
description = "Libpod configuration";
type = types.submodule {
options = {
extraConfig = mkOption {
type = types.lines;
default = "";
description = ''
Extra configuration that should be put in the libpod.conf
configuration file
'';
};
};
};
};
package = lib.mkOption { package = lib.mkOption {
type = types.package; type = types.package;
default = podmanPackage; default = podmanPackage;
@ -103,11 +88,6 @@ in
environment.systemPackages = [ cfg.package ] environment.systemPackages = [ cfg.package ]
++ lib.optional cfg.dockerCompat dockerCompat; ++ lib.optional cfg.dockerCompat dockerCompat;
environment.etc."containers/libpod.conf".text = ''
cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"]
'' + cfg.libpod.extraConfig;
environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist";
# Enable common /etc/containers configuration # Enable common /etc/containers configuration

2
nixos/tests/podman.nix
View File

@ -71,7 +71,7 @@ import ./make-test-python.nix (
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
podman.succeed( podman.succeed(
su_cmd( su_cmd(
"podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" "podman run --cgroup-manager=cgroupfs --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
) )
) )
podman.succeed(su_cmd("podman ps | grep sleeping")) podman.succeed(su_cmd("podman ps | grep sleeping"))

2
pkgs/applications/blockchains/monero-gui/default.nix
View File

@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
icon = "monero"; icon = "monero";
desktopName = "Monero"; desktopName = "Monero";
genericName = "Wallet"; genericName = "Wallet";
categories = "Application;Network;Utility;"; categories = "Network;Utility;";
}; };
postInstall = '' postInstall = ''

2
pkgs/applications/blockchains/wasabiwallet/default.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
desktopName = "Wasabi"; desktopName = "Wasabi";
genericName = "Bitcoin wallet"; genericName = "Bitcoin wallet";
comment = meta.description; comment = meta.description;
categories = "Application;Network;Utility;"; categories = "Network;Utility;";
}; };
installPhase = '' installPhase = ''

2
pkgs/applications/editors/eclipse/build-eclipse.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
comment = "Integrated Development Environment"; comment = "Integrated Development Environment";
desktopName = "Eclipse IDE"; desktopName = "Eclipse IDE";
genericName = "Integrated Development Environment"; genericName = "Integrated Development Environment";
categories = "Application;Development;"; categories = "Development;";
}; };
buildInputs = [ buildInputs = [

12
pkgs/applications/editors/eclipse/default.nix
View File

@ -99,6 +99,18 @@ in rec {
}; };
}; };
### Eclipse Committers
eclipse-committers = buildEclipse {
name = "eclipse-committers-${platform_major}.${platform_minor}";
description = "Eclipse IDE for Eclipse Committers and Eclipse Platform Plugin Developers";
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
sha512 = "1l0gc7srpvn3r0yrbrp1pjv1a3n1y7q5fqww5fmzyw1d6j3hjkqj74c9bff16579cpf7z6d4wmj6kr7z89p0ignrx319gc8p0hivi1y";
};
};
### Environments ### Environments
# Function that assembles a complete Eclipse environment from an # Function that assembles a complete Eclipse environment from an

2
pkgs/applications/editors/netbeans/default.nix
View File

@ -10,7 +10,7 @@ let
comment = "Integrated Development Environment"; comment = "Integrated Development Environment";
desktopName = "Apache NetBeans IDE"; desktopName = "Apache NetBeans IDE";
genericName = "Integrated Development Environment"; genericName = "Integrated Development Environment";
categories = "Application;Development;"; categories = "Development;";
icon = "netbeans"; icon = "netbeans";
}; };
in in

2
pkgs/applications/graphics/avocode/default.nix
View File

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
icon = "avocode"; icon = "avocode";
desktopName = "Avocode"; desktopName = "Avocode";
genericName = "Design Inspector"; genericName = "Design Inspector";
categories = "Application;Development;"; categories = "Development;";
comment = "The bridge between designers and developers"; comment = "The bridge between designers and developers";
}; };

2
pkgs/applications/graphics/swingsane/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
desktopName = "SwingSane"; desktopName = "SwingSane";
genericName = "Scan from local or remote SANE servers"; genericName = "Scan from local or remote SANE servers";
comment = meta.description; comment = meta.description;
categories = "Office;Application;"; categories = "Office;";
}; };
in '' in ''

30
pkgs/applications/graphics/xara/debian-patches.nix
View File

@ -1,30 +0,0 @@
# Generated by debian-patches.sh from debian-patches.txt
let
prefix = "http://patch-tracker.debian.org/patch/series/dl/xaralx/0.7r1785-5";
in
[
{
url = "${prefix}/30_gtk_wxwidgets_symbol_clash";
sha256 = "1rc9dh9mnp93mad96dkp7idyhhcw7h6w0g5s92mqgzj79hqgaziz";
}
{
url = "${prefix}/40_algorithm_include";
sha256 = "03jhl1qnxj7nl8malf6v1y24aldfz87x1p2jxp04mrr35nzvyyc0";
}
{
url = "${prefix}/50_update_imagemagick_version_parser";
sha256 = "1nilsqghlr649sc14n1aqkhdx7f66rq91gqccdpi17jwijs27497";
}
{
url = "${prefix}/remove-icon-suffix";
sha256 = "160zmkgwlsanqivnip89558yvd9zvqp8ks2wbyr2aigl2rafin22";
}
{
url = "${prefix}/45_fix_gcc4";
sha256 = "06zsj0z9v5n557gj8337v6xd26clbvm4dc0qhvpvzbisq81l9jyi";
}
{
url = "${prefix}/55_fix_contstuctor_call";
sha256 = "0b14glrcwhv0ja960h56n5jm4f9563ladap2pgaywihq485ql1c1";
}
]

7
pkgs/applications/graphics/xara/debian-patches.txt
View File

@ -1,7 +0,0 @@
xaralx/0.7r1785-5
30_gtk_wxwidgets_symbol_clash
40_algorithm_include
50_update_imagemagick_version_parser
remove-icon-suffix
45_fix_gcc4
55_fix_contstuctor_call

22
pkgs/applications/graphics/xara/default.nix
View File

@ -1,22 +0,0 @@
{stdenv, fetchurl, automake, gettext, freetype, libxml2, pango, pkgconfig
, wxGTK, gtk2, perl, zip}:
stdenv.mkDerivation {
name = "xaralx-0.7r1785";
src = fetchurl {
url = "http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2";
sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh";
};
nativeBuildInputs = [ automake pkgconfig gettext perl zip ];
buildInputs = [ wxGTK gtk2 libxml2 freetype pango ];
configureFlags = [ "--disable-svnversion" ];
patches = map fetchurl (import ./debian-patches.nix);
prePatch = "patchShebangs Scripts";
meta.broken = true;
}

2
pkgs/applications/misc/airtame/default.nix
View File

@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
desktopName = "Airtame"; desktopName = "Airtame";
icon = name; icon = name;
genericName = comment; genericName = comment;
categories = "Application;Network;"; categories = "Network;";
}; };
installPhase = '' installPhase = ''

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

@ -3,13 +3,13 @@
mkDerivation rec { mkDerivation rec {
pname = "AusweisApp2"; pname = "AusweisApp2";
version = "1.20.0"; version = "1.20.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Governikus"; owner = "Governikus";
repo = "AusweisApp2"; repo = "AusweisApp2";
rev = "${version}"; rev = "${version}";
sha256 = "0qkwdaxhig4qjim7h20j6ln6w76ycppfc786nd8l69bd1qv46m40"; sha256 = "17ify6v4z8i8ps3s8qabnrqfkj0my4yzyqwk3q3nhrqilbnhr40x";
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];

2
pkgs/applications/misc/dbeaver/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
desktopName = "dbeaver"; desktopName = "dbeaver";
comment = "SQL Integrated Development Environment"; comment = "SQL Integrated Development Environment";
genericName = "SQL Integrated Development Environment"; genericName = "SQL Integrated Development Environment";
categories = "Application;Development;"; categories = "Development;";
}; };
buildInputs = [ buildInputs = [

2
pkgs/applications/misc/ganttproject-bin/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
desktopName = "GanttProject"; desktopName = "GanttProject";
genericName = "Shedule and manage projects"; genericName = "Shedule and manage projects";
comment = meta.description; comment = meta.description;
categories = "Office;Application;"; categories = "Office;";
}; };
javaOptions = [ javaOptions = [

2
pkgs/applications/misc/golden-cheetah/default.nix
View File

@ -12,7 +12,7 @@ let
desktopName = "GoldenCheetah"; desktopName = "GoldenCheetah";
genericName = "GoldenCheetah"; genericName = "GoldenCheetah";
comment = "Performance software for cyclists, runners and triathletes"; comment = "Performance software for cyclists, runners and triathletes";
categories = "Application;Utility;"; categories = "Utility;";
}; };
in mkDerivation rec { in mkDerivation rec {
pname = "golden-cheetah"; pname = "golden-cheetah";

4
pkgs/applications/misc/hugo/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "hugo"; pname = "hugo";
version = "0.72.0"; version = "0.73.0";
buildInputs = [ libsass ]; buildInputs = [ libsass ];
@ -10,7 +10,7 @@ buildGoModule rec {
owner = "gohugoio"; owner = "gohugoio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "05parzx0wm51z4qkvh4k096ykgiyr9i5xy55c0g99j4y96drcybb"; sha256 = "0qhv8kdv5k1xfk6106lxvsz7f92k7w6wk05ngz7qxbkb6zkcnshw";
}; };
golibsass = fetchFromGitHub { golibsass = fetchFromGitHub {

14
pkgs/applications/misc/jekyll/basic/Gemfile.lock
View File

@ -1,7 +1,7 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (6.0.3.1) activesupport (6.0.3.2)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
@ -15,16 +15,16 @@ GEM
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0) http_parser.rb (~> 0.6.0)
eventmachine (1.2.7) eventmachine (1.2.7)
ffi (1.12.2) ffi (1.13.1)
forwardable-extended (2.6.0) forwardable-extended (2.6.0)
gemoji (3.0.1) gemoji (3.0.1)
html-pipeline (2.12.3) html-pipeline (2.13.0)
activesupport (>= 2) activesupport (>= 2)
nokogiri (>= 1.4) nokogiri (>= 1.4)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (1.8.2) i18n (1.8.3)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jekyll (4.1.0) jekyll (4.1.1)
addressable (~> 2.4) addressable (~> 2.4)
colorator (~> 1.0) colorator (~> 1.0)
em-websocket (~> 0.5) em-websocket (~> 0.5)
@ -76,9 +76,9 @@ GEM
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
rexml (3.2.4) rexml (3.2.4)
rouge (3.19.0) rouge (3.20.0)
safe_yaml (1.0.5) safe_yaml (1.0.5)
sassc (2.3.0) sassc (2.4.0)
ffi (~> 1.9) ffi (~> 1.9)
terminal-table (1.8.0) terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (~> 1.1, >= 1.1.1)

28
pkgs/applications/misc/jekyll/basic/gemset.nix
View File

@ -5,10 +5,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs"; sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk";
type = "gem"; type = "gem";
}; };
version = "6.0.3.1"; version = "6.0.3.2";
}; };
addressable = { addressable = {
dependencies = ["public_suffix"]; dependencies = ["public_suffix"];
@ -67,10 +67,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
type = "gem"; type = "gem";
}; };
version = "1.12.2"; version = "1.13.1";
}; };
forwardable-extended = { forwardable-extended = {
groups = ["default"]; groups = ["default"];
@ -98,10 +98,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1x5i330yks7pb1jxcbm9n6gslkgaqhyvl13d0cqxmxzkcajvb7z4"; sha256 = "01snn9z3c2p17d9wfczkdkml6mdffah6fpyzgs9mdskb14m68rq6";
type = "gem"; type = "gem";
}; };
version = "2.12.3"; version = "2.13.0";
}; };
"http_parser.rb" = { "http_parser.rb" = {
groups = ["default"]; groups = ["default"];
@ -119,10 +119,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s";
type = "gem"; type = "gem";
}; };
version = "1.8.2"; version = "1.8.3";
}; };
jekyll = { jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
@ -130,10 +130,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0v01g9cwn4v7rnpsl9yvscjzvah3p4xwh03zp37zxkvw5kv004n8"; sha256 = "192k1ggw99slpqpxb4xamcvcm2pdahgnmygl746hmkrar0i3xa5r";
type = "gem"; type = "gem";
}; };
version = "4.1.0"; version = "4.1.1";
}; };
jekyll-avatar = { jekyll-avatar = {
dependencies = ["jekyll"]; dependencies = ["jekyll"];
@ -353,10 +353,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic";
type = "gem"; type = "gem";
}; };
version = "3.19.0"; version = "3.20.0";
}; };
safe_yaml = { safe_yaml = {
groups = ["default"]; groups = ["default"];
@ -374,10 +374,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1qzfnvb8khvc6w2sn3k91mndc2w50xxx5c84jkr6xdxlmaq1a3kg"; sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c";
type = "gem"; type = "gem";
}; };
version = "2.3.0"; version = "2.4.0";
}; };
terminal-table = { terminal-table = {
dependencies = ["unicode-display_width"]; dependencies = ["unicode-display_width"];

18
pkgs/applications/misc/jekyll/full/Gemfile.lock
View File

@ -1,7 +1,7 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (6.0.3.1) activesupport (6.0.3.2)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
@ -11,7 +11,7 @@ GEM
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
classifier-reborn (2.2.0) classifier-reborn (2.2.0)
fast-stemmer (~> 1.0) fast-stemmer (~> 1.0)
coderay (1.1.2) coderay (1.1.3)
coffee-script (2.4.1) coffee-script (2.4.1)
coffee-script-source coffee-script-source
execjs execjs
@ -26,16 +26,16 @@ GEM
faraday (1.0.1) faraday (1.0.1)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
fast-stemmer (1.0.2) fast-stemmer (1.0.2)
ffi (1.12.2) ffi (1.13.1)
forwardable-extended (2.6.0) forwardable-extended (2.6.0)
gemoji (3.0.1) gemoji (3.0.1)
html-pipeline (2.12.3) html-pipeline (2.13.0)
activesupport (>= 2) activesupport (>= 2)
nokogiri (>= 1.4) nokogiri (>= 1.4)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (1.8.2) i18n (1.8.3)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jekyll (4.1.0) jekyll (4.1.1)
addressable (~> 2.4) addressable (~> 2.4)
colorator (~> 1.0) colorator (~> 1.0)
em-websocket (~> 0.5) em-websocket (~> 0.5)
@ -55,7 +55,7 @@ GEM
jekyll-coffeescript (2.0.0) jekyll-coffeescript (2.0.0)
coffee-script (~> 2.2) coffee-script (~> 2.2)
coffee-script-source (~> 1.12) coffee-script-source (~> 1.12)
jekyll-feed (0.13.0) jekyll-feed (0.14.0)
jekyll (>= 3.7, < 5.0) jekyll (>= 3.7, < 5.0)
jekyll-gist (1.5.0) jekyll-gist (1.5.0)
octokit (~> 4.2) octokit (~> 4.2)
@ -110,9 +110,9 @@ GEM
ffi (~> 1.0) ffi (~> 1.0)
rdoc (6.2.1) rdoc (6.2.1)
rexml (3.2.4) rexml (3.2.4)
rouge (3.19.0) rouge (3.20.0)
safe_yaml (1.0.5) safe_yaml (1.0.5)
sassc (2.3.0) sassc (2.4.0)
ffi (~> 1.9) ffi (~> 1.9)
sawyer (0.8.2) sawyer (0.8.2)
addressable (>= 2.3.5) addressable (>= 2.3.5)

36
pkgs/applications/misc/jekyll/full/gemset.nix
View File

@ -5,10 +5,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs"; sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk";
type = "gem"; type = "gem";
}; };
version = "6.0.3.1"; version = "6.0.3.2";
}; };
addressable = { addressable = {
dependencies = ["public_suffix"]; dependencies = ["public_suffix"];
@ -49,10 +49,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw";
type = "gem"; type = "gem";
}; };
version = "1.1.2"; version = "1.1.3";
}; };
coffee-script = { coffee-script = {
dependencies = ["coffee-script-source" "execjs"]; dependencies = ["coffee-script-source" "execjs"];
@ -164,10 +164,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
type = "gem"; type = "gem";
}; };
version = "1.12.2"; version = "1.13.1";
}; };
forwardable-extended = { forwardable-extended = {
groups = ["default"]; groups = ["default"];
@ -195,10 +195,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1x5i330yks7pb1jxcbm9n6gslkgaqhyvl13d0cqxmxzkcajvb7z4"; sha256 = "01snn9z3c2p17d9wfczkdkml6mdffah6fpyzgs9mdskb14m68rq6";
type = "gem"; type = "gem";
}; };
version = "2.12.3"; version = "2.13.0";
}; };
"http_parser.rb" = { "http_parser.rb" = {
groups = ["default"]; groups = ["default"];
@ -216,10 +216,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s";
type = "gem"; type = "gem";
}; };
version = "1.8.2"; version = "1.8.3";
}; };
jekyll = { jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
@ -227,10 +227,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0v01g9cwn4v7rnpsl9yvscjzvah3p4xwh03zp37zxkvw5kv004n8"; sha256 = "192k1ggw99slpqpxb4xamcvcm2pdahgnmygl746hmkrar0i3xa5r";
type = "gem"; type = "gem";
}; };
version = "4.1.0"; version = "4.1.1";
}; };
jekyll-avatar = { jekyll-avatar = {
dependencies = ["jekyll"]; dependencies = ["jekyll"];
@ -260,10 +260,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1lx8nvkhd8l1wm3b6s506rycwbmpbzbsbjl65p21asjz6vbwf1ir"; sha256 = "0fhbz5wc8cf60dwsbqcr49wygyk5qarpc7g77p6dlwq2r21nil5c";
type = "gem"; type = "gem";
}; };
version = "0.13.0"; version = "0.14.0";
}; };
jekyll-gist = { jekyll-gist = {
dependencies = ["octokit"]; dependencies = ["octokit"];
@ -602,10 +602,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic";
type = "gem"; type = "gem";
}; };
version = "3.19.0"; version = "3.20.0";
}; };
safe_yaml = { safe_yaml = {
groups = ["default"]; groups = ["default"];
@ -623,10 +623,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1qzfnvb8khvc6w2sn3k91mndc2w50xxx5c84jkr6xdxlmaq1a3kg"; sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c";
type = "gem"; type = "gem";
}; };
version = "2.3.0"; version = "2.4.0";
}; };
sawyer = { sawyer = {
dependencies = ["addressable" "faraday"]; dependencies = ["addressable" "faraday"];

2
pkgs/applications/misc/keepass/default.nix
View File

@ -68,7 +68,7 @@ with builtins; buildDotnetPackage rec {
icon = "keepass"; icon = "keepass";
desktopName = "Keepass"; desktopName = "Keepass";
genericName = "Password manager"; genericName = "Password manager";
categories = "Application;Utility;"; categories = "Utility;";
mimeType = stdenv.lib.concatStringsSep ";" [ mimeType = stdenv.lib.concatStringsSep ";" [
"application/x-keepass2" "application/x-keepass2"
"" ""

79
pkgs/applications/misc/lutris/default.nix
View File

@ -1,9 +1,42 @@
{ buildPythonApplication, lib, fetchFromGitHub, fetchpatch { buildPythonApplication, lib, fetchFromGitHub, fetchpatch
, wrapGAppsHook, gobject-introspection, glib-networking, gnome-desktop, libnotify, libgnome-keyring, pango
, gdk-pixbuf, atk, webkitgtk, gst_all_1 # build inputs
, dbus-python, evdev, pyyaml, pygobject3, requests, pillow , atk
, xrandr, pciutils, psmisc, glxinfo, vulkan-tools, xboxdrv, pulseaudio, p7zip, xgamma , gdk-pixbuf
, libstrangle, wine, fluidsynth, xorgserver , glib-networking
, gnome-desktop
, gobject-introspection
, gst_all_1
, gtk3
, libgnome-keyring
, libnotify
, pango
, webkitgtk
, wrapGAppsHook
# python dependencies
, dbus-python
, distro
, evdev
, pillow
, pygobject3
, pyyaml
, requests
# commands that lutris needs
, xrandr
, pciutils
, psmisc
, glxinfo
, vulkan-tools
, xboxdrv
, pulseaudio
, p7zip
, xgamma
, libstrangle
, wine
, fluidsynth
, xorgserver
}: }:
let let
@ -25,34 +58,52 @@ let
]; ];
gstDeps = with gst_all_1; [ gstDeps = with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
gst-libav gst-libav
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gstreamer
]; ];
in buildPythonApplication rec { in buildPythonApplication rec {
pname = "lutris-original"; pname = "lutris-original";
version = "0.5.5"; version = "0.5.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lutris"; owner = "lutris";
repo = "lutris"; repo = "lutris";
rev = "v${version}"; rev = "v${version}";
sha256 = "1g093g0difnkjmnm91p20issdsxn9ri4c56zzddj5wfrbmhwdfag"; sha256 = "1f78qhyy8xqdg0rhxcwkap1bmg5mfxhb8qw1vbpxr6g62ajpwksa";
}; };
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];
buildInputs = [ buildInputs = [
gobject-introspection glib-networking gnome-desktop libnotify libgnome-keyring pango atk
gdk-pixbuf atk webkitgtk gdk-pixbuf
glib-networking
gnome-desktop
gobject-introspection
gtk3
libgnome-keyring
libnotify
pango
webkitgtk
] ++ gstDeps; ] ++ gstDeps;
makeWrapperArgs = [ propagatedBuildInputs = [
"--prefix PATH : ${binPath}" evdev distro pyyaml pygobject3 requests pillow dbus-python
]; ];
propagatedBuildInputs = [ # avoid double wrapping
evdev pyyaml pygobject3 requests pillow dbus-python dontWrapGApps = true;
makeWrapperArgs = [
"--prefix PATH : ${binPath}"
''''${gappsWrapperArgs[@]}''
]; ];
# needed for glib-schemas to work correctly (will crash on dialogues otherwise)
# see https://github.com/NixOS/nixpkgs/issues/56943
strictDeps = false;
preCheck = "export HOME=$PWD"; preCheck = "export HOME=$PWD";

4
pkgs/applications/misc/pdfsam-basic/default.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
desktopName = "PDFsam Basic"; desktopName = "PDFsam Basic";
genericName = "PDF Split and Merge"; genericName = "PDF Split and Merge";
mimeType = "application/pdf;"; mimeType = "application/pdf;";
categories = "Office;Application;"; categories = "Office;";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -46,4 +46,4 @@ stdenv.mkDerivation rec {
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ maintainers."1000101" ]; maintainers = with maintainers; [ maintainers."1000101" ];
}; };
} }

2
pkgs/applications/misc/pgadmin/default.nix
View File

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
exec = "pgadmin3"; exec = "pgadmin3";
icon = "pgAdmin3"; icon = "pgAdmin3";
type = "Application"; type = "Application";
categories = "Application;Development;"; categories = "Development;";
mimeType = "text/html"; mimeType = "text/html";
}; };
in '' in ''

2
pkgs/applications/misc/prusa-slicer/default.nix
View File

@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
comment = "G-code generator for 3D printers"; comment = "G-code generator for 3D printers";
desktopName = "PrusaSlicer"; desktopName = "PrusaSlicer";
genericName = "3D printer tool"; genericName = "3D printer tool";
categories = "Application;Development;"; categories = "Development;";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/applications/misc/slic3r/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
comment = "G-code generator for 3D printers"; comment = "G-code generator for 3D printers";
desktopName = "Slic3r"; desktopName = "Slic3r";
genericName = "3D printer tool"; genericName = "3D printer tool";
categories = "Application;Development;"; categories = "Development;";
}; };
prePatch = '' prePatch = ''

7
pkgs/applications/misc/st/default.nix
View File

@ -4,11 +4,12 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "st-0.8.3"; pname = "st";
version = "0.8.4";
src = fetchurl { src = fetchurl {
url = "https://dl.suckless.org/st/${name}.tar.gz"; url = "https://dl.suckless.org/st/${pname}-${version}.tar.gz";
sha256 = "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk"; sha256 = "19j66fhckihbg30ypngvqc9bcva47mp379ch5vinasjdxgn3qbfl";
}; };
inherit patches; inherit patches;

2
pkgs/applications/misc/sweethome3d/default.nix
View File

@ -24,7 +24,7 @@ let
icon = pname; icon = pname;
comment = description; comment = description;
genericName = "Computer Aided (Interior) Design"; genericName = "Computer Aided (Interior) Design";
categories = "Application;Graphics;2DGraphics;3DGraphics;"; categories = "Graphics;2DGraphics;3DGraphics;";
}; };
patchPhase = '' patchPhase = ''

2
pkgs/applications/misc/sweethome3d/editors.nix
View File

@ -20,7 +20,7 @@ let
name = pname; name = pname;
comment = description; comment = description;
genericName = "Computer Aided (Interior) Design"; genericName = "Computer Aided (Interior) Design";
categories = "Application;Graphics;2DGraphics;3DGraphics;"; categories = "Graphics;2DGraphics;3DGraphics;";
}; };
buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ]; buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ];

1351
pkgs/applications/networking/browsers/asuka/cargo-lock.patch Normal file
View File

File diff suppressed because it is too large Load Diff

28
pkgs/applications/networking/browsers/asuka/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, rustPlatform, fetchurl, pkgconfig, ncurses, openssl, Security }:
rustPlatform.buildRustPackage rec {
pname = "asuka";
version = "0.8.0";
src = fetchurl {
url = "https://git.sr.ht/~julienxx/${pname}/archive/${version}.tar.gz";
sha256 = "10hmsdwf2nrsmpycqa08vd31c6vhx7w5fhvv5a9f92sqp0lcavf0";
};
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "0csj63x77nkdh543pzl9cbaip6xp8anw0942hc6j19y7yicd29ns";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses openssl ]
++ stdenv.lib.optional stdenv.isDarwin Security;
meta = with stdenv.lib; {
description = "Gemini Project client written in Rust with NCurses";
homepage = "https://git.sr.ht/~julienxx/asuka";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ sikmir ];
};
}

1
pkgs/applications/networking/browsers/castor/default.nix
View File

@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
}; };
cargoSha256 = "04w49wka1vkb295lk6fzd6c5rwhzrqkp26hd5d94rx7bhcjmmb9w"; cargoSha256 = "04w49wka1vkb295lk6fzd6c5rwhzrqkp26hd5d94rx7bhcjmmb9w";
verifyCargoDeps = true;
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

770
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View File

File diff suppressed because it is too large Load Diff

770
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View File

File diff suppressed because it is too large Load Diff

2
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -85,7 +85,7 @@ let
comment = ""; comment = "";
desktopName = "${desktopName}${nameSuffix}${lib.optionalString gdkWayland " (Wayland)"}"; desktopName = "${desktopName}${nameSuffix}${lib.optionalString gdkWayland " (Wayland)"}";
genericName = "Web Browser"; genericName = "Web Browser";
categories = "Application;Network;WebBrowser;"; categories = "Network;WebBrowser;";
mimeType = stdenv.lib.concatStringsSep ";" [ mimeType = stdenv.lib.concatStringsSep ";" [
"text/html" "text/html"
"text/xml" "text/xml"

2
pkgs/applications/networking/browsers/palemoon/default.nix
View File

@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
icon = "palemoon"; icon = "palemoon";
desktopName = "Pale Moon"; desktopName = "Pale Moon";
genericName = "Web Browser"; genericName = "Web Browser";
categories = "Application;Network;WebBrowser;"; categories = "Network;WebBrowser;";
mimeType = lib.concatStringsSep ";" [ mimeType = lib.concatStringsSep ";" [
"text/html" "text/html"
"text/xml" "text/xml"

108
pkgs/applications/networking/browsers/webbrowser/default.nix Normal file
View File

@ -0,0 +1,108 @@
{ stdenv, lib, fetchgit, makeDesktopItem, pkgconfig, makeWrapper
# Build
, python2, autoconf213, yasm, perl, ccache
, unzip, gnome2, gnum4
# Runtime
, xorg, zip, freetype, fontconfig, glibc, libffi
, dbus, dbus-glib, gtk2, alsaLib, jack2, ffmpeg
}:
let
libPath = lib.makeLibraryPath [ ffmpeg ];
in stdenv.mkDerivation rec {
pname = "webbrowser";
version = "29.0.0rc1";
src = fetchgit {
url = "https://git.nuegia.net/webbrowser.git";
rev = version;
sha256 = "1d82943mla6q3257081d946kgms91dg0n93va3zlzm9hbbqilzm6";
fetchSubmodules = true;
};
desktopItem = makeDesktopItem {
name = "webbrowser";
exec = "webbrowser %U";
icon = "webbrowser";
desktopName = "Web Browser";
genericName = "Web Browser";
categories = "Network;WebBrowser;";
mimeType = lib.concatStringsSep ";" [
"text/html"
"text/xml"
"application/xhtml+xml"
"application/vnd.mozilla.xul+xml"
"x-scheme-handler/http"
"x-scheme-handler/https"
];
};
nativeBuildInputs = [
gnum4 makeWrapper perl pkgconfig python2 ccache
];
buildInputs = [
alsaLib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2
unzip gnome2.GConf xorg.libXt
];
enableParallelBuilding = true;
configurePhase = ''
export MOZCONFIG=$PWD/.mozconfig
export MOZ_NOSPAM=1
export HOME=$PWD # Needed by ccache
cp $src/doc/mozconfig.example $MOZCONFIG
# Need to modify it
chmod 644 $MOZCONFIG
substituteInPlace $MOZCONFIG \
--replace "mk_add_options PYTHON=/usr/bin/python2" "mk_add_options PYTHON=${python2}/bin/python2" \
--replace "mk_add_options AUTOCONF=/usr/bin/autoconf-2.13" "mk_add_options AUTOCONF=${autoconf213}/bin/autoconf" \
--replace 'mk_add_options MOZ_OBJDIR=$HOME/build/wbobjects/' "" \
--replace "ac_add_options --x-libraries=/usr/lib64" "ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]}" \
--replace "_BUILD_64=1" "_BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"}"
echo >> $MOZCONFIG '
#
# NixOS-specific adjustments
#
ac_add_options --prefix=$out
mk_add_options MOZ_MAKE_FLAGS="-j$NIX_BUILD_CORES"
'
'';
buildPhase = "$src/mach build";
installPhase = ''
$src/mach install
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
for n in 16 32 48; do
size=$n"x"$n
mkdir -p $out/share/icons/hicolor/$size/apps
cp $src/webbrowser/branding/unofficial/default$n.png \
$out/share/icons/hicolor/$size/apps/webbrowser.png
done
# Needed to make videos work
wrapProgram $out/lib/webbrowser-${version}/webbrowser \
--prefix LD_LIBRARY_PATH : "${libPath}"
'';
meta = with lib; {
description = "Generic web browser without trackers compatible with XUL plugins using UXP rendering engine";
homepage = "https://git.nuegia.net/webbrowser.git/";
license = [ licenses.mpl20 licenses.gpl3 ];
maintainers = with maintainers; [ TheBrainScrambler ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

15
pkgs/applications/networking/cluster/argo/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }: { lib, buildGoModule, buildGoPackage, fetchFromGitHub, installShellFiles }:
let let
# Argo can package a static server in the CLI using the `staticfiles` go module. # Argo can package a static server in the CLI using the `staticfiles` go module.
@ -19,19 +19,21 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "argo"; pname = "argo";
version = "2.8.1"; version = "2.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "argoproj"; owner = "argoproj";
repo = "argo"; repo = "argo";
rev = "v${version}"; rev = "v${version}";
sha256 = "193nxc27fh37wf035mclvwwwxjjfc8nnbncg009fg19ycqmvmgvc"; sha256 = "1di6c8p9bc0g8r5l654sdvpiawp76cp8v97cj227yhznf39f20z9";
}; };
vendorSha256 = "1p9b2m20gxc7iyq08mvllf5dpi4m06aw233sb45d05d624kw4aps"; vendorSha256 = "1p9b2m20gxc7iyq08mvllf5dpi4m06aw233sb45d05d624kw4aps";
subPackages = [ "cmd/argo" ]; subPackages = [ "cmd/argo" ];
nativeBuildInputs = [ installShellFiles ];
preBuild = '' preBuild = ''
mkdir -p ui/dist/app mkdir -p ui/dist/app
echo "Built without static files" > ui/dist/app/index.html echo "Built without static files" > ui/dist/app/index.html
@ -48,6 +50,13 @@ buildGoModule rec {
-X github.com/argoproj/argo.gitTag=${version} -X github.com/argoproj/argo.gitTag=${version}
''; '';
postInstall = ''
for shell in bash zsh; do
$out/bin/argo completion $shell > argo.$shell
installShellCompletion argo.$shell
done
'';
meta = with lib; { meta = with lib; {
description = "Container native workflow engine for Kubernetes"; description = "Container native workflow engine for Kubernetes";
homepage = "https://github.com/argoproj/argo"; homepage = "https://github.com/argoproj/argo";

12
pkgs/applications/networking/cluster/qbec/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }: { lib, go, buildGoModule, fetchFromGitHub }:
buildGoModule rec { buildGoModule rec {
pname = "qbec"; pname = "qbec";
@ -13,10 +13,18 @@ buildGoModule rec {
vendorSha256 = "15hbjghi2ifylg7nr85qlk0alsy97h9zj6hf5w84m76dla2bcjf3"; vendorSha256 = "15hbjghi2ifylg7nr85qlk0alsy97h9zj6hf5w84m76dla2bcjf3";
buildFlagsArray = ''
-ldflags=
-s -w
-X github.com/splunk/qbec/internal/commands.version=${version}
-X github.com/splunk/qbec/internal/commands.commit=${src.rev}
-X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go}
'';
meta = with lib; { meta = with lib; {
description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io";
homepage = "https://github.com/splunk/qbec"; homepage = "https://github.com/splunk/qbec";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ groodt ]; maintainers = with maintainers; [ groodt ];
}; };
} }

2
pkgs/applications/networking/instant-messengers/blink/default.nix
View File

@ -39,7 +39,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec {
desktopName = "Blink"; desktopName = "Blink";
icon = "blink"; icon = "blink";
genericName = "Instant Messaging"; genericName = "Instant Messaging";
categories = "Application;Internet;"; categories = "Internet;";
}; };
dontWrapQtApps = true; dontWrapQtApps = true;

2
pkgs/applications/networking/instant-messengers/jitsi/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
comment = "VoIP and Instant Messaging client"; comment = "VoIP and Instant Messaging client";
desktopName = "Jitsi"; desktopName = "Jitsi";
genericName = "Instant Messaging"; genericName = "Instant Messaging";
categories = "Application;X-Internet;"; categories = "X-Internet;";
}; };
libPath = lib.makeLibraryPath ([ libPath = lib.makeLibraryPath ([

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@ -23,7 +23,7 @@ let
else ""); else "");
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "signal-desktop"; pname = "signal-desktop";
version = "1.34.2"; # Please backport all updates to the stable channel. version = "1.34.3"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release. # All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is # When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with: # applied. The expiration date for the current release can be extracted with:
@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0l0i6v6n6iyq1zb2rlgfjnsk37kzjqgglk824vl5kp8qbq0li6b6"; sha256 = "1723h8fwclv07n5lcsqw3snmfhpigkrj609fayg0aycxgi3321h6";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/applications/networking/irc/convos/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang }: { stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang
, nixosTests
}:
with stdenv.lib; with stdenv.lib;
@ -15,7 +17,7 @@ perlPackages.buildPerlPackage rec {
nativeBuildInputs = [ makeWrapper ] nativeBuildInputs = [ makeWrapper ]
++ optional stdenv.isDarwin [ shortenPerlShebang ]; ++ optional stdenv.isDarwin [ shortenPerlShebang ];
buildInputs = with perlPackages; [ buildInputs = with perlPackages; [
CryptEksblowfish FileHomeDir FileReadBackwards CryptEksblowfish FileHomeDir FileReadBackwards
IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall

2
pkgs/applications/networking/remote/anydesk/default.nix
View File

@ -22,7 +22,7 @@ let
icon = "anydesk"; icon = "anydesk";
desktopName = "AnyDesk"; desktopName = "AnyDesk";
genericName = description; genericName = description;
categories = "Application;Network;"; categories = "Network;";
startupNotify = "false"; startupNotify = "false";
}; };

2
pkgs/applications/office/jabref/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
name = "jabref"; name = "jabref";
desktopName = "JabRef"; desktopName = "JabRef";
genericName = "Bibliography manager"; genericName = "Bibliography manager";
categories = "Application;Office;"; categories = "Office;";
icon = "jabref"; icon = "jabref";
exec = "jabref"; exec = "jabref";
}; };

2
pkgs/applications/science/electronics/eagle/eagle.nix
View File

@ -27,7 +27,7 @@ let
comment = "Schematic capture and PCB layout"; comment = "Schematic capture and PCB layout";
desktopName = "Eagle"; desktopName = "Eagle";
genericName = "Schematic editor"; genericName = "Schematic editor";
categories = "Application;Development;"; categories = "Development;";
}; };
buildInputs = buildInputs =

2
pkgs/applications/science/electronics/eagle/eagle7.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
comment = "Schematic capture and PCB layout"; comment = "Schematic capture and PCB layout";
desktopName = "Eagle"; desktopName = "Eagle";
genericName = "Schematic editor"; genericName = "Schematic editor";
categories = "Application;Development;"; categories = "Development;";
}; };
buildInputs = buildInputs =

2
pkgs/applications/science/logic/tlaplus/toolbox.nix
View File

@ -13,7 +13,7 @@ let
comment = "IDE for TLA+"; comment = "IDE for TLA+";
desktopName = name; desktopName = name;
genericName = comment; genericName = comment;
categories = "Application;Development"; categories = "Development";
extraEntries = '' extraEntries = ''
StartupWMClass=TLA+ Toolbox StartupWMClass=TLA+ Toolbox
''; '';

2
pkgs/applications/version-management/gitkraken/default.nix
View File

@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
icon = "gitkraken"; icon = "gitkraken";
desktopName = "GitKraken"; desktopName = "GitKraken";
genericName = "Git Client"; genericName = "Git Client";
categories = "Application;Development;"; categories = "Development;";
comment = "Graphical Git client from Axosoft"; comment = "Graphical Git client from Axosoft";
}; };

10
pkgs/applications/version-management/sublime-merge/common.nix
View File

@ -67,6 +67,16 @@ in let
--set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \ --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \
--set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \ --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \
"''${gappsWrapperArgs[@]}" "''${gappsWrapperArgs[@]}"
# We need to replace the ssh-askpass-sublime executable because the default one
# will not function properly, in order to work it needs to pass an argv[0] to
# the sublime_merge binary, and the built-in version will will try to call the
# sublime_merge wrapper script which cannot pass through the original argv[0] to
# the sublime_merge binary. Thankfully the ssh-askpass-sublime functionality is
# very simple and can be replaced with a simple wrapper script.
rm $out/ssh-askpass-sublime
makeWrapper $out/.${primaryBinary}-wrapped $out/ssh-askpass-sublime \
--argv0 "/ssh-askpass-sublime"
''; '';
}; };
in stdenv.mkDerivation (rec { in stdenv.mkDerivation (rec {

4
pkgs/applications/version-management/sublime-merge/default.nix
View File

@ -9,8 +9,8 @@ in {
} {}; } {};
sublime-merge-dev = common { sublime-merge-dev = common {
buildVersion = "2011"; buildVersion = "2022";
sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp"; sha256 = "0fhxz6nx24wbspn7vfli3pvfv6fdbd591m619pvivig3scpidj61";
dev = true; dev = true;
} {}; } {};
} }

6
pkgs/applications/virtualization/podman/default.nix
View File

@ -16,13 +16,13 @@
buildGoModule rec { buildGoModule rec {
pname = "podman"; pname = "podman";
version = "1.9.3"; version = "2.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = "libpod"; repo = "libpod";
rev = "v${version}"; rev = "v${version}";
sha256 = "0gbp12xn1vliyawkw2w2bpn6b5h2cm41g3nj72vk4jyhis0igq1s"; sha256 = "11avj4q3xh7qbcbs8h4jis0bdfkvvh193sflwiz8hcp41qjvinz4";
}; };
vendorSha256 = null; vendorSha256 = null;
@ -52,7 +52,7 @@ buildGoModule rec {
install -Dm555 bin/podman $out/bin/podman install -Dm555 bin/podman $out/bin/podman
installShellCompletion --bash completions/bash/podman installShellCompletion --bash completions/bash/podman
installShellCompletion --zsh completions/zsh/_podman installShellCompletion --zsh completions/zsh/_podman
MANDIR=$man/share/man make install.man MANDIR=$man/share/man make install.man-nobuild
''; '';
passthru.tests.podman = nixosTests.podman; passthru.tests.podman = nixosTests.podman;

4
pkgs/data/icons/numix-icon-theme/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "numix-icon-theme"; pname = "numix-icon-theme";
version = "20.03.20"; version = "20.06.07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "numixproject"; owner = "numixproject";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "092f8k38xf9yz898nrangm0ia211d41z8kx0v6njfqfgpiad1s7q"; sha256 = "1yp9parc8ihmai8pswf4qzrqd88qpls87ipq8ylx38yqns7wsn4h";
}; };
nativeBuildInputs = [ gtk3 ]; nativeBuildInputs = [ gtk3 ];

4
pkgs/desktops/gnome-3/core/nautilus/default.nix
View File

@ -32,11 +32,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nautilus"; pname = "nautilus";
version = "3.36.2"; version = "3.36.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1yknaz8n0l949sr8j3b7kdm0cm5mx2dp4n4k577m492hk6akqrr6"; sha256 = "1y0fsd7j48v4qkc051cg41mz7jycgw4vd4g37lw682p7n5xgrjmn";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

12
pkgs/development/interpreters/php/default.nix
View File

@ -264,24 +264,24 @@ let
}; };
php72base = callPackage generic (_args // { php72base = callPackage generic (_args // {
version = "7.2.29"; version = "7.2.31";
sha256 = "08xry2fgqgg8s0ym1hh11wkbr36av3zq1bn4krbciw1b7x8gb8ga"; sha256 = "0057x1s43f9jidmrl8daka6wpxclxc1b1pm5cjbz616p8nbmb9qv";
# https://bugs.php.net/bug.php?id=76826 # https://bugs.php.net/bug.php?id=76826
extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch; extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
}); });
php73base = callPackage generic (_args // { php73base = callPackage generic (_args // {
version = "7.3.16"; version = "7.3.19";
sha256 = "0bh499v9dfgh9k51w4rird1slb9rh9whp5h37fb84c98d992s1xq"; sha256 = "199l1lr7ima92icic7b1bqlb036md78m305lc3v6zd4zw8qix70d";
# https://bugs.php.net/bug.php?id=76826 # https://bugs.php.net/bug.php?id=76826
extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
}); });
php74base = callPackage generic (_args // { php74base = callPackage generic (_args // {
version = "7.4.6"; version = "7.4.7";
sha256 = "0j133pfwa823d4jhx2hkrrzjl4hswvz00b1z58r5c82xd5sr9vd6"; sha256 = "0ynq4fz54jpzh9nxvbgn3vrdad2clbac0989ai0yrj2ryc0hs3l0";
}); });
defaultPhpExtensions = { all, ... }: with all; ([ defaultPhpExtensions = { all, ... }: with all; ([

85
pkgs/development/libraries/amdvlk/default.nix Normal file
View File

@ -0,0 +1,85 @@
{ stdenv
, lib
, fetchpatch
, fetchRepoProject
, cmake
, ninja
, patchelf
, perl
, pkgconfig
, python3
, expat
, libdrm
, ncurses
, openssl
, wayland
, xorg
, zlib
}:
stdenv.mkDerivation rec {
pname = "amdvlk";
version = "2020.Q2.5";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
sha256 = "008adby8vx12ma155x64n7aj9vp9ygqgij3mm3q20i187db7d1ab";
};
buildInputs = [
expat
ncurses
openssl
wayland
xorg.libX11
xorg.libxcb
xorg.xcbproto
xorg.libXext
xorg.libXrandr
xorg.libXft
xorg.libxshmfence
zlib
];
nativeBuildInputs = [
cmake
ninja
patchelf
perl
pkgconfig
python3
];
rpath = lib.makeLibraryPath [
libdrm
stdenv.cc.cc.lib
xorg.libX11
xorg.libxcb
xorg.libxshmfence
];
cmakeDir = "../drivers/xgl";
installPhase = ''
install -Dm755 -t $out/lib icd/amdvlk64.so
install -Dm644 -t $out/share/vulkan/icd.d ../drivers/AMDVLK/json/Redhat/amd_icd64.json
substituteInPlace $out/share/vulkan/icd.d/amd_icd64.json --replace \
"/usr/lib64" "$out/lib"
patchelf --set-rpath "$rpath" $out/lib/amdvlk64.so
'';
# Keep the rpath, otherwise vulkaninfo and vkcube segfault
dontPatchELF = true;
meta = with stdenv.lib; {
description = "AMD Open Source Driver For Vulkan";
homepage = "https://github.com/GPUOpen-Drivers/AMDVLK";
license = licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ Flakebi ];
};
}

2
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -242,8 +242,6 @@ stdenv.mkDerivation rec {
pname = "ffmpeg-full"; pname = "ffmpeg-full";
inherit (ffmpeg) src version; inherit (ffmpeg) src version;
patches = [ ./prefer-libdav1d-over-libaom.patch ];
prePatch = '' prePatch = ''
patchShebangs . patchShebangs .
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + stdenv.lib.optionalString stdenv.isDarwin ''

19
pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch
View File

@ -1,19 +0,0 @@
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index d2f9a39ce5..2342399a8e 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -679,13 +679,13 @@ extern AVCodec ff_pcm_mulaw_at_encoder;
extern AVCodec ff_pcm_mulaw_at_decoder;
extern AVCodec ff_qdmc_at_decoder;
extern AVCodec ff_qdm2_at_decoder;
+extern AVCodec ff_libdav1d_decoder;
extern AVCodec ff_libaom_av1_decoder;
extern AVCodec ff_libaom_av1_encoder;
extern AVCodec ff_libaribb24_decoder;
extern AVCodec ff_libcelt_decoder;
extern AVCodec ff_libcodec2_encoder;
extern AVCodec ff_libcodec2_decoder;
-extern AVCodec ff_libdav1d_decoder;
extern AVCodec ff_libdavs2_decoder;
extern AVCodec ff_libfdk_aac_encoder;
extern AVCodec ff_libfdk_aac_decoder;

6
pkgs/development/libraries/ffmpeg/4.nix
View File

@ -5,8 +5,8 @@
}@args: }@args:
callPackage ./generic.nix (rec { callPackage ./generic.nix (rec {
version = "4.2.3"; version = "4.3";
branch = "4.2"; branch = "4.3";
sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1"; sha256 = "1qnnhd2b0g5sg72pclxs3i8sxzz0raky69k7w9cmpba9zh973s57";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
} // args) } // args)

11
pkgs/development/libraries/json-c/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf }: { stdenv, fetchurl, fetchpatch, autoconf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "json-c-0.13.1"; name = "json-c-0.13.1";
@ -7,6 +7,15 @@ stdenv.mkDerivation rec {
sha256 = "0ch1v18wk703bpbyzj7h1mkwvsw4rw4qdwvgykscypvqq10678ll"; sha256 = "0ch1v18wk703bpbyzj7h1mkwvsw4rw4qdwvgykscypvqq10678ll";
}; };
patches = [
# https://nvd.nist.gov/vuln/detail/CVE-2020-12762
(fetchpatch {
name = "CVE-2020-12762.patch";
url = "https://github.com/json-c/json-c/commit/865b5a65199973bb63dff8e47a2f57e04fec9736.patch";
sha256 = "1g5afk4khhm1sb70xrva1pyznshcw3ipzp1g5z60dpzxy303pp6h";
})
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoconf ]; # for autoheader nativeBuildInputs = [ autoconf ]; # for autoheader

4
pkgs/development/libraries/libgcrypt/default.nix
View File

@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ] configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ]
++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-asm"; ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-asm";
# Necessary to generate correct assembly when compiling for aarch32 on
# aarch64
configurePlatforms = [ "host" "build" ];
# Make sure libraries are correct for .pc and .la files # Make sure libraries are correct for .pc and .la files
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
postFixup = '' postFixup = ''

6
pkgs/development/libraries/libjpeg-turbo/default.nix
View File

@ -18,6 +18,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a2291b252de1413a13db61b21863ae7aea0946f3.patch"; url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a2291b252de1413a13db61b21863ae7aea0946f3.patch";
sha256 = "0nc5vcch5h52gpi07h08zf8br58q8x81q2hv871hrn0dinb53vym"; sha256 = "0nc5vcch5h52gpi07h08zf8br58q8x81q2hv871hrn0dinb53vym";
}) })
(fetchpatch {
name = "cve-2020-13790.patch";
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3de15e0c344d.diff";
sha256 = "0hm5i6qir5w3zxb0xvqdh4jyvbfg7xnd28arhyfsaclfz9wdb0pb";
})
] ++ ] ++
stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
./mingw-boolean.patch; ./mingw-boolean.patch;

4
pkgs/development/libraries/libksba/default.nix
View File

@ -1,11 +1,11 @@
{ buildPackages, stdenv, fetchurl, gettext, libgpgerror }: { buildPackages, stdenv, fetchurl, gettext, libgpgerror }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libksba-1.3.5"; name = "libksba-1.4.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/libksba/${name}.tar.bz2"; url = "mirror://gnupg/libksba/${name}.tar.bz2";
sha256 = "0h53q4sns1jz1pkmhcz5wp9qrfn9f5g9i3vjv6dafwzzlvblyi21"; sha256 = "1dj1razn35srkgadx3i30yr0q037cr0dn54m6a54vxgh3zlsirmz";
}; };
outputs = [ "out" "dev" "info" ]; outputs = [ "out" "dev" "info" ];

10
pkgs/development/libraries/libqmi/default.nix
View File

@ -1,22 +1,24 @@
{ stdenv, fetchurl, pkgconfig, glib, python3, libgudev, libmbim }: { stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libqmi"; pname = "libqmi";
version = "1.24.12"; version = "1.25.900";
src = fetchurl { src = fetchurl {
url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
sha256 = "0scb8a2kh0vnzx6kxanfy2s2slnfppvrwg202rxv30m8p2i92frd"; sha256 = "0a96f4ab7qy4szwzqs8ir2mvsnpqzk7zsiv6zahlhpf0jhp1vxf7";
}; };
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
configureFlags = [ configureFlags = [
"--with-udev-base-dir=${placeholder "out"}/lib/udev" "--with-udev-base-dir=${placeholder "out"}/lib/udev"
"--enable-introspection"
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkg-config
gobject-introspection
python3 python3
]; ];

4
pkgs/development/libraries/nv-codec-headers/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nv-codec-headers"; pname = "nv-codec-headers";
version = "9.0.18.1"; version = "9.1.23.1";
src = fetchgit { src = fetchgit {
url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";
rev = "n${version}"; rev = "n${version}";
sha256 = "0354fivb92ix341jds7a7qn3mgwimrnxbganhlhr4vayj25c3hw5"; sha256 = "1xfvb3mhz6wfx9c732888xa82ivaig903lhvvrqqzs31qfznsplh";
}; };
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

4
pkgs/development/libraries/olm/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "olm"; pname = "olm";
version = "3.1.4"; version = "3.1.5";
src = fetchurl { src = fetchurl {
url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz"; url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz";
sha256 = "0f7azjxc77n4ib9nj3cwyk3vhk8r2dsyf7id6nvqyxqxwxn95a8w"; sha256 = "15l6cf029ghfk5bf8ii6nyy86gc90ji8n5hspjhj1xmzmk61xb4j";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/science/math/openblas/default.nix
View File

@ -99,12 +99,12 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openblas"; pname = "openblas";
version = "0.3.9"; version = "0.3.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xianyi"; owner = "xianyi";
repo = "OpenBLAS"; repo = "OpenBLAS";
rev = "v${version}"; rev = "v${version}";
sha256 = "0nq51j45shb32n6086xff3x374kx5qhr2cwjzvppx4s2z0ahflal"; sha256 = "174id98ga82bhz2v7sy9yj6pqy0h0088p3mkdikip69p9rh3d17b";
}; };
inherit blas64; inherit blas64;

20
pkgs/development/ocaml-modules/cohttp/default.nix
View File

@ -1,27 +1,25 @@
{ lib, fetchFromGitHub, buildDunePackage { lib, fetchurl, buildDunePackage
, ppx_fields_conv, ppx_sexp_conv , ppx_fields_conv, ppx_sexp_conv, stdlib-shims
, base64, fieldslib, jsonm, re, stringext, uri-sexp , base64, fieldslib, jsonm, re, stringext, uri-sexp
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "cohttp"; pname = "cohttp";
version = "2.1.3"; version = "2.5.1";
src = fetchFromGitHub { src = fetchurl {
owner = "mirage"; url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
repo = "ocaml-cohttp"; sha256 = "0im91mi3nxzqfd7fs5r0zg5gsparfnf5zaz13mpw247hkd3y3396";
rev = "v${version}";
sha256 = "16k4ldmz6ljryhr139adlma130frb5wh13qswkrwc5gxx6d2wh8d";
}; };
buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ]; buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp ]; propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ];
meta = { meta = {
description = "HTTP(S) library for Lwt, Async and Mirage"; description = "HTTP(S) library for Lwt, Async and Mirage";
license = lib.licenses.isc; license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; homepage = "https://github.com/mirage/ocaml-cohttp";
}; };
} }

2
pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
View File

@ -11,6 +11,8 @@ buildDunePackage {
pname = "cohttp-lwt-unix"; pname = "cohttp-lwt-unix";
inherit (cohttp-lwt) version src meta; inherit (cohttp-lwt) version src meta;
useDune2 = true;
buildInputs = [ cmdliner ppx_sexp_conv ]; buildInputs = [ cmdliner ppx_sexp_conv ];
propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ]; propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ];

2
pkgs/development/ocaml-modules/cohttp/lwt.nix
View File

@ -2,6 +2,8 @@
if !stdenv.lib.versionAtLeast cohttp.version "0.99" if !stdenv.lib.versionAtLeast cohttp.version "0.99"
then cohttp then cohttp
else if !stdenv.lib.versionAtLeast ppx_sexp_conv.version "0.13"
then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_conv.version}"
else else
buildDunePackage { buildDunePackage {

22
pkgs/development/ocaml-modules/conduit/default.nix
View File

@ -1,26 +1,26 @@
{ stdenv, fetchFromGitHub, buildDunePackage { stdenv, fetchurl, buildDunePackage
, ppx_sexp_conv, sexplib , ppx_sexp_conv, sexplib, astring, uri, logs
, astring, ipaddr, macaddr, uri, , ipaddr, ipaddr-sexp
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "conduit"; pname = "conduit";
version = "1.4.0"; version = "2.2.2";
src = fetchFromGitHub { minimumOCamlVersion = "4.07";
owner = "mirage";
repo = "ocaml-conduit"; src = fetchurl {
rev = "v${version}"; url = "https://github.com/mirage/ocaml-conduit/releases/download/v2.2.2/conduit-v2.2.2.tbz";
sha256 = "1qzamqcmf9ywz04bkwrv17mz9j6zq2w9h1xmnjvp11pnwrs2xq8l"; sha256 = "1zb83w2pq9c8xrappfxa6y5q93772f5dj22x78camsm77a2c2z55";
}; };
buildInputs = [ ppx_sexp_conv ]; buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [ astring ipaddr macaddr sexplib uri ]; propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ];
meta = { meta = {
description = "Network connection library for TCP and SSL"; description = "Network connection library for TCP and SSL";
license = stdenv.lib.licenses.isc; license = stdenv.lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ]; maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ];
inherit (src.meta) homepage; homepage = "https://github.com/mirage/ocaml-conduit";
}; };
} }

20
pkgs/development/ocaml-modules/conduit/lwt-unix.nix
View File

@ -1,16 +1,20 @@
{ stdenv, buildDunePackage, conduit-lwt { stdenv, buildDunePackage
, logs, ppx_sexp_conv, lwt_ssl , conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp
, lwt_ssl, tls
}: }:
if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0"
then conduit-lwt
else
buildDunePackage { buildDunePackage {
pname = "conduit-lwt-unix"; pname = "conduit-lwt-unix";
inherit (conduit-lwt) version src meta; inherit (conduit-lwt) version src minimumOCamlVersion;
useDune2 = true;
buildInputs = [ ppx_sexp_conv ]; buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [ conduit-lwt logs lwt_ssl ]; propagatedBuildInputs =
[ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ];
meta = conduit-lwt.meta // {
description = "A network connection establishment library for Lwt_unix";
};
} }

14
pkgs/development/ocaml-modules/conduit/lwt.nix
View File

@ -1,14 +1,14 @@
{ stdenv, buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt }: { stdenv, buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }:
if !stdenv.lib.versionAtLeast conduit.version "1.0"
then conduit
else
buildDunePackage { buildDunePackage {
pname = "conduit-lwt"; pname = "conduit-lwt";
inherit (conduit) version src meta; inherit (conduit) version src minimumOCamlVersion;
buildInputs = [ ppx_sexp_conv ]; buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [ conduit ocaml_lwt ]; propagatedBuildInputs = [ conduit ocaml_lwt sexplib ];
meta = conduit.meta // {
description = "A network connection establishment library for Lwt";
};
} }

2
pkgs/development/ocaml-modules/curly/default.nix
View File

@ -7,6 +7,8 @@ buildDunePackage rec {
minimumOCamlVersion = "4.02"; minimumOCamlVersion = "4.02";
useDune2 = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rgrinberg"; owner = "rgrinberg";
repo = pname; repo = pname;

2
pkgs/development/ocaml-modules/git-unix/default.nix
View File

@ -4,6 +4,8 @@ buildDunePackage {
pname = "git-unix"; pname = "git-unix";
inherit (git-http) version src; inherit (git-http) version src;
useDune2 = true;
buildInputs = [ cmdliner mtime ]; buildInputs = [ cmdliner mtime ];
propagatedBuildInputs = [ cohttp-lwt-unix git-http tls ]; propagatedBuildInputs = [ cohttp-lwt-unix git-http tls ];

2
pkgs/development/ocaml-modules/graphql/cohttp.nix
View File

@ -8,6 +8,8 @@ buildDunePackage rec {
inherit (graphql) version src; inherit (graphql) version src;
useDune2 = true;
nativeBuildInputs = [ ocaml-crunch ]; nativeBuildInputs = [ ocaml-crunch ];
propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ]; propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ];

17
pkgs/development/ocaml-modules/ipaddr/cstruct.nix Normal file
View File

@ -0,0 +1,17 @@
{ lib, buildDunePackage
, ipaddr, cstruct
}:
buildDunePackage rec {
pname = "ipaddr-cstruct";
inherit (ipaddr) version src minimumOCamlVersion;
propagatedBuildInputs = [ ipaddr cstruct ];
doCheck = true;
meta = ipaddr.meta // {
description = "A library for manipulation of IP address representations using Cstructs";
};
}

16
pkgs/development/ocaml-modules/ipaddr/default.nix
View File

@ -1,22 +1,20 @@
{ lib, buildDunePackage { lib, buildDunePackage
, macaddr, ounit , macaddr, domain-name, stdlib-shims
, ounit, ppx_sexp_conv
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "ipaddr"; pname = "ipaddr";
inherit (macaddr) version src; inherit (macaddr) version src minimumOCamlVersion;
buildInputs = [ ounit ]; propagatedBuildInputs = [ macaddr domain-name stdlib-shims ];
propagatedBuildInputs = [ macaddr ];
checkInputs = [ ppx_sexp_conv ounit ];
doCheck = true; doCheck = true;
meta = with lib; { meta = macaddr.meta // {
homepage = "https://github.com/mirage/ocaml-ipaddr";
description = "A library for manipulation of IP (and MAC) address representations "; description = "A library for manipulation of IP (and MAC) address representations ";
license = licenses.isc; maintainers = with lib.maintainers; [ alexfmpe ericbmerritt ];
maintainers = with maintainers; [ alexfmpe ericbmerritt ];
}; };
} }

18
pkgs/development/ocaml-modules/ipaddr/sexp.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib, buildDunePackage
, ipaddr, ipaddr-cstruct, ounit, ppx_sexp_conv
}:
buildDunePackage rec {
pname = "ipaddr-sexp";
inherit (ipaddr) version src minimumOCamlVersion;
propagatedBuildInputs = [ ipaddr ];
checkInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ];
doCheck = true;
meta = ipaddr.meta // {
description = "A library for manipulation of IP address representations usnig sexp";
};
}

2
pkgs/development/ocaml-modules/irmin/git.nix
View File

@ -6,6 +6,8 @@ buildDunePackage rec {
inherit (irmin) version src; inherit (irmin) version src;
useDune2 = true;
propagatedBuildInputs = [ git irmin ]; propagatedBuildInputs = [ git irmin ];
checkInputs = lib.optionals doCheck [ git-unix irmin-mem irmin-test ]; checkInputs = lib.optionals doCheck [ git-unix irmin-mem irmin-test ];

2
pkgs/development/ocaml-modules/irmin/graphql.nix
View File

@ -6,6 +6,8 @@ buildDunePackage rec {
inherit (irmin) version src; inherit (irmin) version src;
useDune2 = true;
propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ]; propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ];
doCheck = true; doCheck = true;

2
pkgs/development/ocaml-modules/irmin/http.nix
View File

@ -8,6 +8,8 @@ buildDunePackage rec {
inherit (irmin) version src; inherit (irmin) version src;
useDune2 = true;
propagatedBuildInputs = [ cohttp-lwt irmin webmachine ]; propagatedBuildInputs = [ cohttp-lwt irmin webmachine ];
checkInputs = lib.optionals doCheck [ checkseum git-unix irmin-git irmin-mem irmin-test ]; checkInputs = lib.optionals doCheck [ checkseum git-unix irmin-git irmin-mem irmin-test ];

2
pkgs/development/ocaml-modules/irmin/ppx.nix
View File

@ -5,6 +5,8 @@ buildDunePackage {
inherit (irmin) version src minimumOCamlVersion; inherit (irmin) version src minimumOCamlVersion;
useDune2 = true;
buildInputs = [ ocaml-syntax-shims ]; buildInputs = [ ocaml-syntax-shims ];
propagatedBuildInputs = [ ppxlib ]; propagatedBuildInputs = [ ppxlib ];

2
pkgs/development/ocaml-modules/irmin/unix.nix
View File

@ -10,6 +10,8 @@ buildDunePackage rec {
inherit (irmin) version src; inherit (irmin) version src;
useDune2 = true;
propagatedBuildInputs = [ checkseum cmdliner git-unix yaml propagatedBuildInputs = [ checkseum cmdliner git-unix yaml
irmin irmin-fs irmin-git irmin-graphql irmin-http irmin-mem irmin-pack irmin-watcher irmin irmin-fs irmin-git irmin-graphql irmin-http irmin-mem irmin-pack irmin-watcher
]; ];

17
pkgs/development/ocaml-modules/macaddr/cstruct.nix Normal file
View File

@ -0,0 +1,17 @@
{ lib, buildDunePackage
, macaddr, cstruct
}:
buildDunePackage {
pname = "macaddr-cstruct";
inherit (macaddr) version src minimumOCamlVersion;
propagatedBuildInputs = [ macaddr cstruct ];
doCheck = true;
meta = macaddr.meta // {
description = "A library for manipulation of MAC address representations using Cstructs";
};
}

11
pkgs/development/ocaml-modules/macaddr/default.nix
View File

@ -1,21 +1,20 @@
{ lib, fetchurl, buildDunePackage { lib, fetchurl, buildDunePackage
, ppx_sexp_conv , ppx_sexp_conv, ounit
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "macaddr"; pname = "macaddr";
version = "3.1.0"; version = "5.0.0";
minimumOCamlVersion = "4.04"; minimumOCamlVersion = "4.04";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-ipaddr/archive/v${version}.tar.gz"; url = "https://github.com/mirage/ocaml-ipaddr/archive/v${version}.tar.gz";
sha256 = "1hi3v5dzg6h4qb268ch3h6v61gsc8bv21ajhb35z37v5nsdmyzbh"; sha256 = "1j2m2v64g3d81sixxq3g57j1iyk6042ivsszml18akrqvwfpxy66";
}; };
propagatedBuildInputs = [ ppx_sexp_conv ]; checkInputs = [ ppx_sexp_conv ounit ];
doCheck = true;
doCheck = false; # ipaddr and macaddr tests are together, which requires mutual dependency
meta = with lib; { meta = with lib; {
homepage = "https://github.com/mirage/ocaml-ipaddr"; homepage = "https://github.com/mirage/ocaml-ipaddr";

18
pkgs/development/ocaml-modules/macaddr/sexp.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib, buildDunePackage
, macaddr, ppx_sexp_conv, macaddr-cstruct, ounit
}:
buildDunePackage {
pname = "macaddr-sexp";
inherit (macaddr) version src minimumOCamlVersion;
propagatedBuildInputs = [ ppx_sexp_conv ];
checkInputs = [ macaddr-cstruct ounit ];
doCheck = true;
meta = macaddr.meta // {
description = "A library for manipulation of MAC address representations using sexp";
};
}

4
pkgs/development/ocaml-modules/odoc/default.nix
View File

@ -4,13 +4,13 @@
buildDunePackage rec { buildDunePackage rec {
pname = "odoc"; pname = "odoc";
version = "1.5.0"; version = "1.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocaml"; owner = "ocaml";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "14ilq2glcvda8mfhj27jqqwx3392q8ssp9bq9agz7k1k6ilp9dai"; sha256 = "0z2nisg1vb5xlk41hqw8drvj90v52wli7zvnih6a844cg6xsvvj2";
}; };
buildInputs = [ astring cmdliner cppo fpath result tyxml ]; buildInputs = [ astring cmdliner cppo fpath result tyxml ];

20
pkgs/development/ocaml-modules/opam-core/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ lib, buildDunePackage, unzip
, opam, ocamlgraph, re, cppo }:
buildDunePackage rec {
pname = "opam-core";
inherit (opam) src version;
nativeBuildInputs = [ unzip cppo ];
propagatedBuildInputs = [ ocamlgraph re ];
# get rid of check for curl at configure time
# opam-core does not call curl at run time
configureFlags = [ "--disable-checks" ];
meta = opam.meta // {
description = "Small standard library extensions, and generic system interaction modules used by opam";
maintainers = with lib.maintainers; [ sternenseemann ];
};
}

Some files were not shown because too many files have changed in this diff Show More