BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/staging-next' into staging

Browse source
This commit is contained in:
Martin Weinelt 2023-01-27 23:50:50 +01:00
commit 4d96ea81a4
64 changed files with 853 additions and 872 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/builders/images/dockertools.section.md
View file

@ -145,7 +145,7 @@ Create a Docker image with many of the store paths being on their own layer to i
`architecture` is _optional_ and used to specify the image architecture, this is useful for multi-architecture builds that don't need cross compiling. If not specified it will default to `hostPlatform`.
: Run-time configuration of the container. A full list of the options are available at in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions).
: Run-time configuration of the container. A full list of the options available is in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions).
*Default:* `{}`

5
doc/languages-frameworks/ocaml.section.md
View file

@ -129,3 +129,8 @@ packaged libraries may still use the old spelling: maintainers are invited to
fix this when updating packages. Massive renaming is strongly discouraged as it
would be challenging to review, difficult to test, and will cause unnecessary
rebuild.
The build will automatically fail if two distinct versions of the same library
are added to `buildInputs` (which usually happens transitively because of
`propagatedBuildInputs`). Set `dontDetectOcamlConflicts` to true to disable this
behavior.

3
lib/tests/maintainer-module.nix
View file

@ -7,7 +7,8 @@ in {
type = types.str;
};
email = lib.mkOption {
type = types.str;
type = types.nullOr types.str;
default = null;
};
matrix = lib.mkOption {
type = types.nullOr types.str;

9
lib/tests/maintainers.nix
View file

@ -1,5 +1,6 @@
# to run these tests (and the others)
# nix-build nixpkgs/lib/tests/release.nix
# These tests should stay in sync with the comment in maintainers/maintainers-list.nix
{ # The pkgs used for dependencies for the testing itself
pkgs ? import ../.. {}
, lib ? pkgs.lib
@ -20,7 +21,7 @@ let
];
}).config;
checkGithubId = lib.optional (checkedAttrs.github != null && checkedAttrs.githubId == null) ''
checks = lib.optional (checkedAttrs.github != null && checkedAttrs.githubId == null) ''
echo ${lib.escapeShellArg (lib.showOption prefix)}': If `github` is specified, `githubId` must be too.'
# Calling this too often would hit non-authenticated API limits, but this
# shouldn't happen since such errors will get fixed rather quickly
@ -28,8 +29,12 @@ let
id=$(jq -r '.id' <<< "$info")
echo "The GitHub ID for GitHub user ${checkedAttrs.github} is $id:"
echo -e " githubId = $id;\n"
'' ++ lib.optional (checkedAttrs.email == null && checkedAttrs.github == null && checkedAttrs.matrix == null) ''
echo ${lib.escapeShellArg (lib.showOption prefix)}': At least one of `email`, `github` or `matrix` must be specified, so that users know how to reach you.'
'' ++ lib.optional (checkedAttrs.email != null && lib.hasSuffix "noreply.github.com" checkedAttrs.email) ''
echo ${lib.escapeShellArg (lib.showOption prefix)}': If an email address is given, it should allow people to reach you. If you do not want that, you can just provide `github` or `matrix` instead.'
'';
in lib.deepSeq checkedAttrs checkGithubId;
in lib.deepSeq checkedAttrs checks;
missingGithubIds = lib.concatLists (lib.mapAttrsToList checkMaintainer lib.maintainers);

76
maintainers/maintainer-list.nix
View file

