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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2022-04-05 00:02:06 +00:00
committed by GitHub
parent 6fd0d1bb4b c7212b35a5
commit 120925b5cb
57 changed files with 3160 additions and 2476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+10
View File
@@ -11123,6 +11123,16 @@
email = "schristopher@konputa.com";
name = "Scott Christopher";
};
sciencentistguy = {
email = "jamie@quigley.xyz";
name = "Jamie Quigley";
github = "Sciencentistguy";
githubId = 4983935;
keys = [{
longkeyid = "rsa2048/0x8E8FF66E2AE8D970";
fingerprint = "30BB FF3F AB0B BB3E 0435 F83C 8E8F F66E 2AE8 D970";
}];
};
scode = {
email = "peter.schuller@infidyne.com";
github = "scode";
pkgs/applications/audio/praat/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "praat";
version = "6.2.09";
version = "6.2.10";
src = fetchFromGitHub {
owner = "praat";
repo = "praat";
rev = "v${version}";
sha256 = "sha256-BhsbTFwxgWwMwe1ow0ppVsLjfMC7QMA/fq09Utwe+KA=";
sha256 = "sha256-IYbPMjKWDQQrF+JiqBQ2wsjY+Ms93tEdsG75CxipwaI=";
};
configurePhase = ''
pkgs/applications/editors/eclipse/default.nix
+13 -13
View File
@@ -16,11 +16,11 @@ assert stdenv ? glibc;
let
platform_major = "4";
platform_minor = "22";
year = "2021";
month = "12"; #release month
buildmonth = "11"; #sometimes differs from release month
timestamp = "${year}${buildmonth}241800";
platform_minor = "23";
year = "2022";
month = "03"; #release month
buildmonth = "03"; #sometimes differs from release month
timestamp = "${year}${buildmonth}080310";
gtk = gtk3;
in rec {
@@ -40,7 +40,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
hash = "sha512-Lniaw8aUptHI0a75olTNHaMba+ugUdJKf9sJ0hGzKqY94vvfU3N2TH5eQBeXb1MyQdRdBL1D8Vs3+LD9lWlTMg==";
hash = "sha512-IKoHGBH8pQ1mkdMz11exO1u5T3hCPk662nPYoFunCyrQHOVA6KDAVHzEo1dxNUSJVGvW9YHDbGlZphXniTBJHw==";
};
};
@@ -52,7 +52,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
hash = "sha512-F/5yroFDbrSclmUP5vTNSkYR+OZ1dkPv2FPZT1XM5HFoynitYkDxnj+uTcJIBOWv3Zu1plU4yweW0DF1E9jLcg==";
hash = "sha512-cG3mMEJiuNrVfFy5nNkVqC2OpMeE5C1iu26E+LKGwwIBwqPoJtFBPRhLdGVC73KwDDRK8DEyurXsiFal60dv/g==";
};
};
@@ -64,7 +64,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
hash = "sha512-3XsBk8/KHtTjit/WMneOghuOkqEHOIdLwof7718dsrDP4vfgcfhb47V7fPYDOw2eld88pHk+85mTGpZOTTywxw==";
hash = "sha512-AEGENE5AXXUmIRwv8Hp3LByfPtuG/HvipqkMoq+K4A+8Y7NZCRQM9YSf8zr42S0aYTr6rwP6VJajpFiz4ixULg==";
};
};
@@ -90,7 +90,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
hash = "sha512-7bTYIFnX8oUPaqDrMOlGNnpyC+xvDQsNmgZUps/epGkzM9Fjlc2lPr75VR7UaezBCoAuNTSHCYtG5d6TJOKjmQ==";
hash = "sha512-CTSuI6Dc2wKe0RduPKAacQmXbEBtF4J7Q5b9gC1MIkXXWPLW7Yp+lL/a167TXgDHG3kqNWbonjZ2JwU2T0FRjg==";
};
};
@@ -102,7 +102,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
hash = "sha512-ahykujYH9RLvxVMPFlFILGYJO0LXHvuhnILifeAo5v5Tp5ktGVlZWG461iZHETlt8Zr76liGAqm1ytQcuzCyQA==";
hash = "sha512-6QOtNFYCRhdSiclEwijBcp2EODnlp8qtO56NJLuRdgwpEe+3A567L/vsZe/E72YTGZOFh9yJ7+XehIEjonfUIw==";
};
};
@@ -114,7 +114,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
hash = "sha512-CuKxjcnvkROURtavZJN0AhCuA0x7NayZTpIOn9oE21rUzVqR0p7x7C5RPtMZ9gS4ZMWcYyQDJ0BVgRHBoKsYqQ==";
hash = "sha512-bgaRM7l4WOoGA8doR/nqjV4Hnszx3N4cZANYfq/Fq5Agspocu4m1F4ofetQC4BdlLkx0o+moKSN6sm34aT5H4Q==";
};
};
@@ -126,7 +126,7 @@ in rec {
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";
hash = "sha512-CqUbxUUMIJsXsx4XEOQ1d2L3U22VpAfQP+R8HNoVetDawhR+b2tyDVnTQRKTL4dJ0fjLXDeoHvTlPm1EXi/ahA==";
hash = "sha512-YyyATAL0pJVrinrLixIW3p+bz3WfD7L/WL0EGnUWgCGsiVDzF2CGoXXT8YsH34uc+6Hn8z23JCoNX4Sqdo8i7Q==";
};
};
@@ -138,7 +138,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
hash = "sha256-ys3MjIBr2hLZC/GB8Am/Qlto4+dSzOoK9p7QF+GS0Eg=";
hash = "sha256-1Go3e1HDRJlba8ySYRfi0+aU6aHjKmd3fc/IgeKw18c=";
};
};
pkgs/applications/editors/eclipse/plugins.nix
+2 -2
View File
@@ -248,12 +248,12 @@ rec {
cdt = buildEclipseUpdateSite rec {
name = "cdt-${version}";
# find current version at https://www.eclipse.org/cdt/downloads.php
version = "10.5.0";
version = "10.6.0";
src = fetchzip {
stripRoot = false;
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip";
hash = "sha256-0sf38Ekw9mMjiEmJDcunVL3VS3KqWVXKZlQIGBk4V4g=";
hash = "sha256-eMvZ2UvPpUq1J4DDg6f+R1g217bnRjxmr5zWUAhef/c=";
};
meta = with lib; {
pkgs/applications/editors/kakoune/plugins/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ let
inherit buildKakounePluginFrom2Nix;
};
aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib plugins);
aliases = lib.optionalAttrs config.allowAliases (import ./aliases.nix lib plugins);
in
pkgs/applications/editors/vim/plugins/default.nix
+1 -1
View File
@@ -35,7 +35,7 @@ let
inherit llvmPackages luaPackages;
};
aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else final: prev: {};
aliases = if config.allowAliases then (import ./aliases.nix lib) else final: prev: {};
extensible-self = lib.makeExtensible
(extends aliases
pkgs/applications/editors/vscode/extensions/default.nix
+1 -1
View File
@@ -2329,7 +2329,7 @@ let
# then apply extension specific modifcations to packages.
# overlays will be applied left to right, overrides should come after aliases.
overlays = lib.optionals (config.allowAliases or true) [ aliases ];
overlays = lib.optionals config.allowAliases [ aliases ];
toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays;
in
pkgs/applications/misc/bottles/default.nix
+2 -2
View File
@@ -20,8 +20,8 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "bottles";
version = "2022.3.14-trento-3";
sha256 = "0wdqj9l69a9pnray2zcfgl2yw0hmrh23njbgwgqccimch014ckdq";
version = "2022.3.28-trento-1";
sha256 = "1mpvym7b88pb0xxij32arj31q5m6b3z47p8zv9njvkfs0151b2v4";
# Note: Update via pkgs/applications/misc/bottles/update.py
# mostly copypasted from pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
pkgs/applications/misc/wlclock/default.nix
+46
View File
@@ -0,0 +1,46 @@
{ lib
, stdenv
, fetchFromSourcehut
, meson
, ninja
, cmake
, pkg-config
, wayland-protocols
, wayland
, cairo
, scdoc
}:
stdenv.mkDerivation rec {
pname = "wlclock";
version = "1.0.1";
src = fetchFromSourcehut {
owner = "~leon_plickat";
repo = "wlclock";
rev = "v${version}";
sha256 = "sha256-aHA4kXHYH+KvAJSep5X3DqsiK6WFpXr3rGQl/KNiUcY=";
};
nativeBuildInputs = [
meson
ninja
cmake
pkg-config
];
buildInputs = [
wayland-protocols
wayland
cairo
scdoc
];
meta = with lib; {
description = "A digital analog clock for Wayland desktops";
homepage = "https://git.sr.ht/~leon_plickat/wlclock";
license = licenses.gpl3;
maintainers = with maintainers; [ nomisiv ];
platforms = with platforms; linux;
};
}
pkgs/applications/networking/browsers/chromium/upstream-info.json
+6 -6
View File
@@ -32,15 +32,15 @@
}
},
"dev": {
"version": "101.0.4951.15",
"sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y",
"sha256bin64": "0m1q85ai9pyam9anh8aiv7hyadam0hjkkhnsa6s05d82k8kz5rvc",
"version": "102.0.4972.0",
"sha256": "1aihdym7h8sd52wiybnrgjrd618f3yby4bpbkc26xyrl8gviz31d",
"sha256bin64": "0mb67cfr397aclkiy0v9xqga07c166qdylq257k2kmhj7df1gcvn",
"deps": {
"gn": {
"version": "2022-03-14",
"version": "2022-03-29",
"url": "https://gn.googlesource.com/gn",
"rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
"sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
"rev": "e39d5251c25155b9dfdb96adeab31b795095fd3b",
"sha256": "1clr0f847rmwwpmsl9zv4q6rw1shn09my775666v480szpahj9pk"
}
}
},
pkgs/applications/networking/cluster/terraform-providers/default.nix
+1 -1
View File
@@ -68,7 +68,7 @@ let
archived = date: throw "the provider has been archived by upstream on ${date}";
removed = date: throw "removed from nixpkgs on ${date}";
in
lib.optionalAttrs (config.allowAliases or false) {
lib.optionalAttrs config.allowAliases {
arukas = archived "2022/01";
chef = archived "2022/01";
cherryservers = archived "2022/01";
pkgs/applications/science/misc/bada-bib/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
python3Packages.buildPythonApplication rec {
pname = "bada-bib";
version = "0.6.0";
version = "0.6.1";
format = "other";
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
owner = "RogerCrocker";
repo = "BadaBib";
rev = "v${version}";
sha256 = "sha256-gfZc3R8hrYy4Nco+XwG29lzZd537ByEgd3RL8h7f6DQ=";
sha256 = "sha256-fuGGKBScdo9rI3tLSBWIcWEME8nSuct0IUyfmI7PzCc=";
};
nativeBuildInputs = [
pkgs/applications/version-management/gogs/default.nix
+3 -3
View File
@@ -8,16 +8,16 @@ with lib;
buildGoModule rec {
pname = "gogs";
version = "0.12.5";
version = "0.12.6";
src = fetchFromGitHub {
owner = "gogs";
repo = "gogs";
rev = "v${version}";
sha256 = "sha256-I3kFRKgVMGMKgHU5VEeNai8FseN/ea6MzEP94AR2Zfo=";
sha256 = "sha256-nAMnsRYYS5bZhLDzPdC4sj3rv1kPjckFnLoORY1HqW8=";
};
vendorSha256 = "sha256-3dT5D+oDd0mpJp/cP53TQcRUkmqh6g3sRBWWAUqhaAo=";
vendorSha256 = "sha256-U8rzYSLD9XeO5ai3p3OG74kPRI2IAlvOeZhU1Pa1BAI=";
subPackages = [ "." ];
pkgs/applications/virtualization/docker/compose.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.3.4";
version = "2.4.0";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
sha256 = "sha256-ZFnrfGM2LUZZC8IPPCh3GS95jz7NGraOlr3wQaw5K0k=";
sha256 = "sha256-dHq1t1ebPSAS5H14Kd03xCiHV9UhAH0dIxikQK0rHQk=";
};
vendorSha256 = "sha256-Y2rE5/XLmQLqBA8xiCd9v30gTaO9qbiBFa4jKucKU6M=";
vendorSha256 = "sha256-N+paN3zEXzzUFb2JPVIDZYZ0h0iu7naiw4pSVnGsuKQ=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
pkgs/build-support/writers/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gawk, gnused, gixy }:
let
aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else prev: {};
aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {};
writers = with lib; rec {
# Base implementation for non-compiled executables.
pkgs/desktops/gnome-2/default.nix
+1 -1
View File
@@ -62,7 +62,7 @@ lib.makeScope pkgs.newScope (self: with self; {
autoreconfHook = pkgs.autoreconfHook269;
};
} // lib.optionalAttrs (config.allowAliases or true) {
} // lib.optionalAttrs config.allowAliases {
inherit (pkgs)
# GTK Libs
glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
pkgs/desktops/gnome/default.nix
+1 -1
View File
@@ -278,7 +278,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-autoar = callPackage ./misc/gnome-autoar { };
gnome-packagekit = callPackage ./misc/gnome-packagekit { };
}) // lib.optionalAttrs (config.allowAliases or true) {
}) // lib.optionalAttrs config.allowAliases {
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
gnome-desktop = pkgs.gnome-desktop; # added 2022-03-16
pkgs/desktops/gnome/extensions/default.nix
+1 -1
View File
@@ -69,7 +69,7 @@ in rec {
(lib.attrValues)
(mapReadableNames)
# Add some aliases
(extensions: extensions // lib.optionalAttrs (config.allowAliases or true) {
(extensions: extensions // lib.optionalAttrs config.allowAliases {
unite-shell = gnomeExtensions.unite; # added 2021-01-19
arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14
disable-unredirect = gnomeExtensions.disable-unredirect-fullscreen-windows; # added 2021-11-20
pkgs/desktops/pantheon/default.nix
+1 -1
View File
@@ -226,7 +226,7 @@ lib.makeScope pkgs.newScope (self: with self; {
# Please call these packages in pkgs/top-level/all-packages.nix instead of this file.
# https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
}) // lib.optionalAttrs (config.allowAliases or true) {
}) // lib.optionalAttrs config.allowAliases {
### ALIASES
pkgs/desktops/plasma-5/default.nix
+1 -1
View File
@@ -166,7 +166,7 @@ let
parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { };
};
} // lib.optionalAttrs (config.allowAliases or true) {
} // lib.optionalAttrs config.allowAliases {
ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
plasma-phone-components = throw "'plasma-phone-components' has been renamed to/replaced by 'plasma-mobile'";
};
pkgs/desktops/xfce/default.nix
+1 -1
View File
@@ -158,7 +158,7 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
} // lib.optionalAttrs (config.allowAliases or true) {
} // lib.optionalAttrs config.allowAliases {
#### ALIASES - added 2018-01
terminal = xfce4-terminal;
pkgs/development/coq-modules/aac-tactics/default.nix
+6 -2
View File
@@ -6,7 +6,10 @@ mkCoqDerivation {
releaseRev = v: "v${v}";
release."8.15.1".sha256 = "sha256:0k2sl3ns897a5ll11bazgpv4ppgi1vmx4n89v2dnxabm5dglyglp";
release."8.14.1".sha256 = "sha256:1w99jgm7mxwdxnalxhralmhmpwwbd52pbbifq0mx13ixkv6iqm1a";
release."8.14.0".sha256 = "04x47ngb95m1h4jw2gl0v79s5im7qimcw7pafc34gkkf51pyhakp";
release."8.13.2".sha256 = "sha256-MAnMc4KzC551JInrRcfKED4nz04FO0GyyyuDVRmnYTa=";
release."8.13.0".sha256 = "sha256-MAnMc4KzC551JInrRcfKED4nz04FO0GyyyuDVRmnYTY=";
release."8.12.0".sha256 = "sha256-dPNA19kZo/2t3rbyX/R5yfGcaEfMhbm9bo71Uo4ZwoM=";
release."8.11.0".sha256 = "sha256-CKKMiJLltIb38u+ZKwfQh/NlxYawkafp+okY34cGCYU=";
@@ -18,8 +21,9 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = "8.14"; out = "8.14.0"; }
{ case = "8.13"; out = "8.13.0"; }
{ case = "8.15"; out = "8.15.1"; }
{ case = "8.14"; out = "8.14.1"; }
{ case = "8.13"; out = "8.13.2"; }
{ case = "8.12"; out = "8.12.0"; }
{ case = "8.11"; out = "8.11.0"; }
{ case = "8.10"; out = "8.10.0"; }
pkgs/development/coq-modules/coqprime/default.nix
+2 -1
View File
@@ -6,12 +6,13 @@ with lib; mkCoqDerivation {
owner = "thery";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.12" "8.14"; out = "8.14.1"; }
{ case = range "8.12" "8.15"; out = "8.15"; }
{ case = range "8.10" "8.11"; out = "8.10"; }
{ case = range "8.8" "8.9"; out = "8.8"; }
{ case = "8.7"; out = "8.7.2"; }
] null;
release."8.15".sha256 = "sha256:1zr2q52r08na8265019pj9spcz982ivixk6cnzk6l1srn2g328gv";
release."8.14.1".sha256= "sha256:0dqf87xkzcpg7gglbxjyx68ad84w1w73icxgy3s7d3w563glc2p7";
release."8.12".sha256 = "1slka4w0pya15js4drx9frj7lxyp3k2lzib8v23givzpnxs8ijdj";
release."8.10".sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz";
pkgs/development/coq-modules/relation-algebra/default.nix
+8 -1
View File
@@ -5,8 +5,13 @@ mkCoqDerivation {
pname = "relation-algebra";
owner = "damien-pous";
releaseRev = v: "v${v}";
releaseRev = v:
if versions.isGe "1.7.6" v
then "v.${v}"
else "v${v}";
release."1.7.7".sha256 = "sha256:1dff3id6nypl2alhk9rcifj3dab0j78dym05blc525lawsmc26l2";
release."1.7.6".sha256 = "sha256:02gsj06zcy9zgd0h1ibqspwfiwm36pkkgg9cz37k4bxzcapxcr6w";
release."1.7.5".sha256 = "sha256-XdO8agoJmNXPv8Ho+KTlLCB4oRlQsb0w06aM9M16ZBU=";
release."1.7.4".sha256 = "sha256-o+v2CIAa2+9tJ/V8DneDTf4k31KMHycgMBLaQ+A4ufM=";
release."1.7.3".sha256 = "sha256-4feSNfi7h4Yhwn5L+9KP9K1S7HCPvsvaVWwoQSTFvos=";
@@ -15,6 +20,8 @@ mkCoqDerivation {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isEq "8.15"; out = "1.7.7"; }
{ case = isEq "8.14"; out = "1.7.6"; }
{ case = isEq "8.13"; out = "1.7.5"; }
{ case = isEq "8.12"; out = "1.7.4"; }
{ case = isEq "8.11"; out = "1.7.3"; }
pkgs/development/idris-modules/default.nix
+1 -1
View File
@@ -205,7 +205,7 @@
yampa = callPackage ./yampa.nix {};
} // builtins_ // pkgs.lib.optionalAttrs (config.allowAliases or true) {
} // builtins_ // pkgs.lib.optionalAttrs config.allowAliases {
# removed packages
protobuf = throw "idrisPackages.protobuf has been removed: abandoned by upstream"; # Added 2022-02-06
};
pkgs/development/interpreters/python/default.nix
+1 -1
View File
@@ -75,7 +75,7 @@ with pkgs;
optionalExtensions = cond: as: if cond then as else [];
python2Extension = import ../../../top-level/python2-packages.nix;
extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]);
aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ../../../top-level/python-aliases.nix lib self super);
aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super);
in lib.makeScopeWithSplicing
pkgs.splicePackages
pkgs.newScope
pkgs/development/libraries/gdcm/default.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "gdcm";
version = "3.0.11";
version = "3.0.12";
src = fetchFromGitHub {
owner = "malaterre";
repo = "GDCM";
rev = "v${version}";
sha256 = "sha256-rGR0yQImLG3kBp6/QoEMLFrFtgAIN6y9lZ3OmtAUVcY=";
sha256 = "sha256-ChHsbnX+128ZOugL6Nc8EqfaDMaNMNDmKTN55pyyem8=";
};
cmakeFlags = [
pkgs/development/python-modules/amazon-ion/default.nix
+27 -9
View File
@@ -1,29 +1,47 @@
{ lib, buildPythonPackage, fetchPypi, jsonconversion, six, pytestCheckHook }:
{ lib
, buildPythonPackage
, fetchPypi
, jsonconversion
, six
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "amazon-ion";
version = "0.8.0";
version = "0.9.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "amazon.ion";
inherit version;
sha256 = "sha256-vtztUHSnGoPYozhwvigxEdieVtbKNfV4B5yZ4MHaWGw=";
hash = "sha256-Moq1e7LmI0L7DHg6UNYvseEDbqdL23aCwL38wDm3yCA=";
};
postPatch = ''
substituteInPlace setup.py --replace "'pytest-runner'," ""
substituteInPlace setup.py \
--replace "'pytest-runner'," ""
'';
propagatedBuildInputs = [ jsonconversion six ];
propagatedBuildInputs = [
jsonconversion
six
];
checkInputs = [ pytestCheckHook ];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "amazon.ion" ];
pythonImportsCheck = [
"amazon.ion"
];
meta = with lib; {
description = "A Python implementation of Amazon Ion";
description = "Python implementation of Amazon Ion";
homepage = "https://github.com/amzn/ion-python";
license = licenses.asl20;
maintainers = [ maintainers.terlar ];
maintainers = with maintainers; [ terlar ];
};
}
pkgs/development/python-modules/dotmap/default.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "dotmap";
version = "1.3.27";
version = "1.3.28";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-gHCQIN8CIeF8TgHWeQu8GCRxK1aQFJJ/d7jZurxxMik=";
hash = "sha256-riqDYqtjstyx681zz80aZ6hBizNw4V3NOusInHGlXoI=";
};
checkInputs = [
pkgs/development/python-modules/goodwe/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "goodwe";
version = "0.2.16";
version = "0.2.17";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "marcelblijleven";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qW1wD6QVLqGhEnpGqNjZ50jb/3HHooohfHz+p4/ZH74=";
sha256 = "sha256-Lx7jvL7Fyq8fqJQq8ZgEG/V20+tHxw3yl3s7scAwwjA=";
};
checkInputs = [
pkgs/development/python-modules/pynetgear/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pynetgear";
version = "0.9.2";
version = "0.9.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "MatMaul";
repo = pname;
rev = version;
sha256 = "sha256-/aPyx+jNOCW6bzeYAEBP1yfIJfQwJjo1i6WaRvAz0oU=";
sha256 = "sha256-zydSx2OZowf+1KZ5ZJ/1FDVqDZQZ4U0+q62eB1+s+WY=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pysigma/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysigma";
version = "0.4.4";
version = "0.4.5";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma";
rev = "v${version}";
hash = "sha256-eZDPi87wwsM0EriJ/Y1yTSJ9R4BqvJg3YJyJUa2vLqo=";
hash = "sha256-jZPimSkJ6qTs0kEMVhP9Gnxu0jxA0cmgdn5++CevgIM=";
};
nativeBuildInputs = [
pkgs/development/r-modules/default.nix
+1 -1
View File
@@ -362,7 +362,7 @@ let
mwaved = [ pkgs.fftw.dev ];
mzR = with pkgs; [ zlib boost159.dev netcdf ];
ncdf4 = [ pkgs.netcdf ];
nloptr = with pkgs; [ nlopt pkg-config ];
nloptr = with pkgs; [ nlopt pkg-config libiconv ];
n1qn1 = [ pkgs.gfortran ];
odbc = [ pkgs.unixODBC ];
pander = with pkgs; [ pandoc which ];
pkgs/development/r-modules/generic-builder.nix
+2
View File
@@ -10,6 +10,8 @@ stdenv.mkDerivation ({
NIX_CFLAGS_COMPILE =
lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
configurePhase = ''
runHook preConfigure
export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library"
pkgs/development/tools/ddosify/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ddosify";
version = "0.7.5";
version = "0.7.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-n9xKg8RN2o20dTsV8a0tAJjmvAlwZ7TF2cTrXx+f49k=";
sha256 = "sha256-nwTVSx6+ELTZnM2tOuyzr7Koq6SE5L52S4revRjGABs=";
};
vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU=";
pkgs/development/tools/rust/ograc/default.nix
+21
View File
@@ -0,0 +1,21 @@
{ fetchFromGitLab, lib, rustPlatform, }:
rustPlatform.buildRustPackage {
pname = "ograc";
version = "0.1.6";
src = fetchFromGitLab {
owner = "lirnril";
repo = "ograc";
rev = "d09b3102ff7a364bf2593589327a16a473bd4f25";
sha256 = "sha256-vdHPFY6zZ/OBNlJO3N/6YXcvlddw2wYHgFWI0yfSgVo=";
};
cargoSha256 = "sha256-HAeEd7HY+hbTUOkIt6aTfvPYLRPtdAcUGvkuBUMjohA=";
meta = with lib; {
description = "like cargo, but backwards";
homepage = "https://crates.io/crates/ograc";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ sciencentistguy ];
};
}
pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ pkgs ? import <nixpkgs> {}
, nodejs ? pkgs.nodejs
, yarn ? pkgs.yarn
, allowAliases ? pkgs.config.allowAliases or true
, allowAliases ? pkgs.config.allowAliases
}:
let
pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
+4 -1
View File
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
patches = [ ./no-root-install.patch ];
makeFlags = [ "PREFIX=$(out)" ];
makeFlags = [
"PREFIX=$(out)"
"CC=${stdenv.cc.targetPrefix}cc"
];
meta = {
description = "Firmware extractor for cards supported by the b43 kernel module";
pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
+1 -1
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0vz4ka8gycf72gmnaq61k8rh8y17j1wm2k3fidxvcqjvmix0drzi";
};
buildInputs = [ b43FirmwareCutter ];
nativeBuildInputs = [ b43FirmwareCutter ];
installPhase = ''
mkdir -p $out/lib/firmware
pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
+1 -1
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0baw6gcnrhxbb447msv34xg6rmlcj0gm3ahxwvdwfcvq4xmknz50";
};
buildInputs = [ b43FirmwareCutter ];
nativeBuildInputs = [ b43FirmwareCutter ];
sourceRoot = ".";
pkgs/servers/mattermost/default.nix
+3 -3
View File
@@ -10,7 +10,7 @@
, storePathAsBuildHash ? false }:
let
version = "6.3.3";
version = "6.3.6";
goPackagePath = "github.com/mattermost/mattermost-server";
@@ -22,7 +22,7 @@ let
owner = "mattermost";
repo = "mattermost-server";
rev = "v${version}";
sha256 = "OSN8Bscgv7rPfKIfZ3ZnegdgsygFpSM7/vGWojj0P3k=";
sha256 = "905zxMucDTxxrLoh5ZoAExW4eFmi+xa98aI3EpJZ2Og=";
};
ldflags = [
@@ -65,7 +65,7 @@ let
src = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
sha256 = "Og9DUGyE4cWYF7EQP/8szIrWM1Ldqnpqc+HW+L7XApo=";
sha256 = "JDsCDZEtbeBTYuzOSwrxFNRKXy+9KXirjaCz6ODP5uw=";
};
installPhase = ''
pkgs/servers/monitoring/thanos/default.nix
+3 -3
View File
@@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "thanos";
version = "0.24.0";
version = "0.25.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "thanos-io";
repo = "thanos";
sha256 = "sha256-HdfOxi9l2xPs4JOY15Yt+KlCm7SQ0Ap1qa5F7abr2g8=";
sha256 = "sha256-yisJqr2JMpXSo9O3q7WpNe1r6w7E3XyeLpVlbdest3s=";
};
vendorSha256 = "sha256-+0XW7xGocM00kxmOMj0xHYPIpxc0rTQnyr9JQ/cPl3I=";
vendorSha256 = "sha256-tHtfS4PnO9n3ckUdaG6dQAIE2D2PG6km4Tqofaab/eg=";
doCheck = false;
pkgs/tools/admin/eksctl/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.89.0";
version = "0.90.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "sha256-8Cdvt+WB/Tl5jFNRlE2t62Y7O0QIxtZWF8F/dLDSqkw=";
sha256 = "sha256-XQZ32Gg/LZCDuSmtGvDEYCuzvq39zzq3yGGTYSKZyXI=";
};
vendorSha256 = "sha256-SJowSDvthxwfAyMSRtNkQbyOy8L5HjkVRkxG/L4/dLc=";
vendorSha256 = "sha256-IYqeuyNPRQBMwuZMW4InKfHpOLhleM5Mz5Oauw4nK6M=";
doCheck = false;
pkgs/tools/misc/chezmoi/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.14.0";
version = "2.15.0";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-WxOpmowRP8KSxxjW4JNQlQL6jZ2EhvpNb87NgeSO890=";
sha256 = "sha256-P4ELrDcN6kIpIsKgZJppJv+y+ofnEz7McmGvCijnfQA=";
};
vendorSha256 = "sha256-ord4jHjgiW+Z2OD/x2ZAFOJYLyoB7Tja6SOd+JqxWDM=";
vendorSha256 = "sha256-D27a107gjHK4NYkJhZDd0SvhUmmRSl3DX519nglAoPo=";
doCheck = false;
pkgs/tools/misc/fzf/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fzf";
version = "0.29.0";
version = "0.30.0";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
sha256 = "sha256-m+mW9R50VXWUMaRmhMzpr7v8iQJxLYexYvcUMHPz3UM=";
sha256 = "sha256-7E6fj/Sjew+zz+iMFkiSJjVn2rymKRvZtEJZH65INxk=";
};
vendorSha256 = "sha256-omvCzM5kH3nAE57S33NV0OFRJmU+Ty7hhriaG/Dc0o0=";
pkgs/tools/networking/findomain/default.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "findomain";
version = "7.0.1";
version = "7.2.0";
src = fetchFromGitHub {
owner = "Edu4rdSHL";
repo = pname;
rev = version;
sha256 = "sha256-OXyp2cQmt311CPAcJQeWKGRHFYNL6E+f2TmUuT80/z4=";
sha256 = "sha256-NhsEXYEYoRZ/HlMS+MP/N+ZxB13DDZr5B8MY5dbONP0=";
};
cargoSha256 = "sha256-TwegOBf7dILL7DKohIVfa8IRTU4F9u24tDrrONIGF0U=";
cargoSha256 = "sha256-Y/DgAMWhTgHuhdbYxpsg7UxLF7hXNQEY1aoaUbKdDEM=";
nativeBuildInputs = [ installShellFiles perl ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
pkgs/tools/networking/mosh/default.nix
+4 -3
View File
@@ -11,11 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s";
};
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ];
buildInputs = [ protobuf ncurses zlib openssl bash-completion ]
++ (with perlPackages; [ perl IOTty ])
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ];
buildInputs = [ protobuf ncurses zlib openssl bash-completion perlPackages.perl ]
++ lib.optional withUtempter libutempter;
strictDeps = true;
enableParallelBuilding = true;
patches = [
pkgs/tools/security/ffuf/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ffuf";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-M+wzS/u40zjUNc+63qzkoM9eJ4ruradeJKhhQTP2jxQ=";
sha256 = "sha256-m+L78fVsqntD7JfgWS9foUJUhIVr+CtJ6K8etsLuNzw=";
};
vendorSha256 = "sha256-szT08rIozAuliOmge5RFX4NeVrJ2pCVyfotrHuvc0UU=";
pkgs/tools/typesetting/tex/texlive/default.nix
+21 -27
View File
@@ -7,7 +7,6 @@
, makeWrapper, python3, ruby, perl
, useFixedHashes ? true
, recurseIntoAttrs
, fetchpatch
}:
let
# various binaries (compiled)
@@ -57,22 +56,15 @@ let
deps = orig.collection-plaingeneric.deps // { inherit (tl) xdvi; };
};
# override cyclic dependency until #167226 is fixed
xecjk = orig.xecjk // {
deps = removeAttrs orig.xecjk.deps [ "ctex" ];
};
texdoc = orig.texdoc // {
# build Data.tlpdb.lua (part of the 'tlType == "run"' package)
postUnpack = let
# commit that ensures reproducibility of Data.tlpdb.lua
# remove on the next texdoc update
reproPatch = fetchpatch {
name = "make-data-tlpdb-lua-reproducible.patch";
url = "https://github.com/TeX-Live/texdoc/commit/82aff83d5453a887c1117b9e771a98bddd8a605a.patch";
sha256 = "0y04y468i7db4p5bsyyhgzip8q4fi1756x9a15ndha9xfnasbf44";
stripLen = 2;
extraPrefix = "scripts/texdoc/";
};
in ''
postUnpack = ''
if [[ -f "$out"/scripts/texdoc/texdoc.tlu ]]; then
patch -p1 -d "$out" < "${reproPatch}"
unxz --stdout "${tlpdb}" > texlive.tlpdb
# create dummy doc file to ensure that texdoc does not return an error
@@ -123,20 +115,21 @@ let
++ combinePkgs (attrs.deps or {});
};
snapshot = {
year = "2021";
month = "12";
day = "27";
};
# for daily snapshots
# snapshot = {
# year = "2022";
# month = "03";
# day = "22";
# };
tlpdb = fetchurl {
# use the same mirror(s) as urlPrefixes below
urls = [
#"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2019/tlnet-final/tlpkg/texlive.tlpdb.xz"
#"ftp://tug.org/texlive/historic/2019/tlnet-final/tlpkg/texlive.tlpdb.xz"
"https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/tlpkg/texlive.tlpdb.xz"
"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/tlpkg/texlive.tlpdb.xz"
"ftp://tug.org/texlive/historic/${bin.texliveYear}/tlnet-final/tlpkg/texlive.tlpdb.xz"
#"https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/tlpkg/texlive.tlpdb.xz"
];
hash = "sha512-PcXTctrO0aL5C7Ci1J2Z5fa5WqKONhOK2q0FnSbT5+iP9WWSCljyQiHE8C4LYMMHii48y6AJVRkjVIukI3+rUQ==";
hash = "sha256-qSV6OZmGHCom2w85WXm84ohMrGGJLZ2Vzj9talDNiOo=";
};
# create a derivation that contains an unpacked upstream TL package
@@ -157,11 +150,11 @@ let
# (https://tug.org/historic/).
urlPrefixes = args.urlPrefixes or [
# tlnet-final snapshot
#"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2019/tlnet-final/archive"
#"ftp://tug.org/texlive/historic/2019/tlnet-final/archive"
"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive"
"ftp://tug.org/texlive/historic/${bin.texliveYear}/tlnet-final/archive"
# Daily snapshots hosted by one of the texlive release managers
"https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/archive"
#"https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/archive"
];
in runCommand "texlive-${tlName}"
@@ -209,7 +202,8 @@ in
(combine {
${pname} = attrs;
extraName = "combined" + lib.removePrefix "scheme" pname;
extraVersion = ".${snapshot.year}${snapshot.month}${snapshot.day}";
extraVersion = "-final";
#extraVersion = ".${snapshot.year}${snapshot.month}${snapshot.day}";
})
)
{ inherit (tl)
pkgs/tools/typesetting/tex/texlive/fixedHashes.nix
+825 -725
View File
File diff suppressed because it is too large Load Diff
pkgs/tools/typesetting/tex/texlive/pkgs.nix
+2077 -1622
View File
File diff suppressed because it is too large Load Diff
pkgs/top-level/all-packages.nix
+4
View File
@@ -13468,6 +13468,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
ograc = callPackage ../development/tools/rust/ograc { };
rhack = callPackage ../development/tools/rust/rhack { };
inherit (rustPackages) rls;
roogle = callPackage ../development/tools/rust/roogle { };
@@ -30078,6 +30080,8 @@ with pkgs;
wlc = callPackage ../tools/misc/wlc { };
wlclock = callPackage ../applications/misc/wlclock { };
wllvm = callPackage ../development/tools/wllvm { };
wmname = callPackage ../applications/misc/wmname { };
pkgs/top-level/config.nix
+18
View File
@@ -32,6 +32,24 @@ let
feature = "run <literal>checkPhase</literal> by default";
};
allowAliases = mkOption {
type = types.bool;
default = true;
description = ''
Whether to expose old attribute names for compatibility.
The recommended setting is to enable this, as it
improves backward compatibity, easing updates.
The only reason to disable aliases is for continuous
integration purposes. For instance, Nixpkgs should
not depend on aliases in its internal code. Projects
that aren't Nixpkgs should be cautious of instantly
removing all usages of aliases, as migrating too soon
can break compatibility with the stable Nixpkgs releases.
'';
};
};
in {
pkgs/top-level/kodi-packages.nix
+1 -1
View File
@@ -153,7 +153,7 @@ let self = rec {
trakt-module = callPackage ../applications/video/kodi/addons/trakt-module { };
trakt = callPackage ../applications/video/kodi/addons/trakt { };
}; in self // lib.optionalAttrs (config.allowAliases or true) {
}; in self // lib.optionalAttrs config.allowAliases {
# deprecated or renamed packages
controllers = throw "kodi.packages.controllers has been replaced with kodi.packages.controller-topology-project - a package which contains a large number of controller profiles." { };
pkgs/top-level/linux-kernels.nix
+1 -1
View File
@@ -476,7 +476,7 @@ in {
can-isotp = callPackage ../os-specific/linux/can-isotp { };
} // lib.optionalAttrs (config.allowAliases or false) {
} // lib.optionalAttrs config.allowAliases {
ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18;
});
pkgs/top-level/perl-packages.nix
+1 -1
View File
@@ -25406,7 +25406,7 @@ let
};
};
} // lib.optionalAttrs (config.allowAliases or true) {
} // lib.optionalAttrs config.allowAliases {
autodie = null; # part of Perl
AutoLoader = null; # part of Perl 5.22
constant = null; # part of Perl 5.22
pkgs/top-level/stage.nix
+1 -1
View File
@@ -152,7 +152,7 @@ let
res self super;
in res;
aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib self super);
aliases = self: super: lib.optionalAttrs config.allowAliases (import ./aliases.nix lib self super);
# stdenvOverrides is used to avoid having multiple of versions
# of certain dependencies that were used in bootstrapping the