@ -3,12 +3,13 @@
handle = {
# Required
name = "Your name";
email = "address@example.org";
# Optional
# Optional, but at least one of email, matrix or githubId must be given
email = "address@example.org";
matrix = "@user:example.org";
github = "GithubUsername";
githubId = your-github-id;
keys = [{
fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333";
}];
@ -25,6 +26,9 @@
- `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`,
- `keys` is a list of your PGP/GPG key fingerprints.
Specifying a GitHub account ensures that you automatically get a review request on
pull requests that modify a package for which you are a maintainer.
`handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient.
If `github` begins with a numeral, `handle` should be prefixed with an underscore.
@ -105,13 +109,11 @@
};
_1000teslas = {
name = "Kevin Tran";
email = "47207223+1000teslas@users.noreply.github.com";
github = "1000teslas";
githubId = 47207223;
};
_2gn = {
name = "Hiram Tanner";
email = "101851090+2gn@users.noreply.github.com";
github = "2gn";
githubId = 101851090;
};
@ -916,7 +918,6 @@
name = "Anders Sildnes";
};
andys8 = {
email = "andys8@users.noreply.github.com";
github = "andys8";
githubId = 13085980;
name = "Andy";
@ -1102,7 +1103,6 @@
name = "Blaž Hrastnik";
};
arcnmx = {
email = "arcnmx@users.noreply.github.com";
github = "arcnmx";
githubId = 13426784;
name = "arcnmx";
@ -2581,7 +2581,6 @@
}];
};
christophcharles = {
email = "23055925+christophcharles@users.noreply.github.com";
github = "christophcharles";
githubId = 23055925;
name = "Christoph Charles";
@ -3250,7 +3249,6 @@
name = "Daniel Șerbănescu";
};
datafoo = {
email = "34766150+datafoo@users.noreply.github.com";
github = "datafoo";
githubId = 34766150;
name = "datafoo";
@ -3401,7 +3399,6 @@
githubId = 1153808;
};
deliciouslytyped = {
email = "47436522+deliciouslytyped@users.noreply.github.com";
github = "deliciouslytyped";
githubId = 47436522;
name = "deliciouslytyped";
@ -3565,7 +3562,6 @@
name = "David Leung";
};
DianaOlympos = {
email = "DianaOlympos@noreply.github.com";
github = "DianaOlympos";
githubId = 15774340;
name = "Thomas Depierre";
@ -3590,7 +3586,6 @@
};
diogox = {
name = "Diogo Xavier";
email = "13244408+diogox@users.noreply.github.com";
github = "diogox";
githubId = 13244408;
};
@ -3815,7 +3810,6 @@
name = "Dominik Ritter";
};
drperceptron = {
email = "92106371+drperceptron@users.noreply.github.com";
github = "drperceptron";
githubId = 92106371;
name = "Dr Perceptron";
@ -4262,7 +4256,6 @@
name = "Ente";
};
Enzime = {
email = "enzime@users.noreply.github.com";
github = "Enzime";
githubId = 10492681;
name = "Michael Hoang";
@ -4393,7 +4386,6 @@
name = "Ertugrul Söylemez";
};
esclear = {
email = "esclear@users.noreply.github.com";
github = "esclear";
githubId = 7432848;
name = "Daniel Albert";
@ -4801,7 +4793,6 @@
name = "Florian Klink";
};
florentc = {
email = "florentc@users.noreply.github.com";
github = "florentc";
githubId = 1149048;
name = "Florent Ch.";
@ -4923,7 +4914,6 @@
name = "Frede Emil";
};
freezeboy = {
email = "freezeboy@users.noreply.github.com";
github = "freezeboy";
githubId = 13279982;
name = "freezeboy";
@ -5483,7 +5473,6 @@
name = "Guillaume Koenig";
};
guserav = {
email = "guserav@users.noreply.github.com";
github = "guserav";
githubId = 28863828;
name = "guserav";
@ -5972,7 +5961,6 @@
name = "Imran Hossain";
};
iagoq = {
email = "18238046+iagocq@users.noreply.github.com";
github = "iagocq";
githubId = 18238046;
name = "Iago Manoel Brito";
@ -6040,7 +6028,6 @@
name = "Dominic Steinitz";
};
ifurther = {
email = "55025025+ifurther@users.noreply.github.com";
github = "ifurther";
githubId = 55025025;
name = "Feather Lin";
@ -6297,7 +6284,6 @@
}];
};
ivankovnatsky = {
email = "75213+ivankovnatsky@users.noreply.github.com";
github = "ivankovnatsky";
githubId = 75213;
name = "Ivan Kovnatsky";
@ -6897,7 +6883,6 @@
name = "Jocelyn Thode";
};
joedevivo = {
email = "55951+joedevivo@users.noreply.github.com";
github = "joedevivo";
githubId = 55951;
name = "Joe DeVivo";
@ -7556,7 +7541,6 @@
name = "Kid";
};
kidsan = {
email = "8798449+Kidsan@users.noreply.github.com";
github = "kidsan";
githubId = 8798449;
name = "kidsan";
@ -8825,7 +8809,6 @@
githubId = 22586596;
};
marsam = {
email = "marsam@users.noreply.github.com";
github = "marsam";
githubId = 65531;
name = "Mario Rodas";
@ -9069,7 +9052,6 @@
name = "Mateusz Mazur";
};
mbaeten = {
email = "mbaeten@users.noreply.github.com";
github = "mbaeten";
githubId = 2649304;
name = "M. Baeten";
@ -9287,7 +9269,6 @@
name = "Maximilian Güntner";
};
mh = {
email = "68288772+markus-heinrich@users.noreply.github.com";
github = "markus-heinrich";
githubId = 68288772;
name = "Markus Heinrich";
@ -9305,7 +9286,6 @@
name = "Max Hofer";
};
miangraham = {
email = "miangraham@users.noreply.github.com";
github = "miangraham";
githubId = 704580;
name = "M. Ian Graham";
@ -9588,7 +9568,6 @@
};
mlvzk = {
name = "mlvzk";
email = "mlvzk@users.noreply.github.com";
github = "mlvzk";
githubId = 44906333;
};
@ -9605,7 +9584,6 @@
name = "Henri Bourcereau";
};
mmesch = {
email = "mmesch@noreply.github.com";
github = "MMesch";
githubId = 2597803;
name = "Matthias Meschede";
@ -10009,7 +9987,6 @@
name = "Roman Naumann";
};
naphta = {
email = "naphta@noreply.github.com";
github = "naphta";
githubId = 6709831;
name = "Jake Hill";
@ -10024,7 +10001,6 @@
}];
};
nat-418 = {
email = "93013864+nat-418@users.noreply.github.com";
github = "nat-418";
githubId = 93013864;
name = "nat-418";
@ -10042,7 +10018,6 @@
name = "Nathan Bijnens";
};
nathyong = {
email = "nathyong@noreply.github.com";
github = "nathyong";
githubId = 818502;
name = "Nathan Yong";
@ -10064,7 +10039,6 @@
};
nazarewk = {
name = "Krzysztof Nazarewski";
email = "3494992+nazarewk@users.noreply.github.com";
matrix = "@nazarewk:matrix.org";
github = "nazarewk";
githubId = 3494992;
@ -10073,7 +10047,6 @@
}];
};
nbr = {
email = "nbr@users.noreply.github.com";
github = "nbr";
githubId = 3819225;
name = "Nick Braga";
@ -10352,7 +10325,6 @@
};
nitsky = {
name = "nitsky";
email = "492793+nitsky@users.noreply.github.com";
github = "nitsky";
githubId = 492793;
};
@ -10663,7 +10635,6 @@
name = "Ole Jørgen Brønner";
};
ollieB = {
email = "1237862+oliverbunting@users.noreply.github.com";
github = "oliverbunting";
githubId = 1237862;
name = "Ollie Bunting";
@ -10681,7 +10652,6 @@
name = "Owen Lynch";
};
omasanori = {
email = "167209+omasanori@users.noreply.github.com";
github = "omasanori";
githubId = 167209;
name = "Masanori Ogino";
@ -11453,7 +11423,6 @@
githubId = 51489;
};
polykernel = {
email = "81340136+polykernel@users.noreply.github.com";
github = "polykernel";
githubId = 81340136;
name = "polykernel";
@ -11901,7 +11870,6 @@
};
rbreslow = {
name = "Rocky Breslow";
email = "1774125+rbreslow@users.noreply.github.com";
github = "rbreslow";
githubId = 1774125;
keys = [{
@ -11994,7 +11962,6 @@
name = "Ricky Elrod";
};
rembo10 = {
email = "rembo10@users.noreply.github.com";
github = "rembo10";
githubId = 801525;
name = "rembo10";
@ -12006,7 +11973,6 @@
name = "Renato Garcia";
};
rencire = {
email = "546296+rencire@users.noreply.github.com";
github = "rencire";
githubId = 546296;
name = "Eric Ren";
@ -12343,7 +12309,6 @@
};
rople380 = {
name = "rople380";
email = "55679162+rople380@users.noreply.github.com";
github = "rople380";
githubId = 55679162;
keys = [{
@ -12480,7 +12445,6 @@
name = "Ryan Artecona";
};
ryanorendorff = {
email = "12442942+ryanorendorff@users.noreply.github.com";
github = "ryanorendorff";
githubId = 12442942;
name = "Ryan Orendorff";
@ -12692,7 +12656,6 @@
};
sbond75 = {
name = "sbond75";
email = "43617712+sbond75@users.noreply.github.com";
github = "sbond75";
githubId = 43617712;
};
@ -12716,7 +12679,6 @@
};
sioodmy = {
name = "Antoni Sokołowski";
email = "81568712+sioodmy@users.noreply.github.com";
github = "sioodmy";
githubId = 81568712;
};
@ -12745,7 +12707,6 @@
name = "schneefux";
};
schnusch = {
email = "schnusch@users.noreply.github.com";
github = "schnusch";
githubId = 5104601;
name = "schnusch";
@ -12767,7 +12728,6 @@
};
scoder12 = {
name = "Spencer Pogorzelski";
email = "34356756+Scoder12@users.noreply.github.com";
github = "Scoder12";
githubId = 34356756;
};
@ -12952,7 +12912,6 @@
name = "Sebastian Graf";
};
shadaj = {
email = "shadaj@users.noreply.github.com";
github = "shadaj";
githubId = 543055;
name = "Shadaj Laddad";
@ -12978,7 +12937,6 @@
};
ShamrockLee = {
name = "Shamrock Lee";
email = "44064051+ShamrockLee@users.noreply.github.com";
github = "ShamrockLee";
githubId = 44064051;
};
@ -13170,7 +13128,6 @@
name = "Simon Vandel Sillesen";
};
sir4ur0n = {
email = "sir4ur0n@users.noreply.github.com";
github = "sir4ur0n";
githubId = 1204125;
name = "sir4ur0n";
@ -13234,7 +13191,6 @@
name = "Sven Keidel";
};
skykanin = {
email = "skykanin@users.noreply.github.com";
github = "skykanin";
githubId = 3789764;
name = "skykanin";
@ -13314,7 +13270,6 @@
githubId = 85608760;
};
snicket2100 = {
email = "57048005+snicket2100@users.noreply.github.com";
github = "snicket2100";
githubId = 57048005;
name = "snicket2100";
@ -13443,7 +13398,6 @@
name = "Sergei Khoma";
};
srgom = {
email = "srgom@users.noreply.github.com";
github = "SRGOM";
githubId = 8103619;
name = "SRGOM";
@ -13540,7 +13494,6 @@
};
stephenwithph = {
name = "StephenWithPH";
email = "StephenWithPH@users.noreply.github.com";
github = "StephenWithPH";
githubId = 2990492;
};
@ -13982,7 +13935,6 @@
name = "techknowlogick";
};
Technical27 = {
email = "38222826+Technical27@users.noreply.github.com";
github = "Technical27";
githubId = 38222826;
name = "Aamaruvi Yogamani";
@ -15275,7 +15227,6 @@
name = "Willi Butz";
};
willcohen = {
email = "willcohen@users.noreply.github.com";
github = "willcohen";
githubId = 5185341;
name = "Will Cohen";
@ -15305,7 +15256,6 @@
name = "Alexander Krimm";
};
wishfort36 = {
email = "42300264+wishfort36@users.noreply.github.com";
github = "wishfort36";
githubId = 42300264;
name = "wishfort36";
@ -15428,7 +15378,6 @@
githubId = 52174714;
};
wyndon = {
email = "72203260+wyndon@users.noreply.github.com";
matrix = "@wyndon:envs.net";
github = "wyndon";
githubId = 72203260;
@ -15466,7 +15415,6 @@
};
xdhampus = {
name = "Hampus";
email = "16954508+xdHampus@users.noreply.github.com";
github = "xdHampus";
githubId = 16954508;
};
@ -15527,7 +15475,6 @@
name = "Guillermo NWDD";
};
xrelkd = {
email = "46590321+xrelkd@users.noreply.github.com";
github = "xrelkd";
githubId = 46590321;
name = "xrelkd";
@ -15545,7 +15492,6 @@
name = "Marti Serra";
};
xworld21 = {
email = "1962985+xworld21@users.noreply.github.com";
github = "xworld21";
githubId = 1962985;
name = "Vincenzo Mantova";
@ -15575,7 +15521,6 @@
name = "Yana Timoshenko";
};
yarny = {
email = "41838844+Yarny0@users.noreply.github.com";
github = "Yarny0";
githubId = 41838844;
name = "Yarny";
@ -15857,7 +15802,6 @@
name = "Alexandre Macabies";
};
zowoq = {
email = "59103226+zowoq@users.noreply.github.com";
github = "zowoq";
githubId = 59103226;
name = "zowoq";
@ -15984,7 +15928,6 @@
};
ymatsiuk = {
name = "Yurii Matsiuk";
email = "ymatsiuk@users.noreply.github.com";
github = "ymatsiuk";
githubId = 24990891;
keys = [{
@ -15993,13 +15936,11 @@
};
ymeister = {
name = "Yuri Meister";
email = "47071325+ymeister@users.noreply.github.com";
github = "ymeister";
githubId = 47071325;
};
cpcloud = {
name = "Phillip Cloud";
email = "417981+cpcloud@users.noreply.github.com";
github = "cpcloud";
githubId = 417981;
};
@ -16017,7 +15958,6 @@
};
tfmoraes = {
name = "Thiago Franco de Moraes";
email = "351108+tfmoraes@users.noreply.github.com";
github = "tfmoraes";
githubId = 351108;
};
@ -16029,7 +15969,6 @@
};
deinferno = {
name = "deinferno";
email = "14363193+deinferno@users.noreply.github.com";
github = "deinferno";
githubId = 14363193;
};
@ -16105,14 +16044,12 @@
githubId = 14004487;
};
bb2020 = {
email = "bb2020@users.noreply.github.com";
github = "bb2020";
githubId = 19290397;
name = "Tunc Uzlu";
};
pulsation = {
name = "Philippe Sam-Long";
email = "1838397+pulsation@users.noreply.github.com";
github = "pulsation";
githubId = 1838397;
};
@ -16167,7 +16104,6 @@
};
zeri = {
name = "zeri";
email = "68825133+zeri42@users.noreply.github.com";
matrix = "@zeri:matrix.org";
github = "zeri42";
githubId = 68825133;

4
nixos/modules/config/no-x-libs.nix
View file

@ -59,8 +59,8 @@ with lib;
pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; };
qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };
qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; });
qt5 = super.qt5.overrideScope' (self: super: {
qtbase = super.qtbase.override { withGtk3 = false; };
qt5 = super.qt5.overrideScope' (self': super': {
qtbase = super'.qtbase.override { withGtk3 = false; };
});
stoken = super.stoken.override { withGTK3 = false; };
# translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11

72
pkgs/applications/audio/aaxtomp3/default.nix
View file

@ -1,31 +1,22 @@
{ coreutils
{ bash
, bc
, coreutils
, fetchFromGitHub
, ffmpeg
, findutils
, gawk
, gnugrep
, gnused
, jq
, lame
, lib
, makeWrapper
, mediainfo
, mp4v2
, stdenv
, ncurses
, resholve
}:
let
runtimeInputs = [
coreutils
ffmpeg
findutils
gnugrep
gnused
jq
lame
mediainfo
mp4v2
];
in
stdenv.mkDerivation rec {
resholve.mkDerivation rec {
pname = "aaxtomp3";
version = "1.3";
@ -36,17 +27,52 @@ stdenv.mkDerivation rec {
hash = "sha256-7a9ZVvobWH/gPxa3cFiPL+vlu8h1Dxtcq0trm3HzlQg=";
};
dontBuild = false;
# use whitespace to show osh arithmetic is not file redirection
# see: https://github.com/oilshell/oil/issues/1446
patches = [./osh.patch];
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
substituteInPlace AAXtoMP3 \
--replace 'AAXtoMP3' 'aaxtomp3'
substituteInPlace interactiveAAXtoMP3 \
--replace 'AAXtoMP3' 'aaxtomp3' \
--replace 'call="./aaxtomp3"' 'call="$AAXTOMP3"'
'';
installPhase = ''
install -Dm755 AAXtoMP3 $out/bin/aaxtomp3
wrapProgram $out/bin/aaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs}
install -Dm755 interactiveAAXtoMP3 $out/bin/interactiveaaxtomp3
wrapProgram $out/bin/interactiveaaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs}
install -Dm 755 AAXtoMP3 $out/bin/aaxtomp3
install -Dm 755 interactiveAAXtoMP3 $out/bin/interactiveaaxtomp3
'';
solutions.default = {
scripts = [
"bin/aaxtomp3"
"bin/interactiveaaxtomp3"
];
interpreter = "${bash}/bin/bash";
inputs = [
bc
coreutils
ffmpeg
findutils
gawk
gnugrep
gnused
jq
lame
mediainfo
mp4v2
ncurses
];
keep."$call" = true;
fix = {
"$AAXTOMP3" = [ "${placeholder "out"}/bin/aaxtomp3" ];
"$FIND" = [ "find" ];
"$GREP" = [ "grep" ];
"$SED" = [ "sed" ];
};
};
meta = with lib; {
description = "Convert Audible's .aax filetype to MP3, FLAC, M4A, or OPUS";
homepage = "https://krumpetpirate.github.io/AAXtoMP3";

15
pkgs/applications/audio/aaxtomp3/osh.patch Normal file
View file

@ -0,0 +1,15 @@
diff --git a/AAXtoMP3 b/AAXtoMP3
index 90566ad..71e94da 100755
--- a/AAXtoMP3
+++ b/AAXtoMP3
@@ -200,8 +200,8 @@ progressbar() {
#draw progressbar with one # for every 5% and blank spaces for the missing part.
progressbar=""
- for (( n=0; n<(percentage/5); n++ )) ; do progressbar="$progressbar#"; done
- for (( n=0; n<(20-(percentage/5)); n++ )) ; do progressbar="$progressbar "; done
+ for (( n=0; n< (percentage/5); n++ )) ; do progressbar="$progressbar#"; done
+ for (( n=0; n< (20-(percentage/5)); n++ )) ; do progressbar="$progressbar "; done
#print progressbar
echo -ne "Chapter splitting: |$progressbar| $print_percentage% ($part/$total chapters)\r"

4
pkgs/applications/audio/praat/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "praat";
version = "6.3.03";
version = "6.3.04";
src = fetchFromGitHub {
owner = "praat";
repo = "praat";
rev = "v${version}";
sha256 = "sha256-Fb16sx+LVoXuiFASeiaYUMoNgZJXqKTBrUHFd2YXEJ0=";
sha256 = "sha256-C5wDiqoS6dF8VGTqiQbr1obtjpsiIa2bmtF6qGYc8XQ=";
};
configurePhase = ''

10
pkgs/applications/misc/1password/default.nix
View file

@ -12,12 +12,12 @@ let
if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli";
version = "2.13.0";
version = "2.13.1";
sources = rec {
aarch64-linux = fetch "linux_arm64" "sha256-B9XVejPge8wxWAoxj974rLz0dfaZEAaGn2mUcPeqFIo=" "zip";
i686-linux = fetch "linux_386" "sha256-kLW9PmhCNDosKn1nmtzo8tBjBOaUyzqlLad332UACio=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-jbvkTlIuAm5tHzGm42kO+jykUffKwfOVSOh33i0URtM=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-kA+NjXrNcX0dKh+gNJT82vbQGKFOU8zPvGPqBtuBqOA=" "pkg";
aarch64-linux = fetch "linux_arm64" "sha256-Zuy9ZQY5kzRgcGfzkndGr30koR8Z8cvEfCs+n+/P2zM=" "zip";
i686-linux = fetch "linux_386" "sha256-MlUSL8+O7sDG1cSfJvw+nEC7d1N6Bb2By1fw2ooZQfc=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-EwUqjn3QKwTYqiYvm6vAsHnEcWHaRGJ2WzJ9OHP1XWM=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-Mag2UG5IhikxV0aA/OhA9Aauuytx9shUKlrGhXMjqTM=" "pkg";
x86_64-darwin = aarch64-darwin;
};
platforms = builtins.attrNames sources;

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

@ -28,7 +28,7 @@
, isocodes
, gtksourceview
, gtksourceviewmm
, postgresql
, postgresql_11
, gobject-introspection
, yelp-tools
, wrapGAppsHook
@ -93,7 +93,7 @@ in stdenv.mkDerivation rec {
python3.pkgs.pygobject3
gtksourceview
gtksourceviewmm
postgresql # for pg_config
postgresql_11 # for pg_config
];
enableParallelBuilding = true;

786
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View file

File diff suppressed because it is too large Load diff

4
pkgs/applications/terminal-emulators/tym/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tym";
version = "3.3.0";
version = "3.4.0";
src = fetchFromGitHub {
owner = "endaaman";
repo = "${pname}";
rev = "${version}";
sha256 = "sha256-ufIYJgbHmSJJbnx4hyDx0DmIjaGCxKXtiekcXcyka14=";
sha256 = "sha256-BYWfrvodmrOw2so64Y+bzTWwXosR1NjgrimULTuQu94=";
};
nativeBuildInputs = [

6
pkgs/applications/version-management/gh/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "2.22.0";
version = "2.22.1";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-kebBochGagpg26Q2bkpUTPMYYwwBpBVx2+ZtsErJWYk=";
hash = "sha256-TREy2pzVAHClwbryfEgX2WqtQ8+RmJtCNrESeaHDHMs=";
};
vendorSha256 = "sha256-OjTl43UQGGHqCrw0kMBShuS8aonjWczfzQGmGJLhdrU=";
vendorHash = "sha256-OjTl43UQGGHqCrw0kMBShuS8aonjWczfzQGmGJLhdrU=";
nativeBuildInputs = [ installShellFiles ];

16
pkgs/applications/version-management/gitea/default.nix
View file

@ -1,6 +1,6 @@
{ lib
, stdenv
, buildGoPackage
, buildGoModule
, fetchurl
, makeWrapper
, git
@ -13,7 +13,7 @@
, nixosTests
}:
buildGoPackage rec {
buildGoModule rec {
pname = "gitea";
version = "1.18.3";
@ -23,6 +23,8 @@ buildGoPackage rec {
hash = "sha256-jqjpbDgcmwZoc/ovgburFeeta9mAJOmz7yrvmUKAwRU=";
};
vendorHash = null;
patches = [
./static-root-path.patch
];
@ -31,6 +33,8 @@ buildGoPackage rec {
substituteInPlace modules/setting/setting.go --subst-var data
'';
subPackages = [ "." ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = lib.optional pamSupport pam;
@ -48,20 +52,20 @@ buildGoPackage rec {
)
'';
ldflags = [ "-s" "-w" ];
outputs = [ "out" "data" ];
postInstall = ''
mkdir $data
cp -R ./go/src/${goPackagePath}/{public,templates,options} $data
cp -R ./{public,templates,options} $data
mkdir -p $out
cp -R ./go/src/${goPackagePath}/options/locale $out/locale
cp -R ./options/locale $out/locale
wrapProgram $out/bin/gitea \
--prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]}
'';
goPackagePath = "code.gitea.io/gitea";
passthru.tests = nixosTests.gitea;
meta = with lib; {

16
pkgs/desktops/gnome/extensions/collisions.json
View file

@ -118,6 +118,10 @@
"volume-scroller": [
"volume_scroller@trflynn89.pm.me",
"volume_scroller@noskoski"
],
"floating-panel": [
"floating-panel@aylur",
"floating-panel-usedbymyself@wpism"
]
},
"41": {
@ -164,6 +168,10 @@
"volume-scroller": [
"volume_scroller@trflynn89.pm.me",
"volume_scroller@noskoski"
],
"floating-panel": [
"floating-panel@aylur",
"floating-panel-usedbymyself@wpism"
]
},
"42": {
@ -198,6 +206,10 @@
"auto-activities": [
"auto-activities@acedron.github.io",
"auto-activities@CleoMenezesJr.github.io"
],
"floating-panel": [
"floating-panel@aylur",
"floating-panel-usedbymyself@wpism"
]
},
"43": {
@ -212,6 +224,10 @@
"noannoyance": [
"noannoyance@sindex.com",
"noannoyance@daase.net"
],
"floating-panel": [
"floating-panel@aylur",
"floating-panel-usedbymyself@wpism"
]
}
}

4
pkgs/desktops/gnome/extensions/extensionRenames.nix
View file

@ -12,6 +12,10 @@
"workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
"horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
# no source repository can be found for this extension
"floating-panel@aylur" = "floating-panel";
"floating-panel-usedbymyself@wpism" = null;
# forks of each other, azan@faissal.bensefia.id is more recent
"azan@faissal.bensefia.id" = "azan-islamic-prayer-times";
"azan@hatem.masmoudi.org" = null;

107
pkgs/desktops/gnome/extensions/extensions.json
View file

File diff suppressed because one or more lines are too long

27
pkgs/development/compilers/kind2/default.nix
View file

@ -1,36 +1,33 @@
{ lib
, rustPlatform
, fetchCrate
, pkg-config
, openssl
, stdenv
, Security
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "kind2";
version = "0.2.79";
version = "0.3.7";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-QRPk7BpGVvhGHcDxCWJtJp5d3QOq72ESt5VbaSq5jBU=";
sha256 = "sha256-ZG0BbGcjQBqeNTqfy7WweVHK7sUuKeQSsFi9KIsyIE4=";
};
cargoSha256 = "sha256-i7RAJmhUQzjMe9w7z7hPrpiap64L12Shu4DL+e5A6oc=";
cargoSha256 = "sha256-j64L3HNk2r+MH9eDHWT/ARJ9DT4CchcuVxtIYYVsDxo=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
# these tests are flaky
checkFlags = [
"--skip=test_checker"
"--skip=test_run_hvm"
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.Security
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
darwin.apple_sdk_11_0.frameworks.CoreFoundation
];
# requires nightly features
RUSTC_BOOTSTRAP = true;
meta = with lib; {
description = "A functional programming language and proof assistant";
homepage = "https://github.com/kindelia/kind2";
homepage = "https://github.com/kindelia/kind";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};

4
pkgs/development/interpreters/luau/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "luau";
version = "0.558";
version = "0.560";
src = fetchFromGitHub {
owner = "Roblox";
repo = "luau";
rev = version;
hash = "sha256-103TLfVmXBN3Vd31nbBu7RlxrG4DX6xn/vpveIdnm5E=";
hash = "sha256-tGZ9gy/RqkVP/pXyMd2XgdVc2oekZfpsdDgAB3+rv9s=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/development/libraries/libindicator/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, file
, pkg-config
, pkg-config, glib
, gtkVersion ? "3", gtk2, gtk3 }:
stdenv.mkDerivation rec {
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f";
};
nativeBuildInputs = [ pkg-config ];
strictDeps = true;
nativeBuildInputs = [ pkg-config glib ];
buildInputs = [ (if gtkVersion == "2" then gtk2 else gtk3) ];

6
pkgs/development/libraries/volume-key/default.nix
View file

@ -16,9 +16,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" "dev" "py" ];
nativeBuildInputs = [ autoconf automake libtool pkg-config gettext swig autoreconfHook ];
strictDeps = true;
buildInputs = [ glib cryptsetup nss util-linux gpgme ncurses ];
nativeBuildInputs = [ autoreconfHook gettext gpgme pkg-config swig ];
buildInputs = [ glib cryptsetup nss util-linux ncurses ];
configureFlags = [
"--with-gpgme-prefix=${gpgme.dev}"

5
pkgs/development/ocaml-modules/topkg/default.nix
View file

@ -9,7 +9,10 @@ build system is required, the attribute `run` can be used.
let
param =
if lib.versionAtLeast ocaml.version "4.03" then {
if lib.versionAtLeast ocaml.version "4.05" then {
version = "1.0.5";
sha256 = "sha256-RSCCYm5lGsSxYzwrSuTK16vrH7ahMEbmmfle7Fi10cc=";
} else if lib.versionAtLeast ocaml.version "4.03" then {
version = "1.0.3";
sha256 = "0b77gsz9bqby8v77kfi4lans47x9p2lmzanzwins5r29maphb8y6";
} else {

29
pkgs/development/python-modules/aenum/default.nix
View file

@ -1,9 +1,9 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
, pyparsing
, python
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
@ -11,28 +11,33 @@ buildPythonPackage rec {
version = "3.1.11";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-rtLCc1R65yoNXuhpcZwCpkPaFr9QfICVj6rcfgOOP3M=";
hash = "sha256-rtLCc1R65yoNXuhpcZwCpkPaFr9QfICVj6rcfgOOP3M=";
};
nativeCheckInputs = [
pyparsing
pytestCheckHook
];
# py2 likes to reorder tests
doCheck = isPy3k;
checkPhase = ''
runHook preCheck
${python.interpreter} aenum/test.py
runHook postCheck
'';
pythonImportsCheck = [
"aenum"
];
disabledTests = [
# https://github.com/ethanfurman/aenum/issues/27
"test_class_nested_enum_and_pickle_protocol_four"
"test_pickle_enum_function_with_qualname"
"test_stdlib_inheritence"
"test_subclasses_with_getnewargs_ex"
"test_arduino_headers"
"test_c_header_scanner"
"test_extend_flag_backwards_stdlib"
];
meta = with lib; {
description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants";
homepage = "https://github.com/ethanfurman/aenum";

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aioshelly";
version = "5.3.0";
version = "5.3.1";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-tsjHs1v5Yth5XToznCdAWoe70Lhxqh6Mq/MHKSYYg14=";
hash = "sha256-a8zU3xHnYRmoiNiXlCUgrqgVINbhUWkPKGGsHkgHo4w=";
};
propagatedBuildInputs = [

5
pkgs/development/python-modules/connexion/default.nix
View file

@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "connexion";
version = "2.14.1";
version = "2.14.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "spec-first";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-8nWNFYW4DWAzIAsxgWPXOodlc2tuuGOktNo4N1G1oOc=";
hash = "sha256-1v1xCHY3ZnZG/Vu9wN/it7rLKC/StoDefoMNs+hMjIs=";
};
propagatedBuildInputs = [
@ -70,6 +70,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Swagger/OpenAPI First framework on top of Flask";
homepage = "https://github.com/spec-first/connexion";
changelog = "https://github.com/spec-first/connexion/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ elohmeier ];
};

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "dvc-data";
version = "0.35.1";
version = "0.36.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-MyYRkClbJDcMgwAHcESY0Bo7LgAFpDtkOVmVRUJ7jME=";
hash = "sha256-HKNltc5pWc0mU+yCj/PV9E6GYQ+3fbcacRRXtquGM4w=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

5
pkgs/development/python-modules/goodwe/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "goodwe";
version = "0.2.20";
version = "0.2.21";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "marcelblijleven";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-RDd0KR7NjBTlgeQ/E4mnLnB2n4NCPoAt2a62NGdzCZE=";
sha256 = "sha256-ojVwvWj7DLCUzVKCdotRSUQHP1utS60TVFctDzUaN2w=";
};
postPatch = ''
@ -42,6 +42,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library for connecting to GoodWe inverter";
homepage = "https://github.com/marcelblijleven/goodwe";
changelog = "https://github.com/marcelblijleven/goodwe/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

4
pkgs/development/python-modules/google-cloud-dataproc/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-dataproc";
version = "5.2.0";
version = "5.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-44HADoHz0ITGolvZtB1wlFDEMWBwyOZ2HazJMl/SXn0=";
hash = "sha256-iuhXfFp6cfDNDtk3JS+U8YbQAOII0khY2bmvP75QAP4=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-trace/default.nix
View file

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-trace";
version = "1.9.0";
version = "1.10.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-zqd9uiSpp6z5LyGG42axl6pGcYKmSrbku+UcLGtoUbI=";
hash = "sha256-aU6XD+uj/X9Gs8z2vP0rhTlaqkg7u4H9CV/CJl2b7ak=";
};
propagatedBuildInputs = [

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

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "ledgerblue";
version = "0.1.43";
version = "0.1.44";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-t0mdw8cBGUZ33BWOSeEHyFAGga/Tf1F/gATFSfCpAJQ=";
hash = "sha256-pOLpeej10G7Br8juTuQOSuCbhMjAP4aY0/JwnmJRblk=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/mypy-boto3-s3/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "mypy-boto3-s3";
version = "1.26.0.post1";
version = "1.26.58";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-bXB5+Mc53Jk8vtrQc2KZxBOyl4FLc3laOFWnkWnsyTg=";
hash = "sha256-AqqVFIdxR9qZbqYunT0ybWsz9GycILJvHkX9ElugNRg=";
};
propagatedBuildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "oci";
version = "2.90.2";
version = "2.90.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "oracle";
repo = "oci-python-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-8HqvJx4H4cLkAXuaEUmlOjiuYD7WmVT0Xvsktc/IfCE=";
hash = "sha256-mh4wLRNZzLU7sWvaVQWF6fexNrXIo8FMJ1u2RtMpE/E=";
};
propagatedBuildInputs = [

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pysmart";
version = "1.2.2";
version = "1.2.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "truenas";
repo = "py-SMART";
rev = "refs/tags/v${version}";
hash = "sha256-qZJwUxU9LSKXpftBuKFnxI4gygHIuJEwGJqFaBlCudc=";
hash = "sha256-5VoZEgHWmHUDkm2KhBP0gfmhOJUYJUqDLWBp/kU1404=";
};
postPatch = ''

4
pkgs/development/python-modules/pytorch-pfn-extras/default.nix
View file

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "pytorch-pfn-extras";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "pfnet";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-B8B5zULIuqiojP7bmj3sABC9dqYLqOX5CfEN6slOFZ8=";
sha256 = "sha256-x1aE/55+2QwYG3Hhy35j26jLAj9O5orrU/c4KlTTOcc=";
};
propagatedBuildInputs = [ numpy packaging torch typing-extensions ];

11
pkgs/development/python-modules/pyvisa-py/default.nix
View file

@ -7,17 +7,21 @@
, pyvisa
, typing-extensions
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyvisa-py";
version = "0.6.0";
version = "0.6.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pyvisa";
repo = "pyvisa-py";
rev = "refs/tags/${version}";
hash = "sha256-1EAkE2uYjo8sUbSrF6E1AGZkKPTxkSre3ov2RU8YhfM=";
hash = "sha256-cXxiT/PWDf5WV+s8GbEA2u+1dPyfUKu19IQ2+Q4GTqM=";
};
nativeBuildInputs = [
@ -40,8 +44,9 @@ buildPythonPackage rec {
'';
meta = with lib; {
description = "PyVISA backend that implements a large part of the Virtual Instrument Software Architecture in pure Python";
description = "Module that implements the Virtual Instrument Software Architecture";
homepage = "https://github.com/pyvisa/pyvisa-py";
changelog = "https://github.com/pyvisa/pyvisa-py/blob/${version}/CHANGES";
license = licenses.mit;
maintainers = with maintainers; [ mvnetbiz ];
};

9
pkgs/development/python-modules/wandb/default.nix
View file

@ -1,5 +1,6 @@
{ lib
, stdenv
, appdirs
, azure-core
, bokeh
, buildPythonPackage
@ -39,7 +40,7 @@
buildPythonPackage rec {
pname = "wandb";
version = "0.13.7";
version = "0.13.9";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -48,7 +49,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-o9mIGSILztnHY3Eyb0MlznUEdMbCfA1BT6ux0UlesBc=";
hash = "sha256-BpFLN4WLT+fm5+50NDOU4bM73WjeGEhD6P8XKE9n9cI=";
};
patches = [
@ -65,6 +66,7 @@ buildPythonPackage rec {
# setuptools is necessary since pkg_resources is required at runtime.
propagatedBuildInputs = [
appdirs
click
docker_pycreds
gitpython
@ -99,8 +101,10 @@ buildPythonPackage rec {
tqdm
];
# Set BOKEH_CDN_VERSION to stop bokeh throwing an exception in tests
preCheck = ''
export HOME=$(mktemp -d)
export BOKEH_CDN_VERSION=3.0.3
'';
pythonRelaxDeps = [ "protobuf" ];
@ -117,7 +121,6 @@ buildPythonPackage rec {
"tests/unit_tests_old/test_logging.py"
"tests/unit_tests_old/test_metric_internal.py"
"tests/unit_tests_old/test_public_api.py"
"tests/unit_tests_old/test_report_api.py"
"tests/unit_tests_old/test_runtime.py"
"tests/unit_tests_old/test_sender.py"
"tests/unit_tests_old/test_tb_watcher.py"

4
pkgs/development/tools/buildkit/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "buildkit";
version = "0.11.0";
version = "0.11.2";
src = fetchFromGitHub {
owner = "moby";
repo = "buildkit";
rev = "v${version}";
hash = "sha256-zRkfH/CHLoulB/IDq2VPc8a6N2wMzX0Ws9oE9339VOQ=";
hash = "sha256-P1hu60vjJJASWxgc9LOwdy7psqgIHi8Z/D5c++TProY=";
};
vendorHash = null;

39
pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch Normal file
View file

@ -0,0 +1,39 @@
From 93f4f92b017935a35988e7210036db8020753f9e Mon Sep 17 00:00:00 2001
From: Jake Hillion <jake@hillion.co.uk>
Date: Sun, 21 Feb 2021 21:26:39 +0000
Subject: [PATCH] removed dependency for systemcertpool
---
drone/internal/util.go | 7 +++++--
go.mod | 1 -
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drone/internal/util.go b/drone/internal/util.go
index 46c8ec6f..25d4def7 100644
--- a/drone/internal/util.go
+++ b/drone/internal/util.go
@@ -2,11 +2,11 @@ package internal
import (
"crypto/tls"
+ "crypto/x509"
"fmt"
"net/http"
"strings"
- "github.com/jackspirou/syscerts"
"github.com/urfave/cli"
"golang.org/x/net/proxy"
"golang.org/x/oauth2"
@@ -35,7 +35,10 @@ func NewClient(c *cli.Context) (drone.Client, error) {
}
// attempt to find system CA certs
- certs := syscerts.SystemRootsPool()
+ certs, err := x509.SystemCertPool()
+ if err != nil {
+ return nil, err
+ }
tlsConfig := &tls.Config{
RootCAs: certs,
InsecureSkipVerify: skip,

23
pkgs/development/tools/continuous-integration/drone-cli/0001-use-different-upstream-for-gomod.patch
View file

@ -1,23 +0,0 @@
diff --git a/go.mod b/go.mod
index 99f9b37..ebbdb54 100644
--- a/go.mod
+++ b/go.mod
@@ -28,3 +28,5 @@ require (
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
)
+
+replace github.com/jackspirou/syscerts => github.com/akhenakh/syscerts v0.0.0-20201230132944-1f7ee1de1ba3
diff --git a/go.sum b/go.sum
index 8c379ed..283ba39 100644
--- a/go.sum
+++ b/go.sum
@@ -64,6 +64,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
+github.com/akhenakh/syscerts v0.0.0-20201230132944-1f7ee1de1ba3 h1:2d14fzBv1dj4PimhBxXDlaltfNU6rGmA4NyYa3aB5xQ=
+github.com/akhenakh/syscerts v0.0.0-20201230132944-1f7ee1de1ba3/go.mod h1:ijVDlqqT/Ok/B2v7GaiSj4gfCl7uipB8/8jwgJvrTSk=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=

31
pkgs/development/tools/continuous-integration/drone-cli/default.nix
View file

@ -1,27 +1,32 @@
{ lib, fetchFromGitHub, buildGoModule }:
{ lib
, fetchFromGitHub
, buildGoModule
}:
buildGoModule rec {
version = "1.6.0";
version = "1.7.0";
pname = "drone-cli";
revision = "v${version}";
vendorSha256 = "sha256-0vHOPuSn7eczlUeCTz+SOMuDdRQTzw/TnH1rt/ltWOQ=";
doCheck = false;
patches = [ ./0001-use-different-upstream-for-gomod.patch ];
ldflags = [
"-X main.version=${version}"
];
src = fetchFromGitHub {
owner = "harness";
repo = "drone-cli";
rev = revision;
sha256 = "sha256-TVOj1C5X3fTRZF29hId13LjkkwaAFntlozpmYVUfVJI=";
hash = "sha256-PZ0M79duSctPepD5O+NdJZKhkyR21g/4P6loJtoWZiU=";
};
vendorSha256 = "sha256-JC7OR4ySDsVWmrBBTjpwZrkJlM8RJehbsvXW/VtA4VA=";
# patch taken from https://patch-diff.githubusercontent.com/raw/harness/drone-cli/pull/179.patch
# but with go.mod changes removed due to conflict
patches = [ ./0001-use-builtin-go-syscerts.patch ];
ldflags = [
"-X main.version=${version}"
];
doCheck = false;
meta = with lib; {
mainProgram = "drone";
maintainers = with maintainers; [ techknowlogick ];

6
pkgs/development/tools/language-servers/millet/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "millet";
version = "0.7.4";
version = "0.7.5";
src = fetchFromGitHub {
owner = "azdavis";
repo = pname;
rev = "v${version}";
hash = "sha256-YTONlTE9cTl0O7EHRVhrPtuGgIUdX8mvdWu352uHbCE=";
hash = "sha256-lRWL8J83U8W/QdxNew9To4kbqhmqt0KUQMnaODTfT1U=";
};
cargoHash = "sha256-U2bbZZCeY7/Jp7AuAKYcZzDIpIxGbNJrmr2Sr2CMr2A=";
cargoHash = "sha256-IGEmcFmkEm+seGf9eLokU7pjRNgwOaJr+mf152yogw8=";
postPatch = ''
rm .cargo/config.toml

13
pkgs/development/tools/ocaml/findlib/default.nix
View file

@ -44,6 +44,15 @@ stdenv.mkDerivation rec {
mkdir -p $OCAMLFIND_DESTDIR
fi
}
detectOcamlConflicts () {
local conflict
conflict="$(ocamlfind list |& grep "has multiple definitions" || true)"
if [[ -n "$conflict" ]]; then
echo "Conflicting ocaml packages detected";
echo "$conflict"
exit 1
fi
}
# run for every buildInput
addEnvHooks "$targetOffset" addOCamlPath
@ -51,6 +60,10 @@ stdenv.mkDerivation rec {
preInstallHooks+=(createOcamlDestDir)
# run even in nix-shell, and even without buildInputs
addEnvHooks "$hostOffset" exportOcamlDestDir
# runs after all calls to addOCamlPath
if [[ -z "''${dontDetectOcamlConflicts-}" ]]; then
postHooks+=("detectOcamlConflicts")
fi
'';
meta = {

4
pkgs/development/tools/oh-my-posh/default.nix
View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "13.6.0";
version = "13.8.0";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-N24kt564/gdJ4mUIyul3zfUFTtF9y49IERfE2jVIL8Q=";
hash = "sha256-mplWF/lmgRfYd1Gg2loZI5NIfmTHR8quG1/KcZj5W54=";
};
vendorHash = "sha256-WiH4qu8DODEhAkxUm6VDcBwFyQO7kNjaiaWPDHCHj9E=";

16
pkgs/development/tools/rust/cargo-about/default.nix
View file

@ -9,24 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-about";
version = "0.5.2";
version = "0.5.3";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = "cargo-about";
rev = version;
sha256 = "sha256-8476jJK1oiXVX9G09NSL+xvXZdZ+h7grCHC6R0XXewo=";
sha256 = "sha256-THyVFvotR7ttGB3YyK0XPG5m4mbgHJqu1gnZFmyFDOA=";
};
cargoPatches = [
# update mimalloc to fix build with older apple sdks
./update-mimalloc.patch
# enable pkg-config feature of zstd
./zstd-pkg-config.patch
];
cargoSha256 = "sha256-EFpkBWQSWYyMrUa9Dh+n9kDNmXL/2yuEmFN3DcPeE7U=";
cargoSha256 = "sha256-o9NMhkKtdlTqmOO5mVWxcuEu4U7GkTO0B3XoMrBwiwI=";
nativeBuildInputs = [ pkg-config ];
@ -34,6 +26,8 @@ rustPlatform.buildRustPackage rec {
darwin.apple_sdk.frameworks.Security
];
ZSTD_SYS_USE_PKG_CONFIG = true;
meta = with lib; {
description = "Cargo plugin to generate list of all licenses for a crate";
homepage = "https://github.com/EmbarkStudios/cargo-about";

26
pkgs/development/tools/rust/cargo-about/update-mimalloc.patch
View file

@ -1,26 +0,0 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -829,9 +829,9 @@ checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f"
[[package]]
name = "libmimalloc-sys"
-version = "0.1.24"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7705fc40f6ed493f73584abbb324e74f96b358ff60dfe5659a0f8fc12c590a69"
+checksum = "8fc093ab289b0bfda3aa1bdfab9c9542be29c7ef385cfcbe77f8c9813588eb48"
dependencies = [
"cc",
]
@@ -884,9 +884,9 @@ dependencies = [
[[package]]
name = "mimalloc"
-version = "0.1.28"
+version = "0.1.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0dfa131390c2f6bdb3242f65ff271fcdaca5ff7b6c08f28398be7f2280e3926"
+checksum = "76ce6a4b40d3bff9eb3ce9881ca0737a85072f9f975886082640cd46a75cdb35"
dependencies = [
"libmimalloc-sys",
]

40
pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch
View file

@ -1,40 +0,0 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -207,6 +207,7 @@ dependencies = [
"toml_edit",
"twox-hash",
"url",
+ "zstd",
]
[[package]]
@@ -1093,6 +1094,12 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+[[package]]
+name = "pkg-config"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+
[[package]]
name = "ppv-lite86"
version = "0.2.16"
@@ -2045,4 +2052,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7"
dependencies = [
"cc",
"libc",
+ "pkg-config",
]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -80,6 +80,8 @@ toml_edit = "0.15"
twox-hash = "1.6"
# Url parsing
url = "2.2"
+# Use pkg-config feature of zstd
+zstd = { version = "*", features = ["pkg-config"] }
[dev-dependencies]
# Filesystems - Filesystem fixtures and assertions for testing

6
pkgs/development/tools/rust/cargo-make/default.nix
View file

@ -13,11 +13,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.36.3";
version = "0.36.4";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-9P5LoS8wdzJA8vGj9dRxKJYBXaSSzxplpvRc2aqRWlY=";
sha256 = "sha256-motvwMacwqD6MMWxehCV/Eb+8EN9XthcEr0e5DFlvOg=";
};
nativeBuildInputs = [ pkg-config ];
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
cargoSha256 = "sha256-NgjBGoJTJNF4HwhDtBDWxcLHfpM6Jk4D9cbKLvojnaI=";
cargoHash = "sha256-/hgCYgWx7hDAUTrDT9ndlk7t/bGXTtDS9Eth3OWkbKM=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.

12
pkgs/misc/documentation-highlighter/default.nix
View file

@ -7,6 +7,16 @@ runCommand "documentation-highlighter" {
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.grahamc ];
};
src = lib.sources.cleanSourceWith {
src = ./.;
filter = path: type: lib.elem path (map toString [
./highlight.pack.js
./LICENSE
./loader.js
./mono-blue.css
./README.md
]);
};
} ''
cp -r ${./.} $out
cp -r "$src" "$out"
''

4
pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix
View file

@ -1,9 +1,9 @@
{ appleDerivation, xcbuildHook, CoreSymbolication
{ appleDerivation, xcbuildHook, CoreSymbolication, apple_sdk
, xnu, bison, flex, darling, stdenv, fixDarwinDylibNames }:
appleDerivation {
nativeBuildInputs = [ xcbuildHook flex bison fixDarwinDylibNames ];
buildInputs = [ CoreSymbolication darling xnu ];
buildInputs = [ CoreSymbolication apple_sdk.frameworks.CoreSymbolication darling xnu ];
# -fcommon: workaround build failure on -fno-common toolchains:
# duplicate symbol '_kCSRegionMachHeaderName' in: libproc.o dt_module_apple.o
NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration -fcommon";

6
pkgs/os-specific/linux/jool/source.nix
View file

@ -1,11 +1,11 @@
{ fetchFromGitHub }:
rec {
version = "4.1.8";
version = "4.1.9";
src = fetchFromGitHub {
owner = "NICMx";
repo = "Jool";
rev = "v${version}";
hash = "sha256-b+1EM172NRnnTcbJOwBQfytIRuIr8zZBlKBBV/e7Ttg=";
rev = "refs/tags/v${version}";
hash = "sha256-sKrjn/XQANiXfkjNiFfvAkmONyQjVigFBKgcGkuIPs0=";
};
}

51
pkgs/servers/mirrorbits/default.nix
View file

@ -1,42 +1,41 @@
{ lib, buildGoPackage, fetchFromGitHub, fetchpatch
, pkg-config, zlib, geoip }:
{ lib
, buildGoModule
, fetchFromGitHub
, fetchpatch
, pkg-config
, zlib
, geoip
}:
buildGoPackage rec {
buildGoModule rec {
pname = "mirrorbits";
version = "0.4";
rev = "v${version}";
version = "0.5.1";
src = fetchFromGitHub {
inherit rev;
owner = "etix";
repo = "mirrorbits";
sha256 = "11f9wczajba147qk5j73pxjrvlxkgr598sjvgjn2b8nxm49g2pan";
rev = "v${version}";
hash = "sha256-Ta3+Y3P74cvx09Z4rB5ObgBZtfF4grVgyeZ57yFPlGM=";
};
vendorHash = null;
patches = [
# Add Go Modules support
(fetchpatch {
url = "https://github.com/etix/mirrorbits/commit/03a4e02214bdb7bb60240ddf25b887ccac5fb118.patch";
sha256 = "08332cfxmp2nsfdj2ymg3lxkav8h44f6cf2h6g9jkn03mkliblm5";
url = "https://github.com/etix/mirrorbits/commit/955a8b2e1aacea1cae06396a64afbb531ceb36d4.patch";
hash = "sha256-KJgj3ynnjjiXG5qsUmzBiMjGEwfvM/9Ap+ZgUdhclik=";
})
];
postPatch = ''
rm -rf testing
'';
# Fix build with go >=1.12
preBuild = ''
sed -i s/"_Ctype_struct_GeoIPRecordTag"/"C.struct_GeoIPRecordTag"/ ./go/src/github.com/etix/geoip/geoip.go
'';
goPackagePath = "github.com/etix/mirrorbits";
deleteVendor = true;
goDeps = ./deps.nix;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib geoip ];
meta = {
subPackages = [ "." ];
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "geographical download redirector for distributing files efficiently across a set of mirrors";
homepage = "https://github.com/etix/mirrorbits";
longDescription = ''
@ -47,8 +46,8 @@ buildGoPackage rec {
the distribution of large-scale Open-Source projects with a lot
of traffic.
'';
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fpletz ];
platforms = lib.platforms.unix;
license = licenses.mit;
maintainers = with maintainers; [ fpletz ];
platforms = platforms.unix;
};
}

66
pkgs/servers/mirrorbits/deps.nix generated
View file

@ -1,66 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/etix/geoip";
fetch = {
type = "git";
url = "https://github.com/etix/geoip";
rev = "db8457352061099b2a1840c712b3223900216588";
sha256 = "1768237bngcjgw0s8wba0f4nw1xahg28cq2nd6vrbmhavd1ppim9";
};
}
{
goPackagePath = "github.com/etix/goftp";
fetch = {
type = "git";
url = "https://github.com/etix/goftp";
rev = "0c13163a1028e83f0f1cce113dddd3900e935bc7";
sha256 = "15kwk57yk63j28d1lwrykc9nr7ickqgk2fpw4g0b0404b95l101k";
};
}
{
goPackagePath = "github.com/garyburd/redigo";
fetch = {
type = "git";
url = "https://github.com/garyburd/redigo";
rev = "70e1b1943d4fc9c56791abaa6f4d1e727b9ab925";
sha256 = "1nw22r0vagmayjg51rz55yi9ppkd60ya0nzmp113mcz25vhxa0d0";
};
}
{
goPackagePath = "github.com/op/go-logging";
fetch = {
type = "git";
url = "https://github.com/op/go-logging";
rev = "970db520ece77730c7e4724c61121037378659d9";
sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj";
};
}
{
goPackagePath = "github.com/youtube/vitess";
fetch = {
type = "git";
url = "https://github.com/youtube/vitess";
rev = "6cf14dbf97f28eebd37dc2bc36374852946336a8";
sha256 = "1g76q84wipyprn05brpjxf8xri87293r7nyf647crjy5d9k950lz";
};
}
{
goPackagePath = "gopkg.in/tylerb/graceful.v1";
fetch = {
type = "git";
url = "https://gopkg.in/tylerb/graceful.v1";
rev = "4654dfbb6ad53cb5e27f37d99b02e16c1872fbbb";
sha256 = "1qspbrzr3h6c89v75c99avn7iizkfnjh901wp650vyy0j3p6ydnd";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f";
sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6";
};
}
]

5
pkgs/shells/zsh/zsh-clipboard/default.nix
View file

@ -4,13 +4,12 @@ stdenv.mkDerivation rec {
pname = "zsh-clipboard";
version = "1.0";
src = ./.;
dontUnpack = true;
strictDeps = true;
dontBuild = true;
installPhase = ''
install -D -m0444 -t $out/share/zsh/plugins/clipboard ./clipboard.plugin.zsh
install -D -m0444 -T ${./clipboard.plugin.zsh} $out/share/zsh/plugins/clipboard/clipboard.plugin.zsh
'';
meta = with lib; {

14
pkgs/tools/misc/esphome/default.nix
View file

@ -1,4 +1,5 @@
{ lib
, callPackage
, python3
, fetchFromGitHub
, platformio
@ -13,16 +14,16 @@ let
};
};
in
with python.pkgs; buildPythonApplication rec {
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2022.12.4";
version = "2022.12.8";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-HU4S6U5v0r93z4T6JpclEF6Cw6vy0VoprVyI4Z2Ti7s=";
hash = "sha256-VKxCdejQGWLYeNOxa1PCwhdrLilnsYD9UBqj8Sen+OM=";
};
postPatch = ''
@ -42,7 +43,7 @@ with python.pkgs; buildPythonApplication rec {
# They have validation functions like:
# - validate_cryptography_installed
# - validate_pillow_installed
propagatedBuildInputs = [
propagatedBuildInputs = with python.pkgs; [
aioesphomeapi
click
colorama
@ -71,12 +72,11 @@ with python.pkgs; buildPythonApplication rec {
"--set ESPHOME_USE_SUBPROCESS ''"
];
nativeCheckInputs = [
nativeCheckInputs = with python.pkgs; [
hypothesis
mock
pytest-asyncio
pytest-mock
pytest-sugar
pytestCheckHook
];
@ -92,7 +92,7 @@ with python.pkgs; buildPythonApplication rec {
'';
passthru = {
dashboard = esphome-dashboard;
dashboard = python.pkgs.esphome-dashboard;
updateScript = callPackage ./update.nix {};
};

17
pkgs/tools/misc/esphome/update.nix
View file

@ -1,12 +1,23 @@
{ writeShellScript
, lib
, curl
, jq
, git
, gnugrep
, gnused
, nix-update
}:
writeShellScript "update-esphome" ''
PATH=${lib.makeBinPath [ git nix-update ]}
PATH=${lib.makeBinPath [ curl gnugrep gnused jq git nix-update ]}
nix-update esphome.dashboard
nix-update esphome
LATEST=$(curl https://api.github.com/repos/esphome/esphome/releases/latest | jq -r '.name')
echo "Latest version: $LATEST"
DASHBOARD_VERSION=$(curl https://raw.githubusercontent.com/esphome/esphome/$LATEST/requirements.txt | \
grep "esphome-dashboard==" | sed "s/.*=//")
echo "Dashboard version: $DASHBOARD_VERSION"
nix-update esphome.dashboard --version $DASHBOARD_VERSION
nix-update esphome --version $LATEST
''

9
pkgs/tools/misc/rmlint/default.nix
View file

@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x";
};
patches = [
# pass through NIX_* environment variables to scons.
./scons-nix-env.patch
];
nativeBuildInputs = [
pkg-config
sphinx
@ -56,9 +61,6 @@ stdenv.mkDerivation rec {
];
prePatch = ''
export CFLAGS="$NIX_CFLAGS_COMPILE"
export LDFLAGS="''${NIX_LDFLAGS//-rpath /-Wl,-rpath=}"
# remove sources of nondeterminism
substituteInPlace lib/cmdline.c \
--replace "__DATE__" "\"Jan 1 1970\"" \
@ -67,6 +69,7 @@ stdenv.mkDerivation rec {
--replace "gzip -c " "gzip -cn "
'';
# Otherwise tries to access /usr.
prefixKey = "--prefix=";
sconsFlags = lib.optionals (!withGui) [ "--without-gui" ];

19
pkgs/tools/misc/rmlint/scons-nix-env.patch Normal file
View file

@ -0,0 +1,19 @@
scons does not use os environment by default:
https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html
nixpkgs' cc-wrapper on the other hand relies on various NIX_* variables
to be passed through like NIX_CFLAGS_COMPILE_BEFORE.
--- a/SConstruct
+++ b/SConstruct
@@ -559,10 +559,7 @@ options = dict(
SHLINKCOMSTR=link_shared_library_message,
LINKCOMSTR=link_program_message,
PREFIX=GetOption('prefix'),
- ENV = dict([ (key, os.environ[key])
- for key in os.environ
- if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH']
- ])
+ ENV = os.environ,
)
if ARGUMENTS.get('VERBOSE') == "1":

4
pkgs/tools/networking/radsecproxy/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "radsecproxy";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-gSXjwQ9zJPVNzGqLsZzTEQ0OxbQUiUJYGxrEm56DZDE=";
sha256 = "sha256-/ldW2JQd8GuG0uspfa56vtzPg4ucj+HCL8gbo9oLReM=";
};
nativeBuildInputs = [ autoreconfHook ];

9
pkgs/tools/networking/tinc/pre.nix
View file

@ -1,13 +1,14 @@
{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
stdenv.mkDerivation rec {
pname = "tinc";
version = "1.1pre18";
src = fetchgit {
src = fetchFromGitHub {
owner = "gsliepen";
repo = "tinc";
rev = "release-${version}";
url = "git://tinc-vpn.org/tinc";
sha256 = "0a7d1xg34p54sv66lckn8rz2bpg7bl01najm2rxiwbsm956y7afm";
hash = "sha256-1anjTUlVLx57FlUqGwBd590lfkZ2MmrM1qRcMl4P7Sg=";
};
outputs = [ "out" "man" "info" ];

4
pkgs/tools/package-management/apt/default.nix
View file

@ -28,11 +28,11 @@
stdenv.mkDerivation rec {
pname = "apt";
version = "2.5.4";
version = "2.5.5";
src = fetchurl {
url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz";
hash = "sha256-fFD2P6j4sozee0UFXfFok304LyiwBF1RM4KbcGNu+HI=";
hash = "sha256-cR0ixSnvyj6ZQ9rZielxXr8JfmMJKNru3S++WH4O/YU=";
};
nativeBuildInputs = [

3
pkgs/tools/security/credslayer/default.nix
View file

@ -21,8 +21,9 @@ python3.pkgs.buildPythonApplication rec {
];
nativeCheckInputs = with python3.pkgs; [
wireshark-cli
py
pytestCheckHook
wireshark-cli
];
pytestFlagsArray = [

4
pkgs/tools/text/ugrep/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ugrep";
version = "3.9.5";
version = "3.9.6";
src = fetchFromGitHub {
owner = "Genivia";
repo = pname;
rev = "v${version}";
hash = "sha256-vaoEfNhkvbcZwjSMRwmWo42jPg6+7mrZx+jIesQnmL0=";
hash = "sha256-BzYlZl4NYjCXaM9ISGKSEP2xGFsE5GgX4zEIDniundo=";
};
buildInputs = [

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

@ -14981,9 +14981,7 @@ with pkgs;
jwasm = callPackage ../development/compilers/jwasm { };
kind2 = callPackage ../development/compilers/kind2 {
inherit (darwin.apple_sdk.frameworks) Security;
};
kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { };
knightos-genkfs = callPackage ../development/tools/knightos/genkfs { };