lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

Project import generated by Copybara.

Browse source 
GitOrigin-RevId: 0dde103318090f77ac95ef7fc26fe0cdd00fa0b3
This commit is contained in:
Default email 2021-08-06 16:57:35 -05:00
parent a3bb8d7922
commit 3ec2fa6bfd
114 changed files with 1773 additions and 1329 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
third_party/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md vendored
View file

@ -21,9 +21,9 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-
- [ ] macOS - [ ] macOS
- [ ] other Linux distributions - [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) - [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"` - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`) - [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [21.11 Release Notes (or backporting 21.05 Relase notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes) - [21.11 Release Notes (or backporting 21.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2111-release-notes)
- [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Package updates) Added a release notes entry if the change is major or breaking
- [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module updates) Added a release notes entry if the change is significant
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module - [ ] (Module addition) Added a release notes entry if adding a new NixOS module

26
third_party/nixpkgs/doc/languages-frameworks/go.section.md vendored
View file

@ -13,6 +13,7 @@ In the following is an example expression using `buildGoModule`, the following a
- `vendorSha256`: is the hash of the output of the intermediate fetcher derivation. `vendorSha256` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorSha256 = null;` - `vendorSha256`: is the hash of the output of the intermediate fetcher derivation. `vendorSha256` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorSha256 = null;`
- `runVend`: runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build. - `runVend`: runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build.
- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if any dependency has case-insensitive conflicts which will produce platform dependant `vendorSha256` checksums.
```nix ```nix
pet = buildGoModule rec { pet = buildGoModule rec {
@ -112,16 +113,6 @@ done
Both `buildGoModule` and `buildGoPackage` can be tweaked to behave slightly differently, if the following attributes are used: Both `buildGoModule` and `buildGoPackage` can be tweaked to behave slightly differently, if the following attributes are used:
### `buildFlagsArray` and `buildFlags`: {#ex-goBuildFlags-noarray}
These attributes set build flags supported by `go build`. We recommend using `buildFlagsArray`.
```nix
buildFlagsArray = [
"-tags=release"
];
```
### `ldflags` {#var-go-ldflags} ### `ldflags` {#var-go-ldflags}
Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build`. The most common use case for this argument is to make the resulting executable aware of its own version. For example: Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build`. The most common use case for this argument is to make the resulting executable aware of its own version. For example:
@ -134,6 +125,21 @@ Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build
]; ];
``` ```
### `tags` {#var-go-tags}
Arguments to pass to the Go via the `-tags` argument of `go build`. For example:
```nix
tags = [
"production"
"sqlite"
];
```
```nix
tags = [ "production" ] ++ lib.optionals withSqlite [ "sqlite" ];
```
### `deleteVendor` {#var-go-deleteVendor} ### `deleteVendor` {#var-go-deleteVendor}
Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete.

12
third_party/nixpkgs/nixos/modules/security/pam.nix vendored
View file

@ -406,7 +406,7 @@ let
${let oath = config.security.pam.oath; in optionalString cfg.oathAuth ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth
"auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"} "auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"}
${let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth ${let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth
"auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}"} "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}"}
${optionalString cfg.fprintAuth ${optionalString cfg.fprintAuth
"auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"} "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"}
'' + '' +
@ -822,6 +822,16 @@ in
Challenge-Response configurations. See the man-page ykpamcfg(1) for further Challenge-Response configurations. See the man-page ykpamcfg(1) for further
details on how to configure offline Challenge-Response validation. details on how to configure offline Challenge-Response validation.
More information can be found <link
xlink:href="https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html">here</link>.
'';
};
challengeResponsePath = mkOption {
default = null;
type = types.path;
description = ''
If not null, set the path used by yubico pam module where the challenge expected response is stored.
More information can be found <link More information can be found <link
xlink:href="https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html">here</link>. xlink:href="https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html">here</link>.
''; '';

2
third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix vendored
View file

@ -148,7 +148,7 @@ in
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
wants = [ "time-sync.target" ]; wants = [ "time-sync.target" ];
before = [ "time-sync.target" ]; before = [ "time-sync.target" ];
after = [ "network.target" ]; after = [ "network.target" "nss-lookup.target" ];
conflicts = [ "ntpd.service" "systemd-timesyncd.service" ]; conflicts = [ "ntpd.service" "systemd-timesyncd.service" ];
path = [ chronyPkg ]; path = [ chronyPkg ];

2
third_party/nixpkgs/nixos/tests/traefik.nix vendored
View file

@ -74,6 +74,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
client.wait_for_unit("multi-user.target") client.wait_for_unit("multi-user.target")
client.wait_until_succeeds("curl -sSf -H Host:nginx.traefik.test http://traefik/")
with subtest("Check that a container can be reached via Traefik"): with subtest("Check that a container can be reached via Traefik"):
assert "Hello from NGINX" in client.succeed( assert "Hello from NGINX" in client.succeed(
"curl -sSf -H Host:nginx.traefik.test http://traefik/" "curl -sSf -H Host:nginx.traefik.test http://traefik/"

101
third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix vendored
View file

@ -39,10 +39,10 @@
elpaBuild { elpaBuild {
pname = "ada-mode"; pname = "ada-mode";
ename = "ada-mode"; ename = "ada-mode";
version = "7.1.5"; version = "7.1.7";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ada-mode-7.1.5.tar"; url = "https://elpa.gnu.org/packages/ada-mode-7.1.7.tar";
sha256 = "037v25mqpg1n52hz89b49vf9zw68fmc0m7l6c1f8vnbw3dibyk8d"; sha256 = "0bzykgzc3kx1dgngishsf9w4czq3ig6wvrv3832zlxb7q3rmw8j2";
}; };
packageRequires = [ emacs uniquify-files wisi ]; packageRequires = [ emacs uniquify-files wisi ];
meta = { meta = {
@ -1007,16 +1007,16 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: ebdb = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
elpaBuild { elpaBuild {
pname = "ebdb"; pname = "ebdb";
ename = "ebdb"; ename = "ebdb";
version = "0.7"; version = "0.7.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ebdb-0.7.tar"; url = "https://elpa.gnu.org/packages/ebdb-0.7.1.tar";
sha256 = "0q4ywgh87d6hjac3031s21w91gld2hh7s8nbva94dnzwn6y9d0v1"; sha256 = "1z5lh1mib60mvs5kbdsrw2h4whz4n5ad4qkpphs2xjvaz92jgq6s";
}; };
packageRequires = [ cl-lib emacs seq ]; packageRequires = [ emacs seq ];
meta = { meta = {
homepage = "https://elpa.gnu.org/packages/ebdb.html"; homepage = "https://elpa.gnu.org/packages/ebdb.html";
license = lib.licenses.free; license = lib.licenses.free;
@ -1420,6 +1420,21 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
ftable = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "ftable";
ename = "ftable";
version = "1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ftable-1.0.tar";
sha256 = "1qi0fxw94hb7p2s8n2dzbziialbjbjxgpwx2m4mvrmicrq375r5p";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/ftable.html";
license = lib.licenses.free;
};
}) {};
gcmh = callPackage ({ elpaBuild, emacs, fetchurl, lib }: gcmh = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "gcmh"; pname = "gcmh";
@ -1964,16 +1979,16 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }: kiwix = callPackage ({ elpaBuild, elquery, emacs, fetchurl, lib, request }:
elpaBuild { elpaBuild {
pname = "kiwix"; pname = "kiwix";
ename = "kiwix"; ename = "kiwix";
version = "1.0.3"; version = "1.1.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/kiwix-1.0.3.tar"; url = "https://elpa.gnu.org/packages/kiwix-1.1.0.tar";
sha256 = "061b816xp8ykqd56z0nvc69aql9y4mba42p6x6vc0j6gr9n3c1j6"; sha256 = "1clp0q34bs395d0hrqdyvm9ds665hgf5qrdiqa14k31h4lbv2wsn";
}; };
packageRequires = [ emacs request ]; packageRequires = [ elquery emacs request ];
meta = { meta = {
homepage = "https://elpa.gnu.org/packages/kiwix.html"; homepage = "https://elpa.gnu.org/packages/kiwix.html";
license = lib.licenses.free; license = lib.licenses.free;
@ -2780,10 +2795,10 @@
elpaBuild { elpaBuild {
pname = "phps-mode"; pname = "phps-mode";
ename = "phps-mode"; ename = "phps-mode";
version = "0.4.3"; version = "0.4.6";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.4.3.tar"; url = "https://elpa.gnu.org/packages/phps-mode-0.4.6.tar";
sha256 = "0yvwfaj7l4z3zgycvnf1j0r5jx4lryaapljbw2sqvwqpbgyiw0y0"; sha256 = "0mfwyz9rwnrs0xcd1jmq1ngdhbwygm6hbfhyr14djywxx0b4hpm5";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -2885,10 +2900,10 @@
elpaBuild { elpaBuild {
pname = "pyim"; pname = "pyim";
ename = "pyim"; ename = "pyim";
version = "3.9.3"; version = "3.9.4";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/pyim-3.9.3.tar"; url = "https://elpa.gnu.org/packages/pyim-3.9.4.tar";
sha256 = "0rjaimvbh0fadbqiq4ggyxr0y4pfzld76wb64v7l5874qczn8dfr"; sha256 = "0ggnl2jidcklyhqd5av5kk1f855gsq29wq2nhvp1yjzn35hz6xij";
}; };
packageRequires = [ async emacs xr ]; packageRequires = [ async emacs xr ];
meta = { meta = {
@ -3362,21 +3377,6 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "shell-command-plus";
ename = "shell-command+";
version = "2.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar";
sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/shell-command+.html";
license = lib.licenses.free;
};
}) {};
shelisp = callPackage ({ elpaBuild, fetchurl, lib }: shelisp = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "shelisp"; pname = "shelisp";
@ -3392,6 +3392,21 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "shell-command-plus";
ename = "shell-command+";
version = "2.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar";
sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/shell-command+.html";
license = lib.licenses.free;
};
}) {};
shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "shen-mode"; pname = "shen-mode";
@ -3501,10 +3516,10 @@
elpaBuild { elpaBuild {
pname = "so-long"; pname = "so-long";
ename = "so-long"; ename = "so-long";
version = "1.0"; version = "1.1.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/so-long-1.0.el"; url = "https://elpa.gnu.org/packages/so-long-1.1.1.tar";
sha256 = "00z9gnxz32rakd0k7lqaj050fwmqzq5vr9d6rb7ji3fn01rjp7kj"; sha256 = "0qgdnkb702mkm886v0zv0hnm5y7zlifgx9ji6xmdsxycpsfkjz1f";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -3775,10 +3790,10 @@
elpaBuild { elpaBuild {
pname = "tramp"; pname = "tramp";
ename = "tramp"; ename = "tramp";
version = "2.5.1"; version = "2.5.1.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.5.1.tar"; url = "https://elpa.gnu.org/packages/tramp-2.5.1.1.tar";
sha256 = "1r7wifhzy2ipdlc4fqnx6549fnx45ggz57wh0cp7s6y25761si7q"; sha256 = "0v3rvvhjcnyvg6l4vyxz6513mxzvv9n0skkmr62ry8yi5x9wnqp1";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -4224,10 +4239,10 @@
elpaBuild { elpaBuild {
pname = "wisi"; pname = "wisi";
ename = "wisi"; ename = "wisi";
version = "3.1.4"; version = "3.1.5";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/wisi-3.1.4.tar"; url = "https://elpa.gnu.org/packages/wisi-3.1.5.tar";
sha256 = "1j35ln5x3dgypq3hn6xcdpg6vp6yjj6avcjakc2r6wx19vxixciw"; sha256 = "07jc8x6xdhpjv9hlghmvk7ga4gwww33nj5pizlx5scvpp0qvikpy";
}; };
packageRequires = [ emacs seq ]; packageRequires = [ emacs seq ];
meta = { meta = {

15
third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix vendored
View file

@ -41,7 +41,10 @@ self: let
}: let }: let
imported = import generated { imported = import generated {
inherit (self) callPackage; callPackage = pkgs: args: self.callPackage pkgs (args // {
# Use custom elpa url fetcher with fallback/uncompress
fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
});
}; };
super = removeAttrs imported [ "dash" ]; super = removeAttrs imported [ "dash" ];
@ -66,7 +69,12 @@ self: let
phases = "unpackPhase " + old.phases; # not a list, interestingly… phases = "unpackPhase " + old.phases; # not a list, interestingly…
srcs = [ srcs = [
super.ada-mode.src super.ada-mode.src
self.wisi.src # ada-mode needs a specific version of wisi, check NEWS or ada-mode's
# package-requires to find the version to use.
(pkgs.fetchurl {
url = "https://elpa.gnu.org/packages/wisi-3.1.3.tar.lz";
sha256 = "18dwcc0crds7aw466vslqicidlzamf8avn59gqi2g7y2x9k5q0as";
})
]; ];
sourceRoot = "ada-mode-${self.ada-mode.version}"; sourceRoot = "ada-mode-${self.ada-mode.version}";
@ -74,6 +82,7 @@ self: let
nativeBuildInputs = [ nativeBuildInputs = [
buildPackages.gnat buildPackages.gnat
buildPackages.gprbuild buildPackages.gprbuild
buildPackages.lzip
]; ];
buildInputs = [ buildInputs = [
@ -81,7 +90,7 @@ self: let
]; ];
preInstall = '' preInstall = ''
./build.sh ./build.sh -j$NIX_BUILD_CORES
''; '';
postInstall = '' postInstall = ''

21
third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/fetchelpa.nix vendored Normal file
View file

@ -0,0 +1,21 @@
# Elpa only serves the latest version of a given package uncompressed.
# Once that release is no longer the latest & greatest it gets archived and compressed
# meaning that both the URL and the hash changes.
#
# To work around this issue we fall back to the URL with the .lz suffix and if that's the
# one we downloaded we uncompress the file to ensure the hash matches regardless of compression.
{ fetchurl, lzip }:
{ url, ... }@args: fetchurl ((removeAttrs args [ "url" ]) // {
urls = [
url
(url + ".lz")
];
postFetch = ''
if [[ $url == *.lz ]]; then
${lzip}/bin/lzip -c -d $out > uncompressed
mv uncompressed $out
fi
'';
})

7
third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix vendored
View file

@ -10,7 +10,7 @@ To update the list of packages from nongnu (ELPA),
*/ */
{ lib }: { lib, buildPackages }:
self: let self: let
@ -19,7 +19,10 @@ self: let
}: let }: let
imported = import generated { imported = import generated {
inherit (self) callPackage; callPackage = pkgs: args: self.callPackage pkgs (args // {
# Use custom elpa url fetcher with fallback/uncompress
fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
});
}; };
super = imported; super = imported;

2
third_party/nixpkgs/pkgs/applications/editors/jetbrains/common.nix vendored
View file

@ -52,7 +52,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
} }
interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
if [ "${stdenv.hostPlatform.system}" == "x86_64-linux" ]; then if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then
target_size=$(get_file_size bin/fsnotifier64) target_size=$(get_file_size bin/fsnotifier64)
patchelf --set-interpreter "$interpreter" bin/fsnotifier64 patchelf --set-interpreter "$interpreter" bin/fsnotifier64
munge_size_hack bin/fsnotifier64 $target_size munge_size_hack bin/fsnotifier64 $target_size

51
third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix vendored
View file

@ -242,12 +242,12 @@ in
clion = buildClion rec { clion = buildClion rec {
name = "clion-${version}"; name = "clion-${version}";
version = "2021.1.2"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform"; description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "1zx9qwjx7hwjq25y474yj7sxvp9bqnq9l53afs6d4h6131lhjkcz"; /* updated by script */ sha256 = "0im14b52b6hgns964m946q68mvyaq8haldm92s9cn5azh8yg1arc"; /* updated by script */
}; };
wmClass = "jetbrains-clion"; wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@ -255,12 +255,12 @@ in
datagrip = buildDataGrip rec { datagrip = buildDataGrip rec {
name = "datagrip-${version}"; name = "datagrip-${version}";
version = "2021.1.3"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL"; description = "Your Swiss Army Knife for Databases and SQL";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
sha256 = "0lhi3vwhwb359va4sa17y071i03l4mfwqpsp7haqxjf900dcld7d"; /* updated by script */ sha256 = "17fzrn20mkldf74965c7abw3znyxskssdz1k4lciz6q7kn5cvdbf"; /* updated by script */
}; };
wmClass = "jetbrains-datagrip"; wmClass = "jetbrains-datagrip";
update-channel = "DataGrip RELEASE"; update-channel = "DataGrip RELEASE";
@ -268,12 +268,12 @@ in
goland = buildGoland rec { goland = buildGoland rec {
name = "goland-${version}"; name = "goland-${version}";
version = "2021.1.3"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "Up and Coming Go IDE"; description = "Up and Coming Go IDE";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz"; url = "https://download.jetbrains.com/go/${name}.tar.gz";
sha256 = "0xy9k90v3kcm9sj48l809qn0vws4ygsxxyqwsg6y9a3r1raqgqxd"; /* updated by script */ sha256 = "15pxr9w4gs342g9in7a41x0cpb7z68y28hwsamk9ic7yz2qshps8"; /* updated by script */
}; };
wmClass = "jetbrains-goland"; wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE"; update-channel = "GoLand RELEASE";
@ -281,12 +281,12 @@ in
idea-community = buildIdea rec { idea-community = buildIdea rec {
name = "idea-community-${version}"; name = "idea-community-${version}";
version = "2021.1.3"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = lib.licenses.asl20; license = lib.licenses.asl20;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "1phpfa9i3k7g92ankmibp53c1469ifnb12g6s8gklln7v7xxakmi"; /* updated by script */ sha256 = "1zki6myy3wbr1sgp1gli263y32g75gna2r9m7baa06zvc6c7j9vw"; /* updated by script */
}; };
wmClass = "jetbrains-idea-ce"; wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA RELEASE"; update-channel = "IntelliJ IDEA RELEASE";
@ -294,12 +294,12 @@ in
idea-ultimate = buildIdea rec { idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}"; name = "idea-ultimate-${version}";
version = "2021.1.3"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
sha256 = "13c7a96zbw05w1gy4ds4wzac853hdlnbflww2xaz60jnr1k24gnp"; /* updated by script */ sha256 = "0gbx1ngf8i2a0dvysw5g0ikakq4a7gghb4rjk7c99jwzwq9hckjm"; /* updated by script */
}; };
wmClass = "jetbrains-idea"; wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE"; update-channel = "IntelliJ IDEA RELEASE";
@ -307,12 +307,13 @@ in
mps = buildMps rec { mps = buildMps rec {
name = "mps-${version}"; name = "mps-${version}";
version = "2021.1"; /* updated by script */ version = "2021.1.1"; /* updated by script */
versionMajorMinor = "2021.1"; /* updated by script */
description = "Create your own domain-specific language"; description = "Create your own domain-specific language";
license = lib.licenses.asl20; license = lib.licenses.asl20;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/mps/${version}/MPS-${version}.tar.gz"; url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz";
sha256 = "0fdh8lzsi2zryi0xs961vrf3l8kqk5imlj56dhifywi7xkhs3vwn"; /* updated by script */ sha256 = "1gp9f4b57pr8c20qxcwax4l0d3w13x4lihxpb9z4agdqjafnc9l6"; /* updated by script */
}; };
wmClass = "jetbrains-mps"; wmClass = "jetbrains-mps";
update-channel = "MPS RELEASE"; update-channel = "MPS RELEASE";
@ -320,12 +321,12 @@ in
phpstorm = buildPhpStorm rec { phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}"; name = "phpstorm-${version}";
version = "2021.1.4"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "Professional IDE for Web and PHP developers"; description = "Professional IDE for Web and PHP developers";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "0p9a8l2bpjm25x4af1hlqhmw5xsirsfajznd6y723yqmjy8hs46l"; /* updated by script */ sha256 = "11lm7mja3mc2v329i830j8w1zymlz11sj86qvcg7s4pgc4xwnzd6"; /* updated by script */
}; };
wmClass = "jetbrains-phpstorm"; wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE"; update-channel = "PhpStorm RELEASE";
@ -333,12 +334,12 @@ in
pycharm-community = buildPycharm rec { pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}"; name = "pycharm-community-${version}";
version = "2021.1.3"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "PyCharm Community Edition"; description = "PyCharm Community Edition";
license = lib.licenses.asl20; license = lib.licenses.asl20;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz"; url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "0c03grsrjydb6jcnbq1qi4158c14vni3znr7vysnbvldi8al6w8m"; /* updated by script */ sha256 = "075lb50g853791hj8ahhi88zbp07cvfs3zrdahvvif2nd121r1mx"; /* updated by script */
}; };
wmClass = "jetbrains-pycharm-ce"; wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE"; update-channel = "PyCharm RELEASE";
@ -346,12 +347,12 @@ in
pycharm-professional = buildPycharm rec { pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}"; name = "pycharm-professional-${version}";
version = "2021.1.3"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "PyCharm Professional Edition"; description = "PyCharm Professional Edition";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz"; url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "01nwc9nprlyrwyij98px915w66g6vxbznsmmmg56rv3rvjvjp7yl"; /* updated by script */ sha256 = "1l83a8wfqz4xddscpzf7v29rhq9ibx32ximcqrj1cw0i9v7qnv9g"; /* updated by script */
}; };
wmClass = "jetbrains-pycharm"; wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE"; update-channel = "PyCharm RELEASE";
@ -359,12 +360,12 @@ in
rider = buildRider rec { rider = buildRider rec {
name = "rider-${version}"; name = "rider-${version}";
version = "2021.1.3"; /* updated by script */ version = "2021.1.5"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
sha256 = "0k2vpndpachq6g767v2dwfa3xc8mssv0i7wwpm05dgqirpn4n0dw"; /* updated by script */ sha256 = "17mxqh6p9jby5qrjqaq5km0j8k1bp8061ch2j059ka3n4ycxy7ph"; /* updated by script */
}; };
wmClass = "jetbrains-rider"; wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE"; update-channel = "Rider RELEASE";
@ -372,12 +373,12 @@ in
ruby-mine = buildRubyMine rec { ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}"; name = "ruby-mine-${version}";
version = "2021.1.2"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE"; description = "The Most Intelligent Ruby and Rails IDE";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "0r80y8y38rdxgc9sim0q2p7bmgxlp4pdxydr0w9gjikwnjxnvz51"; /* updated by script */ sha256 = "169jsd34l83n1pnrhzz548yn7ch1dzxpy8xck7vlymjgrxdqciwi"; /* updated by script */
}; };
wmClass = "jetbrains-rubymine"; wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE"; update-channel = "RubyMine RELEASE";
@ -385,12 +386,12 @@ in
webstorm = buildWebStorm rec { webstorm = buildWebStorm rec {
name = "webstorm-${version}"; name = "webstorm-${version}";
version = "2021.1.2"; /* updated by script */ version = "2021.2"; /* updated by script */
description = "Professional IDE for Web and JavaScript development"; description = "Professional IDE for Web and JavaScript development";
license = lib.licenses.unfree; license = lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "0q4hn6npm0c30v23d30dnphd6wajif0im1b9vjwa121lqi997l34"; /* updated by script */ sha256 = "1whikk1izzvhq1d7kaf2kn4j4qpxn7aq70hlbxr1kb7zs4mzy9x3"; /* updated by script */
}; };
wmClass = "jetbrains-webstorm"; wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE"; update-channel = "WebStorm RELEASE";

12
third_party/nixpkgs/pkgs/applications/editors/jetbrains/update.pl vendored
View file

@ -60,17 +60,20 @@ sub update_nix_block {
} elsif ($only_free && $block =~ /licenses\.unfree/) { } elsif ($only_free && $block =~ /licenses\.unfree/) {
print("$channel is unfree, skipping\n"); print("$channel is unfree, skipping\n");
} else { } else {
print("updating $channel: $version -> $latest_versions{$channel}\n"); my $version_string = $latest_versions{$channel};
my $versionMajorMinor = $version_string =~ s/^([0-9]+[.][0-9]+).*/$1/r;
print("updating $channel: $version -> $version_string\n");
my ($url) = $block =~ /url\s*=\s*"([^"]+)"/; my ($url) = $block =~ /url\s*=\s*"([^"]+)"/;
# try to interpret some nix # try to interpret some nix
my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; my ($name) = $block =~ /name\s*=\s*"([^"]+)"/;
$name =~ s/\$\{version\}/$latest_versions{$channel}/; $name =~ s/\$\{version\}/$version_string/;
# Some url pattern contain variables more than once # Some url pattern contain variables more than once
$url =~ s/\$\{name\}/$name/g; $url =~ s/\$\{name\}/$name/g;
$url =~ s/\$\{version\}/$latest_versions{$channel}/g; $url =~ s/\$\{version\}/$version_string/g;
$url =~ s/\$\{versionMajorMinor\}/$versionMajorMinor/g;
die "$url still has some interpolation" if $url =~ /\$/; die "$url still has some interpolation" if $url =~ /\$/;
my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/;
my $version_string = $latest_versions{$channel};
unless ( $sha256 ) { unless ( $sha256 ) {
my $full_version = $latest_versions{"full1_" . $channel}; my $full_version = $latest_versions{"full1_" . $channel};
$url =~ s/$version_string/$full_version/; $url =~ s/$version_string/$full_version/;
@ -83,6 +86,7 @@ sub update_nix_block {
print "Jetbrains published SHA256: $sha256\n"; print "Jetbrains published SHA256: $sha256\n";
print "Conversion into base32 yields: $sha256Base32\n"; print "Conversion into base32 yields: $sha256Base32\n";
$block =~ s#version\s*=\s*"([^"]+)".+$#version = "$version_string"; /* updated by script */#m; $block =~ s#version\s*=\s*"([^"]+)".+$#version = "$version_string"; /* updated by script */#m;
$block =~ s#versionMajorMinor\s*=\s*"([^"]+)".+$#versionMajorMinor = "$versionMajorMinor"; /* updated by script */#m;
$block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256Base32"; /* updated by script */#m; $block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256Base32"; /* updated by script */#m;
} }
} else { } else {

1
third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix vendored
View file

@ -27,7 +27,6 @@ in
version = "1.58.2"; version = "1.58.2";
pname = "vscode"; pname = "vscode";
sourceExecutableName = "code";
executableName = "code" + lib.optionalString isInsiders "-insiders"; executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
shortName = "Code" + lib.optionalString isInsiders " - Insiders"; shortName = "Code" + lib.optionalString isInsiders " - Insiders";

6
third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix vendored
View file

@ -26,13 +26,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "megapixels"; pname = "megapixels";
version = "1.1.0"; version = "1.2.0";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~martijnbraam"; owner = "~martijnbraam";
repo = "megapixels"; repo = "megapixels";
rev = version; rev = version;
sha256 = "0y56c6vchlzidfmp3a3bdc228vbhy7zaxvmhkyxchfb752yzr0n3"; sha256 = "0jnfzwvq58p4ksyifma10i158r2fb7fv72ymibgcxbnx596xpjb2";
}; };
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
description = "GTK3 camera application using raw v4l2 and media-requests"; description = "GTK4 camera application that knows how to deal with the media request api";
homepage = "https://sr.ht/~martijnbraam/Megapixels"; homepage = "https://sr.ht/~martijnbraam/Megapixels";
changelog = "https://git.sr.ht/~martijnbraam/megapixels/refs/${version}"; changelog = "https://git.sr.ht/~martijnbraam/megapixels/refs/${version}";
license = licenses.gpl3Only; license = licenses.gpl3Only;

6
third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix vendored
View file

@ -1,9 +1,9 @@
{ buildGoModule, fetchFromGitHub, installShellFiles, lib }: { buildGoModule, fetchFromGitHub, installShellFiles, lib }:
let let
humioCtlVersion = "0.28.5"; humioCtlVersion = "0.28.6";
sha256 = "sha256-h6zQG9jjHpAxaJUaFoVmRyR1A/bk57CKBIkOGPcdJP0="; sha256 = "sha256-15RRoTr+N+DsILYF1KndAwsW329w+UxHfB1VaWnkEFI=";
vendorSha256 = "sha256-867x33Aq27D2m14NqqsdByC39pjjyJZbfX3jmwVU2yo="; vendorSha256 = "sha256-fgRQ2n5tzj5s4rT65VIqh61wDwu+x/fWhpaKwyr8XWA=";
in buildGoModule { in buildGoModule {
name = "humioctl-${humioCtlVersion}"; name = "humioctl-${humioCtlVersion}";
pname = "humioctl"; pname = "humioctl";

8
third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix vendored
View file

@ -2,22 +2,22 @@
buildGoModule rec { buildGoModule rec {
pname = "hugo"; pname = "hugo";
version = "0.86.1"; version = "0.87.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gohugoio"; owner = "gohugoio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-2tCR4iabTLD9SynXjUM7+zNsFCCAa/n88brPnZ1DQ0Q="; sha256 = "sha256-2I1PDxbqtaOOlVbr7zhuawaFrFWM/PYt5QJm3N74Noc=";
}; };
vendorSha256 = "sha256-ZIGw349m6k8qqrzUN/oYV/HrgBvfOo/ovjo1SUDRmyk="; vendorSha256 = "sha256-0pkQ+VcmK2XLaQ2XJHh5/QftSdud6Eo1nlBK+L92xKU=";
doCheck = false; doCheck = false;
runVend = true; runVend = true;
buildFlags = [ "-tags" "extended" ]; tags = [ "extended" ];
subPackages = [ "." ]; subPackages = [ "." ];

8
third_party/nixpkgs/pkgs/applications/misc/josm/default.nix vendored
View file

@ -3,20 +3,20 @@
}: }:
let let
pname = "josm"; pname = "josm";
version = "18004"; version = "18118";
srcs = { srcs = {
jar = fetchurl { jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "sha256-Cd+/sE6A0MddHeAxy3gx7ev+9UR3ZNcR0tCTmdX2FtY="; sha256 = "01wcbf1mh1gqxnqkc3j6h64h9sz0yd5wiwpyx4ic4d5fwkh65qym";
}; };
macosx = fetchurl { macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip";
sha256 = "sha256-QSVh8043K/f7gPEjosGo/DNj1d75LUFwf6EMeHk68fM="; sha256 = "0i1vglqg49fd3w2bny01l92wj4hvr3y35rrmd1mdff0lc1zhi397";
}; };
pkg = fetchsvn { pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
rev = version; rev = version;
sha256 = "sha256-Ic6RtQPqpQIci1IbKgTcFmLfMdPxSVybrEAk+ttM0j8="; sha256 = "0gyj9kdzl920mjdmqjgiscqxyqhnvh22l6sjicf059ga0fsr3ki1";
}; };
}; };
in in

2
third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix vendored
View file

@ -15,7 +15,7 @@ buildGoModule rec {
subPackages = [ "." ]; subPackages = [ "." ];
buildFlags = [ "-tags sqlite" ]; tags = [ "sqlite" ];
doCheck = false; doCheck = false;

8
third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix vendored
View file

@ -1,4 +1,6 @@
{ lib, buildFHSUserEnv, lutris-unwrapped { lib, buildFHSUserEnv, lutris-unwrapped
, extraPkgs ? pkgs: [ ]
, extraLibraries ? pkgs: [ ]
, steamSupport ? true , steamSupport ? true
}: }:
@ -87,7 +89,8 @@ in buildFHSUserEnv {
soundfont-fluid bzip2 game-music-emu soundfont-fluid bzip2 game-music-emu
] ++ qt5Deps pkgs ] ++ qt5Deps pkgs
++ gnomeDeps pkgs ++ gnomeDeps pkgs
++ lib.optional steamSupport pkgs.steam; ++ lib.optional steamSupport pkgs.steam
++ extraPkgs pkgs;
multiPkgs = pkgs: with pkgs; [ multiPkgs = pkgs: with pkgs; [
# Common # Common
@ -110,7 +113,8 @@ in buildFHSUserEnv {
# Winetricks # Winetricks
fribidi fribidi
] ++ xorgDeps pkgs; ] ++ xorgDeps pkgs
++ extraLibraries pkgs;
extraInstallCommands = '' extraInstallCommands = ''
mkdir -p $out/share mkdir -p $out/share

4
third_party/nixpkgs/pkgs/applications/misc/rofi-file-browser/default.nix vendored
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rofi-file-browser-extended"; pname = "rofi-file-browser-extended";
version = "1.1.1"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "marvinkreis"; owner = "marvinkreis";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "10wk5sif3bmvsgyk2gdy0qhpv1b37zgzf89n3h0yh7pg195fi2gn"; sha256 = "1grcal8ga4gpaj3p1dvx4zmqai93jjz2izpj91lxwj0dbz1gmbdm";
fetchSubmodules = true; fetchSubmodules = true;
}; };

3
third_party/nixpkgs/pkgs/applications/misc/usql/default.nix vendored
View file

@ -21,8 +21,7 @@ buildGoModule rec {
buildInputs = [ unixODBC icu ]; buildInputs = [ unixODBC icu ];
# These tags and flags are copied from build-release.sh # These tags and flags are copied from build-release.sh
buildFlags = [ "-tags" ]; tags = [
buildFlagsArray = [
"most" "most"
"sqlite_app_armor" "sqlite_app_armor"
"sqlite_fts5" "sqlite_fts5"

4
third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix vendored
View file

@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "brave"; pname = "brave";
version = "1.27.109"; version = "1.27.111";
src = fetchurl { src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "RJCGaezucb3LJC1KLG/7vPIF3diVgSTsnylXEN1BaRU="; sha256 = "nQkna1r8wSjTPEWp9RxOz45FVmz97NHzTlb4Hh5lXcs=";
}; };
dontConfigure = true; dontConfigure = true;

4
third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix vendored
View file

@ -15,8 +15,8 @@ buildGoModule rec {
doCheck = false; doCheck = false;
buildFlagsArray = [ ldflags = [
"-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=v${version}" "-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=v${version}"
]; ];
subPackages = [ subPackages = [

6
third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix vendored
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "fluxctl"; pname = "fluxctl";
version = "1.23.1"; version = "1.23.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "weaveworks"; owner = "weaveworks";
repo = "flux"; repo = "flux";
rev = version; rev = version;
sha256 = "sha256-PcDipeW+ebGm6w/htjyx1/PXaanh2gp3EyHkcLY9peo="; sha256 = "sha256-Ypy462QYmRiQrnOYjBA4BrtPKMT7sNpWb4St3KMVqbI=";
}; };
vendorSha256 = "sha256-CxGa95x742vS+8WxK/I2ZbEn2mJPwpXa5zm3xBNbX4U="; vendorSha256 = "sha256-GUeLbngahbjEXetCfFbwWhn7jtyqKu7I2dyfjKalUM0=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

4
third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix vendored
View file

@ -22,8 +22,8 @@ let generic = { channel, version, sha256, vendorSha256 }:
env GOFLAGS="" go generate ./viz/static env GOFLAGS="" go generate ./viz/static
''; '';
buildFlagsArray = [ tags = [
"-tags=prod" "prod"
]; ];
ldflags = [ ldflags = [

2
third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix vendored
View file

@ -21,7 +21,7 @@ buildGoModule rec {
meta = with lib; { meta = with lib; {
homepage = "https://www.github.com/hashicorp/nomad-driver-podman"; homepage = "https://www.github.com/hashicorp/nomad-driver-podman";
description = "Podman task driver for Nomad"; description = "Podman task driver for Nomad";
platforms = platforms.unix; platforms = platforms.linux;
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ cpcloud ]; maintainers = with maintainers; [ cpcloud ];
}; };

12
third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix vendored
View file

@ -6,6 +6,7 @@
, nvidiaGpuSupport , nvidiaGpuSupport
, patchelf , patchelf
, nvidia_x11 , nvidia_x11
, nixosTests
}: }:
buildGoPackage rec { buildGoPackage rec {
@ -29,16 +30,7 @@ buildGoPackage rec {
# ui: # ui:
# Nomad release commits include the compiled version of the UI, but the file # Nomad release commits include the compiled version of the UI, but the file
# is only included if we build with the ui tag. # is only included if we build with the ui tag.
preBuild =
let
tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia"; tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia";
tagsString = lib.concatStringsSep " " tags;
in
''
export buildFlagsArray=(
-tags="${tagsString}"
)
'';
# The dependency on NVML isn't explicit. We have to make it so otherwise the # The dependency on NVML isn't explicit. We have to make it so otherwise the
# binary will not know where to look for the relevant symbols. # binary will not know where to look for the relevant symbols.
@ -48,6 +40,8 @@ buildGoPackage rec {
done done
''; '';
passthru.tests.nomad = nixosTests.nomad;
meta = with lib; { meta = with lib; {
homepage = "https://www.nomadproject.io/"; homepage = "https://www.nomadproject.io/";
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";

15
third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix vendored
View file

@ -1,6 +1,11 @@
{ lib, stdenv, fetchFromGitHub { lib
, makeWrapper, makeDesktopItem, mkYarnPackage , stdenv
, electron, element-web , fetchFromGitHub
, makeWrapper
, makeDesktopItem
, mkYarnPackage
, electron
, element-web
, callPackage , callPackage
, Security , Security
, AppKit , AppKit
@ -22,7 +27,8 @@ let
sha256 = "sha256-4d2IOngiRcKd4k0jnilAR3Sojkfru3dlqtoBYi3zeLY="; sha256 = "sha256-4d2IOngiRcKd4k0jnilAR3Sojkfru3dlqtoBYi3zeLY=";
}; };
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
in mkYarnPackage rec { in
mkYarnPackage rec {
name = "element-desktop-${version}"; name = "element-desktop-${version}";
inherit version src; inherit version src;
@ -57,6 +63,7 @@ in mkYarnPackage rec {
rm "$out/share/element/electron/node_modules" rm "$out/share/element/electron/node_modules"
cp -r './node_modules' "$out/share/element/electron" cp -r './node_modules' "$out/share/element/electron"
cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json
ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json
# icons # icons
for icon in $out/share/element/electron/build/icons/*.png; do for icon in $out/share/element/electron/build/icons/*.png; do

10
third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix vendored
View file

@ -1,7 +1,7 @@
{ mkDerivation, lib, fetchFromGitHub, callPackage { mkDerivation, lib, fetchFromGitHub, callPackage
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
, extra-cmake-modules , extra-cmake-modules
, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash , qtbase, qtimageformats, gtk3, kwayland, libdbusmenu, lz4, xxHash
, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3
, tl-expected, hunspell, glibmm, webkitgtk, jemalloc , tl-expected, hunspell, glibmm, webkitgtk, jemalloc
, rnnoise , rnnoise
@ -12,8 +12,6 @@
, xdg-utils, libsysprof-capture, libpsl, brotli , xdg-utils, libsysprof-capture, libpsl, brotli
}: }:
with lib;
# Main reference: # Main reference:
# - This package was originally based on the Arch package but all patches are now upstreamed: # - This package was originally based on the Arch package but all patches are now upstreamed:
# https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop # https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop
@ -59,7 +57,7 @@ in mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash qtbase qtimageformats gtk3 kwayland libdbusmenu lz4 xxHash
ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3
tl-expected hunspell glibmm webkitgtk jemalloc tl-expected hunspell glibmm webkitgtk jemalloc
rnnoise rnnoise
@ -85,7 +83,7 @@ in mkDerivation rec {
wrapProgram $out/bin/telegram-desktop \ wrapProgram $out/bin/telegram-desktop \
"''${gappsWrapperArgs[@]}" \ "''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \
--prefix PATH : ${xdg-utils}/bin \ --prefix PATH : ${lib.makeBinPath [ xdg-utils]} \
--set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
sed -i $out/bin/telegram-desktop \ sed -i $out/bin/telegram-desktop \
-e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
@ -96,7 +94,7 @@ in mkDerivation rec {
updateScript = ./update.py; updateScript = ./update.py;
}; };
meta = { meta = with lib; {
description = "Telegram Desktop messaging app"; description = "Telegram Desktop messaging app";
longDescription = '' longDescription = ''
Desktop client for the Telegram messenger, based on the Telegram API and Desktop client for the Telegram messenger, based on the Telegram API and

16
third_party/nixpkgs/pkgs/applications/office/zim/default.nix vendored
View file

@ -1,25 +1,22 @@
{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome }: { lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome }:
#
# TODO: Declare configuration options for the following optional dependencies: # TODO: Declare configuration options for the following optional dependencies:
# - File stores: hg, git, bzr # - File stores: hg, git, bzr
# - Included plugins depenencies: dot, ditaa, dia, any other? # - Included plugins depenencies: dot, ditaa, dia, any other?
# - pyxdg: Need to make it work first (see setupPyInstallFlags). # - pyxdg: Need to make it work first (see setupPyInstallFlags).
#
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "zim-${version}"; pname = "zim";
version = "0.73.1"; version = "0.73.5";
src = fetchurl { src = fetchurl {
url = "https://zim-wiki.org/downloads/${name}.tar.gz"; url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz";
sha256 = "13vhwsgv6mscgixypc0ixkgj0y7cpcm7z7wn1vmdrwp7kn8m3xgx"; sha256 = "sha256-o28V2Sw5lMDVWwf4MlOz2LgmvrNxSGXturwU8cyR1jo=";
}; };
buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ]; buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ];
propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ];
preFixup = '' preFixup = ''
export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped" export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped"
''; '';
@ -28,13 +25,12 @@ python3Packages.buildPythonApplication rec {
doCheck = false; doCheck = false;
checkPhase = '' checkPhase = ''
python test.py ${python3Packages.python.interpreter} test.py
''; '';
meta = with lib; { meta = with lib; {
description = "A desktop wiki"; description = "A desktop wiki";
homepage = "http://zim-wiki.org"; homepage = "https://zim-wiki.org/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ pSub ]; maintainers = with maintainers; [ pSub ];
broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790

2
third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix vendored
View file

@ -37,7 +37,7 @@ in buildGoModule rec {
inherit rubyEnv; inherit rubyEnv;
}; };
buildFlags = [ "-tags=static,system_libgit2" ]; tags = [ "static,system_libgit2" ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
doCheck = false; doCheck = false;

6
third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix vendored
View file

@ -13,14 +13,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "pijul"; pname = "pijul";
version = "1.0.0-alpha.52"; version = "1.0.0-alpha.53";
src = fetchCrate { src = fetchCrate {
inherit version pname; inherit version pname;
sha256 = "0m759zfh40kxswsv40z1l332lc8lfqppyv8188y4i6biqmgbx8f1"; sha256 = "1y5wnqscyfhd806qs6gfmssm7hvfdi7mxc9p1125jnmzca4wcsm2";
}; };
cargoSha256 = "0f31hw2zjvhkhsb0ykvw4c3d0qy8zirgsaz7yr89hy01rs23bh8z"; cargoSha256 = "0m9zjagq59rxf5pysklal030f4n0dqgmjsgwcnljajxc2r26665h";
cargoBuildFlags = lib.optional gitImportSupport "--features=git"; cargoBuildFlags = lib.optional gitImportSupport "--features=git";

13
third_party/nixpkgs/pkgs/applications/virtualization/bochs/bochs-2.6.11-glibc-2.26.patch vendored
View file

@ -1,13 +0,0 @@
diff -Naur bochs-2.6.10.orig/iodev/network/slirp/slirp.h bochs-2.6.10.mod/iodev/network/slirp/slirp.h
--- bochs-2.6.10.orig/iodev/network/slirp/slirp.h 2019-11-02 16:30:39.843938000 -0300
+++ bochs-2.6.10.mod/iodev/network/slirp/slirp.h 2019-12-29 12:55:49.541630697 -0300
@@ -44,8 +44,8 @@
#endif
#include <sys/types.h>
-#if defined(__OpenBSD__) || defined(__linux__)
#include <stdint.h>
+#if defined(__OpenBSD__) || defined(__linux__)
#include <sys/wait.h>
#endif
#ifdef HAVE_SYS_BITYPES_H

29
third_party/nixpkgs/pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch vendored
View file

@ -1,29 +0,0 @@
------------------------------------------------------------------------
r13882 | vruppert | 2020-06-09 09:30:01 +0200 (Tue, 09 Jun 2020) | 2 lines
Compilation fix for MSYS2 gcc 10.1.0 (narrowing conversion).
Index: iodev/display/voodoo_data.h
===================================================================
--- a/iodev/display/voodoo_data.h (revision 13881)
+++ b/iodev/display/voodoo_data.h (revision 13882)
@@ -1837,11 +1837,11 @@
/* fifo content defines */
#define FIFO_TYPES (7 << 29)
-#define FIFO_WR_REG (1 << 29)
-#define FIFO_WR_TEX (2 << 29)
-#define FIFO_WR_FBI_32 (3 << 29)
-#define FIFO_WR_FBI_16L (4 << 29)
-#define FIFO_WR_FBI_16H (5 << 29)
+#define FIFO_WR_REG (1U << 29)
+#define FIFO_WR_TEX (2U << 29)
+#define FIFO_WR_FBI_32 (3U << 29)
+#define FIFO_WR_FBI_16L (4U << 29)
+#define FIFO_WR_FBI_16H (5U << 29)
BX_CPP_INLINE void fifo_reset(fifo_state *f)
{
------------------------------------------------------------------------

26
third_party/nixpkgs/pkgs/applications/virtualization/bochs/default.nix vendored
View file

@ -20,22 +20,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bochs"; pname = "bochs";
version = "2.6.11"; version = "2.7";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/project/bochs/bochs/${version}/bochs-${version}.tar.gz";
sha256 = "0ql8q6y1k356li1g9gbvl21448mlxphxxi6kjb2b3pxvzd0pp2b3"; hash = "sha256-oBCrG/3HKsWgjS4kEs1HHA/r1mrx2TSbwNeWh53lsXo=";
}; };
patches = [
# A flip between two lines of code, in order to compile with GLIBC 2.26
./bochs-2.6.11-glibc-2.26.patch
# Fix compilation for MSYS2 GCC 10; remove it when the next version arrives
./bochs_fix_narrowing_conv_warning.patch
# SMP-enabled configs; remove it when the next version arrives
./fix-build-smp.patch
];
nativeBuildInputs = [ nativeBuildInputs = [
docbook_xml_dtd_45 docbook_xml_dtd_45
docbook_xsl docbook_xsl
@ -62,7 +53,6 @@ stdenv.mkDerivation rec {
"--with-rfb=no" "--with-rfb=no"
"--with-vncsrv=no" "--with-vncsrv=no"
"--with-svga=no" # it doesn't compile on NixOS
# These will always be "yes" on NixOS # These will always be "yes" on NixOS
"--enable-ltdl-install=yes" "--enable-ltdl-install=yes"
@ -92,7 +82,6 @@ stdenv.mkDerivation rec {
"--enable-cpu-level=6" # from 3 to 6 "--enable-cpu-level=6" # from 3 to 6
"--enable-debugger" #conflicts with gdb-stub option "--enable-debugger" #conflicts with gdb-stub option
"--enable-debugger-gui" "--enable-debugger-gui"
"--enable-disasm"
"--enable-e1000" "--enable-e1000"
"--enable-es1370" "--enable-es1370"
"--enable-evex" "--enable-evex"
@ -105,7 +94,7 @@ stdenv.mkDerivation rec {
"--enable-largefile" "--enable-largefile"
"--enable-ne2000" "--enable-ne2000"
"--enable-pci" "--enable-pci"
"--enable-plugins=no" # Plugins are a bit buggy in Bochs "--enable-plugins=yes"
"--enable-pnic" "--enable-pnic"
"--enable-repeat-speedups" "--enable-repeat-speedups"
"--enable-sb16" "--enable-sb16"
@ -126,11 +115,6 @@ stdenv.mkDerivation rec {
++ lib.optionals (ncurses != null) [ "--with-term" ] ++ lib.optionals (ncurses != null) [ "--with-term" ]
++ lib.optionals (gtk2 != null && wxGTK != null) [ "--with-wx" ]; ++ lib.optionals (gtk2 != null && wxGTK != null) [ "--with-wx" ];
NIX_CFLAGS_COMPILE="-I${gtk2.dev}/include/gtk-2.0/ -I${libtool}/include/";
NIX_LDFLAGS="-L${libtool.lib}/lib";
hardeningDisable = [ "format" ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
@ -146,5 +130,5 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }
# TODO: plugins
# TODO: a better way to organize the options # TODO: a better way to organize the options
# TODO: docbook (install docbook-tools from RedHat mirrors can help)

21
third_party/nixpkgs/pkgs/applications/virtualization/bochs/fix-build-smp.patch vendored
View file

@ -1,21 +0,0 @@
Description: A fix for SMP-enable configurations
Inspired in: https://sourceforge.net/p/bochs/code/13778/
============
diff -Naur bochs-2.6.11-old/bx_debug/dbg_main.cc bochs-2.6.11-new/bx_debug/dbg_main.cc
--- bochs-2.6.11-old/bx_debug/dbg_main.cc 2019-12-20 04:57:59.818924000 -0300
+++ bochs-2.6.11-new/bx_debug/dbg_main.cc 2020-03-30 23:20:29.402195707 -0300
@@ -1494,11 +1494,11 @@
{
char cpu_param_name[16];
- Bit32u index = BX_ITLB_INDEX_OF(laddr);
+ Bit32u index = BX_CPU(dbg_cpu)->ITLB.get_index_of(laddr);
sprintf(cpu_param_name, "ITLB.entry%d", index);
bx_dbg_show_param_command(cpu_param_name, 0);
- index = BX_DTLB_INDEX_OF(laddr, 0);
+ index = BX_CPU(dbg_cpu)->DTLB.get_index_of(laddr);
sprintf(cpu_param_name, "DTLB.entry%d", index);
bx_dbg_show_param_command(cpu_param_name, 0);
}

2
third_party/nixpkgs/pkgs/applications/virtualization/umoci/default.nix vendored
View file

@ -21,7 +21,7 @@ buildGoModule rec {
doCheck = false; doCheck = false;
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; ldflags = [ "-s" "-w" "-X main.version=${version}" ];
nativeBuildInputs = [ go-md2man installShellFiles ]; nativeBuildInputs = [ go-md2man installShellFiles ];

21
third_party/nixpkgs/pkgs/data/fonts/comfortaa/default.nix vendored
View file

@ -1,17 +1,22 @@
{ lib, fetchzip }: { lib, fetchFromGitHub }:
let let
version = "3.001"; version = "3.101";
in fetchzip rec { in fetchFromGitHub rec {
name = "comfortaa-${version}"; name = "comfortaa-${version}";
url = "https://orig00.deviantart.net/40a3/f/2017/093/d/4/comfortaa___font_by_aajohan-d1qr019.zip"; owner = "googlefonts";
repo = "comfortaa";
rev = version;
postFetch = '' postFetch = ''
mkdir -p $out/share/fonts $out/share/doc tar -xf $downloadedFile --strip=1
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype mkdir -p $out/share/fonts/truetype $out/share/doc/comfortaa
unzip -j $downloadedFile \*/FONTLOG.txt \*/donate.html -d $out/share/doc/${name} cp fonts/TTF/*.ttf $out/share/fonts/truetype
cp FONTLOG.txt README.md $out/share/doc/comfortaa
''; '';
sha256 = "0z7xr0cnn6ghwivrm5b5awq9bzhnay3y99qq6dkdgfkfdsaz0n9h";
sha256 = "06jhdrfzl01ma085bp354g002ypmkbp6a51jn1lsj77zfj2mfmfc";
meta = with lib; { meta = with lib; {
homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949"; homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949";

9
third_party/nixpkgs/pkgs/data/fonts/fira-mono/default.nix vendored
View file

@ -1,13 +1,14 @@
{ lib, fetchzip }: { lib, fetchzip }:
fetchzip { let version = "4.202";
name = "fira-mono-3.206"; in fetchzip {
name = "fira-mono-${version}";
url = "https://github.com/mozilla/Fira/archive/4.106.zip"; url = "https://github.com/mozilla/Fira/archive/${version}.zip";
postFetch = '' postFetch = ''
mkdir -p $out/share/fonts mkdir -p $out/share/fonts
unzip -j $downloadedFile Fira-4.106/otf/FiraMono\*.otf -d $out/share/fonts/opentype unzip -j $downloadedFile Fira-${version}/otf/FiraMono\*.otf -d $out/share/fonts/opentype
''; '';
sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj"; sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj";

10
third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix vendored
View file

@ -4,16 +4,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "unifont"; pname = "unifont";
version = "13.0.05"; version = "13.0.06";
ttf = fetchurl { ttf = fetchurl {
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
sha256 = "0ff7zbyqi45q0171rl9ckj6lpfhcj8a9850d8j89m7wbwky32isf"; sha256 = "0hp72lcj8q8cw490lxl5y1ygw9mcicryjwqr1mmkdz8zh4jh8g6p";
}; };
pcf = fetchurl { pcf = fetchurl {
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
sha256 = "16n666p6rs6l4r8grh67gy4ls33qfnbb5xk7cksywzjwdh42js0r"; sha256 = "0y030km1x8mai8zrk661dqsb0yq8rpx6akl7p2sw5ijkcdsfm85f";
}; };
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
@ -43,10 +43,10 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Unicode font for Base Multilingual Plane"; description = "Unicode font for Base Multilingual Plane";
homepage = "http://unifoundry.com/unifont.html"; homepage = "https://unifoundry.com/unifont/";
# Basically GPL2+ with font exception. # Basically GPL2+ with font exception.
license = "http://unifoundry.com/LICENSE.txt"; license = "https://unifoundry.com/LICENSE.txt";
maintainers = [ maintainers.rycee maintainers.vrthra ]; maintainers = [ maintainers.rycee maintainers.vrthra ];
platforms = platforms.all; platforms = platforms.all;
}; };

8
third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix vendored
View file

@ -1,7 +1,7 @@
{ lib, fetchzip }: { lib, fetchzip }:
let let
version = "13.0.05"; version = "13.0.06";
in fetchzip rec { in fetchzip rec {
name = "unifont_upper-${version}"; name = "unifont_upper-${version}";
@ -9,14 +9,14 @@ in fetchzip rec {
postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf";
sha256 = "1cpi44fzsiq3yqg38763awgri1ma46421c3v8167bsxzsx7vzlkp"; sha256 = "0bqw30h5b787dw8bn1dj8shz22mlxr1zmcfp68fpyll5vg02540n";
meta = with lib; { meta = with lib; {
description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";
homepage = "http://unifoundry.com/unifont.html"; homepage = "https://unifoundry.com/unifont/";
# Basically GPL2+ with font exception. # Basically GPL2+ with font exception.
license = "http://unifoundry.com/LICENSE.txt"; license = "https://unifoundry.com/LICENSE.txt";
maintainers = [ maintainers.mathnerd314 maintainers.vrthra ]; maintainers = [ maintainers.mathnerd314 maintainers.vrthra ];
platforms = platforms.all; platforms = platforms.all;
}; };

14
third_party/nixpkgs/pkgs/desktops/gnome/core/caribou/default.nix vendored
View file

@ -1,6 +1,6 @@
{ fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2 { fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2
, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook
, wrapGAppsHook, libgee }: , wrapGAppsHook, libgee, vala_0_40 }:
let let
pname = "caribou"; pname = "caribou";
@ -21,9 +21,19 @@ in stdenv.mkDerivation rec {
url = "https://bugzilla.gnome.org/attachment.cgi?id=364774"; url = "https://bugzilla.gnome.org/attachment.cgi?id=364774";
sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd";
}) })
(fetchurl {
name = "fix-build-modern-vala.patch";
url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/76fbd11575f918fc898cb0f5defe07f67c11ec38.patch";
sha256 = "0qy27zk7889hg51nx40afgppcx9iaihxbg3aqz9w35d6fmhr2k2y";
})
(fetchurl {
name = "CVE-2021-3567.patch";
url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/d41c8e44b12222a290eaca16703406b113a630c6.patch";
sha256 = "1vd2j3823k2p3msv7fq2437p3jvxzbd7hyh07i80g9754ylh92y8";
})
]; ];
nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook vala_0_40 ];
buildInputs = [ buildInputs = [
glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3

2
third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh vendored
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.3/ -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.4/ -A '*.tar.xz' )

424
third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix vendored
View file

@ -4,427 +4,427 @@
{ {
bluedevil = { bluedevil = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/bluedevil-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/bluedevil-5.22.4.tar.xz";
sha256 = "1qgq4c3c1jmhssq9yllx69df58a884w39ng9z2ddl3kvph6c1f4m"; sha256 = "10bqk46ygnf72aqxxaxlx4khv1gwj46la1czsjmlszvkcqxrpwa0";
name = "bluedevil-5.22.3.tar.xz"; name = "bluedevil-5.22.4.tar.xz";
}; };
}; };
breeze = { breeze = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/breeze-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/breeze-5.22.4.tar.xz";
sha256 = "1r10y41l6l2xhmwvy2q03icp6b4163pav98bdrwysrx7pvlj131b"; sha256 = "1b4zrwpaayd6mlwsnwg416ryba32zpg8w2dlh56qbmg6jxzjnybx";
name = "breeze-5.22.3.tar.xz"; name = "breeze-5.22.4.tar.xz";
}; };
}; };
breeze-grub = { breeze-grub = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/breeze-grub-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/breeze-grub-5.22.4.tar.xz";
sha256 = "06i0k2s7arfwjzcr972c1zs2kpkxvl57ih9nz5idd0lshamc36gy"; sha256 = "19zlhq3k80id676sxlf8nhk0a11rkrwmbd256aggdwhz1fivxc1c";
name = "breeze-grub-5.22.3.tar.xz"; name = "breeze-grub-5.22.4.tar.xz";
}; };
}; };
breeze-gtk = { breeze-gtk = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/breeze-gtk-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/breeze-gtk-5.22.4.tar.xz";
sha256 = "1gvx1ip8jkc7pj6bciy3514bkmlazliz60sxdab8b6m00lb0rwng"; sha256 = "1p47vsr2xj00p1r2jhyns2wzchjlhymzzyv2xqy9xd4l8pkv8scb";
name = "breeze-gtk-5.22.3.tar.xz"; name = "breeze-gtk-5.22.4.tar.xz";
}; };
}; };
breeze-plymouth = { breeze-plymouth = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/breeze-plymouth-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/breeze-plymouth-5.22.4.tar.xz";
sha256 = "03px2jk50plalpnzj6xsbkpqxmj5vkxl7r6y60g7dxf6d4hv15dr"; sha256 = "0b9sjn8lfhgyc2sz1r9rnknkas79526qmwi5j3wbxb0va2rcap9z";
name = "breeze-plymouth-5.22.3.tar.xz"; name = "breeze-plymouth-5.22.4.tar.xz";
}; };
}; };
discover = { discover = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/discover-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/discover-5.22.4.tar.xz";
sha256 = "1893wwq4m40z6k64n97vqgxkhwcgbhw4q5m5cs0dpczx1803sa8y"; sha256 = "0ij7b1fyv9rgiw6ywgxzj35c9bd3937w3njzqmkzi2l9zlnrzwvg";
name = "discover-5.22.3.tar.xz"; name = "discover-5.22.4.tar.xz";
}; };
}; };
drkonqi = { drkonqi = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/drkonqi-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/drkonqi-5.22.4.tar.xz";
sha256 = "09jf0rdpb1k2fbbqg3p5ypk7jhp2nls19x1zc8rphnsr1hwxxsb3"; sha256 = "1dy5v50icnlwa4pl5z30q5abv2sbznlrpgiy28hh1mf64hx6hl3w";
name = "drkonqi-5.22.3.tar.xz"; name = "drkonqi-5.22.4.tar.xz";
}; };
}; };
kactivitymanagerd = { kactivitymanagerd = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kactivitymanagerd-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kactivitymanagerd-5.22.4.tar.xz";
sha256 = "1i2hs9204vi41d3jb6hr050g9v0jm5in07nqyxy1wxw2bmpncisx"; sha256 = "1km0mlqyrvflq45gwffrbwvkrqirb44qn1rp37iif4d82pmx11yv";
name = "kactivitymanagerd-5.22.3.tar.xz"; name = "kactivitymanagerd-5.22.4.tar.xz";
}; };
}; };
kde-cli-tools = { kde-cli-tools = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kde-cli-tools-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kde-cli-tools-5.22.4.tar.xz";
sha256 = "1w5c65fd0p2xz185prkrr6ys0cy3wasfkbfv1q4qiniwxjipa3q4"; sha256 = "1kh8pba9q61qjjpc945nvx42mm63vrj5bny4iv60jgcfxxwy7qj4";
name = "kde-cli-tools-5.22.3.tar.xz"; name = "kde-cli-tools-5.22.4.tar.xz";
}; };
}; };
kdecoration = { kdecoration = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kdecoration-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kdecoration-5.22.4.tar.xz";
sha256 = "1bgygqi37yc34nhlf5w32zgz0qvrga9kh7ickxc2gydslvjwaq5p"; sha256 = "0cc0lskm359lbg93bxny84cf1qnk0h53f64bxy3dvbyn5gmvzsch";
name = "kdecoration-5.22.3.tar.xz"; name = "kdecoration-5.22.4.tar.xz";
}; };
}; };
kde-gtk-config = { kde-gtk-config = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kde-gtk-config-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kde-gtk-config-5.22.4.tar.xz";
sha256 = "1mq10qbp3jm4mdbkday1afwa0nj9zx8clvaw51qxprcphg4csjy8"; sha256 = "0d56brzpk5yi7cdyvpqg3jlk5n3l2dvk98npw34fd4i3gw357px8";
name = "kde-gtk-config-5.22.3.tar.xz"; name = "kde-gtk-config-5.22.4.tar.xz";
}; };
}; };
kdeplasma-addons = { kdeplasma-addons = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kdeplasma-addons-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kdeplasma-addons-5.22.4.tar.xz";
sha256 = "1hd3lv9sjlhab91lsxbg6rkgjcp50zy7n3sj51hdcbsdi8fjr9nh"; sha256 = "1flf4mq0zcjh7fnv155hklliidfvflh20d1s84rj8q2ka7phcwk0";
name = "kdeplasma-addons-5.22.3.tar.xz"; name = "kdeplasma-addons-5.22.4.tar.xz";
}; };
}; };
kgamma5 = { kgamma5 = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kgamma5-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kgamma5-5.22.4.tar.xz";
sha256 = "1v7jak4bpj5vhzqzq07v9v6b24xqp52k00dx43w2dhsh0vaas9sc"; sha256 = "0fgx9i031iqrp7w7v7px1vha079cjcdv9w5ah4k1m53g8abriddl";
name = "kgamma5-5.22.3.tar.xz"; name = "kgamma5-5.22.4.tar.xz";
}; };
}; };
khotkeys = { khotkeys = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/khotkeys-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/khotkeys-5.22.4.tar.xz";
sha256 = "0070nk02nwsbnikvf7qjw0wdxkpfv6nvyv1sw68whnm0xjgxnkl5"; sha256 = "1lm1xrbrpym7nhvnzljdgr5nsas8z3i0hgda53j5k6svzk5r3qg8";
name = "khotkeys-5.22.3.tar.xz"; name = "khotkeys-5.22.4.tar.xz";
}; };
}; };
kinfocenter = { kinfocenter = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kinfocenter-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kinfocenter-5.22.4.tar.xz";
sha256 = "1qkbhic99ddd55z3wvnhx1ykiy2ydanw32gs7gww8i0adwh0jc3b"; sha256 = "14vfz5j3fxhfb1fip00fgg9k6dc9ffjf0ss8ij1cx7bga14nmzvw";
name = "kinfocenter-5.22.3.tar.xz"; name = "kinfocenter-5.22.4.tar.xz";
}; };
}; };
kmenuedit = { kmenuedit = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kmenuedit-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kmenuedit-5.22.4.tar.xz";
sha256 = "1ldvx0mvzx3ym7aqz9hk044nn33b97n5bh757v8kwi8fy6yk10xx"; sha256 = "186j8ky5z3l0mmxx327xzahhsyf7wlds1rsmzzmlxficpg43n90b";
name = "kmenuedit-5.22.3.tar.xz"; name = "kmenuedit-5.22.4.tar.xz";
}; };
}; };
kscreen = { kscreen = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kscreen-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kscreen-5.22.4.tar.xz";
sha256 = "09ai5l3rnhsq3fy1faqg8q3hrikmsjq7gvh1rsw542v9ii37bgjn"; sha256 = "0hkn7ap55x4rzm6x3qdinjar9qhnb742zgzmvswy1kn3a8mxby17";
name = "kscreen-5.22.3.tar.xz"; name = "kscreen-5.22.4.tar.xz";
}; };
}; };
kscreenlocker = { kscreenlocker = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kscreenlocker-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kscreenlocker-5.22.4.tar.xz";
sha256 = "119jbpvni7id6d1kidi8n4nsxscisyc8ifd5a4q7y73sspdr46fp"; sha256 = "0i7c6a378h7366h7nl5051mwrx7cadzfaryfnhpskhlgy3l7119j";
name = "kscreenlocker-5.22.3.tar.xz"; name = "kscreenlocker-5.22.4.tar.xz";
}; };
}; };
ksshaskpass = { ksshaskpass = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/ksshaskpass-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/ksshaskpass-5.22.4.tar.xz";
sha256 = "1vgnz3j83yypymwqzi9r314zwgvaqp82akyfwzzfw60csb6vqdfr"; sha256 = "01f2rz1xqb1jy83427f7rmsb3a7ivkgf2qmm04kwjv29zplg796f";
name = "ksshaskpass-5.22.3.tar.xz"; name = "ksshaskpass-5.22.4.tar.xz";
}; };
}; };
ksystemstats = { ksystemstats = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/ksystemstats-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/ksystemstats-5.22.4.tar.xz";
sha256 = "0p19lcn8rmpxnnwa6crn9id6pwxixmh68yx6j3cy7z2l3ngfrnka"; sha256 = "1daz3890v7qbkcsb9m535mfnijdq3rbasxwqs0ixhn2m400yivvg";
name = "ksystemstats-5.22.3.tar.xz"; name = "ksystemstats-5.22.4.tar.xz";
}; };
}; };
kwallet-pam = { kwallet-pam = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kwallet-pam-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kwallet-pam-5.22.4.tar.xz";
sha256 = "0x2dw5rgqr0hysdbd4d7nqx4wkxh511xhwfikrgbc3m13vs7l8dg"; sha256 = "1ljrrgjvkvs3fsiijgaxj82hzp1fhsiy39r4amwp21v411c80jwq";
name = "kwallet-pam-5.22.3.tar.xz"; name = "kwallet-pam-5.22.4.tar.xz";
}; };
}; };
kwayland-integration = { kwayland-integration = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kwayland-integration-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kwayland-integration-5.22.4.tar.xz";
sha256 = "096a8b4pjc1l57jq08x7x181biichrjp5i3s9kyp2kkd09lk0niz"; sha256 = "17nl033vl8i9a92bjbgwwwrkf03lg4726lwdbj3y8xajdp8ql1nb";
name = "kwayland-integration-5.22.3.tar.xz"; name = "kwayland-integration-5.22.4.tar.xz";
}; };
}; };
kwayland-server = { kwayland-server = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kwayland-server-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kwayland-server-5.22.4.tar.xz";
sha256 = "0c5xcnj29d5j9zqj4qnqgs5732aqi6xqpxqwid20v551lf24kc6n"; sha256 = "0z3ni5ar2bwpc75ssb3qmkbff85a489sxr7vzqhxa40n48bp85ns";
name = "kwayland-server-5.22.3.tar.xz"; name = "kwayland-server-5.22.4.tar.xz";
}; };
}; };
kwin = { kwin = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kwin-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kwin-5.22.4.tar.xz";
sha256 = "03kd07p1hm6s8vkfjr1rlbjj9bpc48k5ynfb364dkypbfin5p6dw"; sha256 = "1x5338aib7kn1lgpb06b8s06bfj2ybfgyr6k0q91zlc53x61qamh";
name = "kwin-5.22.3.tar.xz"; name = "kwin-5.22.4.tar.xz";
}; };
}; };
kwrited = { kwrited = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/kwrited-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/kwrited-5.22.4.tar.xz";
sha256 = "063hmj24i3hvaw6wzjqs56ln6p9jjfz08f9r04wgzgg01zzyznjn"; sha256 = "1rbkbqf5v8wqd2aldpg396ki8a9fsw82jmzmdhsirq33r5yznn4i";
name = "kwrited-5.22.3.tar.xz"; name = "kwrited-5.22.4.tar.xz";
}; };
}; };
layer-shell-qt = { layer-shell-qt = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/layer-shell-qt-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/layer-shell-qt-5.22.4.tar.xz";
sha256 = "0jnfhq86419f9y0vs6l7z3n2f63xy7mwz1s0992zx44ambvwfpnq"; sha256 = "11iqk4bla0y0w2frmvzxi4a3jxj3cj2m8y473z3nfb0z8i5yca0m";
name = "layer-shell-qt-5.22.3.tar.xz"; name = "layer-shell-qt-5.22.4.tar.xz";
}; };
}; };
libkscreen = { libkscreen = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/libkscreen-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/libkscreen-5.22.4.tar.xz";
sha256 = "1whhxzbl8sh63490c222y2dn6qcx9rp8wxsmx8mpx9i7p0x3rl01"; sha256 = "0z2mzha22f2yl7l0ijy4pqpab6n1ivib3grnd583znff02wvj4d2";
name = "libkscreen-5.22.3.tar.xz"; name = "libkscreen-5.22.4.tar.xz";
}; };
}; };
libksysguard = { libksysguard = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/libksysguard-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/libksysguard-5.22.4.tar.xz";
sha256 = "0sjrm3g4wxscv0p9vkw0p6vr1hdysmngc1l57a26cg1z920zidjh"; sha256 = "14h66gs7z6gf7wrpdhpd1461431q2plv7kvfsh02fj52l1dzpcc0";
name = "libksysguard-5.22.3.tar.xz"; name = "libksysguard-5.22.4.tar.xz";
}; };
}; };
milou = { milou = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/milou-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/milou-5.22.4.tar.xz";
sha256 = "0qcy7snn3r16x0vyz57xv60fnjl565pfq9rd265n3w6543ivc09r"; sha256 = "11fa9bj3yzriaydfk8q9kc626yv0s0sal5ws13pcd6ksbhslz83s";
name = "milou-5.22.3.tar.xz"; name = "milou-5.22.4.tar.xz";
}; };
}; };
oxygen = { oxygen = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/oxygen-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/oxygen-5.22.4.tar.xz";
sha256 = "1fp425ifzk5fxapkwdc4q8xfyajs2skqg83sf1gqh9qsyniw47m5"; sha256 = "1p5hklryi02xw0byy5zcaxx5zw81vd6vq3s1h8dyhj07vspimpzw";
name = "oxygen-5.22.3.tar.xz"; name = "oxygen-5.22.4.tar.xz";
}; };
}; };
plasma-browser-integration = { plasma-browser-integration = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-browser-integration-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-browser-integration-5.22.4.tar.xz";
sha256 = "16mpzycxpag946l6fivr5gv5ns5wlmxq7q8mwmhmffa0byg87wxs"; sha256 = "023qbp77ga0jblhhx3437v9jjxx5va7q58abmnpv2nls1xwyq8hb";
name = "plasma-browser-integration-5.22.3.tar.xz"; name = "plasma-browser-integration-5.22.4.tar.xz";
}; };
}; };
plasma-desktop = { plasma-desktop = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-desktop-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-desktop-5.22.4.tar.xz";
sha256 = "046n6wxbdmjxhv1xvvdkb2vy76cpb7nkj7x5zpkmjy2ifa2q6nxx"; sha256 = "0c225lckhsmhig7xsnv5yfajys3w67g6xj4w1hvz1x3hqs79z3kj";
name = "plasma-desktop-5.22.3.tar.xz"; name = "plasma-desktop-5.22.4.tar.xz";
}; };
}; };
plasma-disks = { plasma-disks = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-disks-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-disks-5.22.4.tar.xz";
sha256 = "1a36mgd32743jmnib2gc9x5yg8ipv7zpjwjq087b39k7sr16c40l"; sha256 = "02brm36akqfhjz9fzyzfinjnb954glrrlwpyhiq1sx073v2ibyap";
name = "plasma-disks-5.22.3.tar.xz"; name = "plasma-disks-5.22.4.tar.xz";
}; };
}; };
plasma-firewall = { plasma-firewall = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-firewall-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-firewall-5.22.4.tar.xz";
sha256 = "09300mbq6g193k3bk51g0a21idw5lfvibciiw6dqpn4dxynb8i0d"; sha256 = "1c1mzpd45hd4sb6qsylqgq2x4fay1nskkgmcc1vswmnapcm9gp91";
name = "plasma-firewall-5.22.3.tar.xz"; name = "plasma-firewall-5.22.4.tar.xz";
}; };
}; };
plasma-integration = { plasma-integration = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-integration-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-integration-5.22.4.tar.xz";
sha256 = "02xsw10zn3p17zb6nqgbjlsmy6ayxyyr6krnmqdg5xz03p6m9whq"; sha256 = "0rslli0jsyyhm6prac3xgilwf58gjxqhsijgvr25sipg6200r2z0";
name = "plasma-integration-5.22.3.tar.xz"; name = "plasma-integration-5.22.4.tar.xz";
}; };
}; };
plasma-nano = { plasma-nano = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-nano-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-nano-5.22.4.tar.xz";
sha256 = "100ljwavpm02dvf0msp2al2hrjb2ki1zpm57bwkfaqj40knir6p6"; sha256 = "1ag57nphgkj3f17s42d81npk0z2n27623szbiz1hpgp7f6994l90";
name = "plasma-nano-5.22.3.tar.xz"; name = "plasma-nano-5.22.4.tar.xz";
}; };
}; };
plasma-nm = { plasma-nm = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-nm-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-nm-5.22.4.tar.xz";
sha256 = "1imq4j5a62idqjp0bqwbz2rqc9ln1dwxxarxkq68jiw7bvyy0rix"; sha256 = "1cvfawsqzk3yzjwnz6gc6l7p3pz9brbh0n6km23i1bis08rks168";
name = "plasma-nm-5.22.3.tar.xz"; name = "plasma-nm-5.22.4.tar.xz";
}; };
}; };
plasma-pa = { plasma-pa = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-pa-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-pa-5.22.4.tar.xz";
sha256 = "184a89qfn58ylakqjh524p3n4knvch85klz534jzxdxzb8kjmn0a"; sha256 = "1p000y08p89wvv73glv9ic0gdbdhc9fpzvphx72y420g5hhmnnwa";
name = "plasma-pa-5.22.3.tar.xz"; name = "plasma-pa-5.22.4.tar.xz";
}; };
}; };
plasma-phone-components = { plasma-phone-components = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-phone-components-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-phone-components-5.22.4.tar.xz";
sha256 = "1plp49acy83a1ls7i9aafckb62grwhsqv1i7l3hrzdd1ci7gsmxl"; sha256 = "0mkr7amxvr325y7f98y1368iv4gs6j2x6bkpi20rp8c2vifkvg5b";
name = "plasma-phone-components-5.22.3.tar.xz"; name = "plasma-phone-components-5.22.4.tar.xz";
}; };
}; };
plasma-sdk = { plasma-sdk = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-sdk-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-sdk-5.22.4.tar.xz";
sha256 = "0hn7im5wb2jka2q1g5gyp9hr8n000raxpk1rfcr09i8yrc6xhsnj"; sha256 = "0nrh3zbff25wr59hbsvrygjix56as8rd95smr5075qwdyamcqnhf";
name = "plasma-sdk-5.22.3.tar.xz"; name = "plasma-sdk-5.22.4.tar.xz";
}; };
}; };
plasma-systemmonitor = { plasma-systemmonitor = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-systemmonitor-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-systemmonitor-5.22.4.tar.xz";
sha256 = "1lz4j5cv405jfbx4bl522wica0xylc33hgsf8v5915d3i074z669"; sha256 = "1gl6kjk6b8xwcfrk6xf41jf1lh3zxr5b6qvdv7z6i8wb3pll63cb";
name = "plasma-systemmonitor-5.22.3.tar.xz"; name = "plasma-systemmonitor-5.22.4.tar.xz";
}; };
}; };
plasma-tests = { plasma-tests = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-tests-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-tests-5.22.4.tar.xz";
sha256 = "0qvgmk4idxr4ajj33frrsa2xpdgr53am4cvzs70g6fk3wfjm0b9z"; sha256 = "1wf33c0izm9yyjcysiimcpiwmsa64b4ypklga2rbg7kkk7q0nq82";
name = "plasma-tests-5.22.3.tar.xz"; name = "plasma-tests-5.22.4.tar.xz";
}; };
}; };
plasma-thunderbolt = { plasma-thunderbolt = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-thunderbolt-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-thunderbolt-5.22.4.tar.xz";
sha256 = "1f5vnf4zacgzvg9rbga90mcgjzfhrqq1qbbf16syi0xkbg031prz"; sha256 = "1c5ihvam5hfk7xiy3m707jjhpv2rxgl7d2f6m0d764zynm6zax79";
name = "plasma-thunderbolt-5.22.3.tar.xz"; name = "plasma-thunderbolt-5.22.4.tar.xz";
}; };
}; };
plasma-vault = { plasma-vault = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-vault-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-vault-5.22.4.tar.xz";
sha256 = "13vdbmbsz6bfjdsbhwv29rm515h7bk11lqc6hk2178yh9p4xn6nk"; sha256 = "1p6bl8as8rx36nzwx2rymqmx4rg7dg0bfrxr0flx9jqp1adclf39";
name = "plasma-vault-5.22.3.tar.xz"; name = "plasma-vault-5.22.4.tar.xz";
}; };
}; };
plasma-workspace = { plasma-workspace = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-workspace-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-workspace-5.22.4.tar.xz";
sha256 = "1mm4lpx094v62h05qlg0rbgk10g8aisnnr82ynyal4m1awahlp6r"; sha256 = "1fi0c66f2cgqcbshbaxzch75r28l5w4l3flggccil5c73lavf5mg";
name = "plasma-workspace-5.22.3.tar.xz"; name = "plasma-workspace-5.22.4.tar.xz";
}; };
}; };
plasma-workspace-wallpapers = { plasma-workspace-wallpapers = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plasma-workspace-wallpapers-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plasma-workspace-wallpapers-5.22.4.tar.xz";
sha256 = "0xay6zfrvz535n5cl3w40x63b5mvqmzmmha4csbwhingqrxyxqp3"; sha256 = "0abz3qic8m7dcbd0m1ci8qspfds3fdsqhgv8m6ks2jkcm7z4vnnr";
name = "plasma-workspace-wallpapers-5.22.3.tar.xz"; name = "plasma-workspace-wallpapers-5.22.4.tar.xz";
}; };
}; };
plymouth-kcm = { plymouth-kcm = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/plymouth-kcm-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/plymouth-kcm-5.22.4.tar.xz";
sha256 = "0xwn827xi0fwvwsrb69q6k8xgbgdjjhb50v4d9icy1n7dfjlbw19"; sha256 = "0vh39lidm0dqah14y7nkzqpanlkxpmylf7wc40giavady3d2i1y1";
name = "plymouth-kcm-5.22.3.tar.xz"; name = "plymouth-kcm-5.22.4.tar.xz";
}; };
}; };
polkit-kde-agent = { polkit-kde-agent = {
version = "1-5.22.3"; version = "1-5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/polkit-kde-agent-1-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/polkit-kde-agent-1-5.22.4.tar.xz";
sha256 = "16jdrqgibm9iv1j7vl9n8k7q4sqjqmvzcndq67wyva2lvy2xhjcw"; sha256 = "0pxrrn4qs96a5p9cp890vdq2g79ah72p655643ciqdb14936p0z2";
name = "polkit-kde-agent-1-5.22.3.tar.xz"; name = "polkit-kde-agent-1-5.22.4.tar.xz";
}; };
}; };
powerdevil = { powerdevil = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/powerdevil-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/powerdevil-5.22.4.tar.xz";
sha256 = "1i7zx8ykp73g8mav1k8jiizfz4f3lzjvsjf0ky74hklc610hgvb4"; sha256 = "17427sv6yh16hmgl94lyb4d7gds0r4hvx8vbbqhzysih2x81xl6m";
name = "powerdevil-5.22.3.tar.xz"; name = "powerdevil-5.22.4.tar.xz";
}; };
}; };
qqc2-breeze-style = { qqc2-breeze-style = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/qqc2-breeze-style-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/qqc2-breeze-style-5.22.4.tar.xz";
sha256 = "1pfpmqs4469sfk753915jjg78a61jjswzq2ckg1mrvpvjm6c3m3n"; sha256 = "15h9rjc4ry3kw18aw18r8y8av4cn2wckab8gyyi7zx7s54n6zpvc";
name = "qqc2-breeze-style-5.22.3.tar.xz"; name = "qqc2-breeze-style-5.22.4.tar.xz";
}; };
}; };
sddm-kcm = { sddm-kcm = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/sddm-kcm-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/sddm-kcm-5.22.4.tar.xz";
sha256 = "1cp421qk5plp0l3h0z3v6kkfm2qc3j1xk1q7xgfw7s6scrxkj1gp"; sha256 = "08j0qd288a5msagpyaqwrw0w6wymxsgqq3rlk8kv3n6qvrsm7174";
name = "sddm-kcm-5.22.3.tar.xz"; name = "sddm-kcm-5.22.4.tar.xz";
}; };
}; };
systemsettings = { systemsettings = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/systemsettings-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/systemsettings-5.22.4.tar.xz";
sha256 = "0hg999vk4nw8hpyl0wmy1h0bcgd9jc7xd1y073bd28bjjpywn5vq"; sha256 = "1ap2h1sa6hdakhf6lzy4bhaq5pxc8g7p32iz04894hd7dbb2iv8h";
name = "systemsettings-5.22.3.tar.xz"; name = "systemsettings-5.22.4.tar.xz";
}; };
}; };
xdg-desktop-portal-kde = { xdg-desktop-portal-kde = {
version = "5.22.3"; version = "5.22.4";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.22.3/xdg-desktop-portal-kde-5.22.3.tar.xz"; url = "${mirror}/stable/plasma/5.22.4/xdg-desktop-portal-kde-5.22.4.tar.xz";
sha256 = "1ggcnwvpp32912jgi2ly1541456kwk18q7a7z7l913vhfyrmsa5q"; sha256 = "1xmlw66bw60cl530hjjab8g4krv6di4wpimjaz0a9mv3dnq9xz7m";
name = "xdg-desktop-portal-kde-5.22.3.tar.xz"; name = "xdg-desktop-portal-kde-5.22.4.tar.xz";
}; };
}; };
} }

4
third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix vendored
View file

@ -51,11 +51,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "go"; pname = "go";
version = "1.15.14"; version = "1.15.15";
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz"; url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "sha256-YKSlxI1j0KE+yohJAJtiRin/QpyLxdGmqMPE2p805wo="; sha256 = "sha256-BmKuOBMzAoDV8al6LuI7vb46Wnz6YAGySphzoZoNx+w=";
}; };
# perl is used for testing go vet # perl is used for testing go vet

4
third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix vendored
View file

@ -51,11 +51,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "go"; pname = "go";
version = "1.16.6"; version = "1.16.7";
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz"; url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "sha256-o6XUvEAbUdsGXk+TtSM0ek00OuDAsIplw0I7BaE4A30="; sha256 = "sha256-Gp8olNPYeHKfcEUHLzC+zr4kNSTPL85OCnskix4GVKw=";
}; };
# perl is used for testing go vet # perl is used for testing go vet

28
third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix vendored
View file

@ -10,6 +10,9 @@
# Go linker flags, passed to go via -ldflags # Go linker flags, passed to go via -ldflags
, ldflags ? [] , ldflags ? []
# Go tags, passed to go via -tag
, tags ? []
# A function to override the go-modules derivation # A function to override the go-modules derivation
, overrideModAttrs ? (_oldAttrs : {}) , overrideModAttrs ? (_oldAttrs : {})
@ -26,6 +29,10 @@
# Whether to run the vend tool to regenerate the vendor directory. # Whether to run the vend tool to regenerate the vendor directory.
# This is useful if any dependency contain C files. # This is useful if any dependency contain C files.
, runVend ? false , runVend ? false
# Whether to fetch (go mod download) and proxy the vendor directory.
# This is useful if any dependency has case-insensitive conflicts
# which will produce platform dependant `vendorSha256` checksums.
, proxyVendor ? false
# We want parallel builds by default # We want parallel builds by default
, enableParallelBuilding ? true , enableParallelBuilding ? true
@ -43,6 +50,8 @@
with builtins; with builtins;
assert (runVend == true && proxyVendor == true) -> throw "can't use `runVend` and `proxyVendor` together";
assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`"; assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`";
let let
@ -94,6 +103,9 @@ let
${if runVend then '' ${if runVend then ''
echo "running 'vend' to rewrite vendor folder" echo "running 'vend' to rewrite vendor folder"
${vend}/bin/vend ${vend}/bin/vend
'' else if proxyVendor then ''
mkdir -p "''${GOPATH}/pkg/mod/cache/download"
go mod download
'' else '' '' else ''
go mod vendor go mod vendor
''} ''}
@ -106,8 +118,12 @@ let
installPhase = args.modInstallPhase or '' installPhase = args.modInstallPhase or ''
runHook preInstall runHook preInstall
# remove cached lookup results and tiles ${if proxyVendor then ''
rm -rf "''${GOPATH}/pkg/mod/cache/download/sumdb"
cp -r --reflink=auto "''${GOPATH}/pkg/mod/cache/download" $out
'' else ''
cp -r --reflink=auto vendor $out cp -r --reflink=auto vendor $out
''}
runHook postInstall runHook postInstall
''; '';
@ -127,7 +143,7 @@ let
inherit (go) GOOS GOARCH; inherit (go) GOOS GOARCH;
GO111MODULE = "on"; GO111MODULE = "on";
GOFLAGS = [ "-mod=vendor" ] ++ lib.optionals (!allowGoReference) [ "-trimpath" ]; GOFLAGS = lib.optionals (!proxyVendor) [ "-mod=vendor" ] ++ lib.optionals (!allowGoReference) [ "-trimpath" ];
configurePhase = args.configurePhase or '' configurePhase = args.configurePhase or ''
runHook preConfigure runHook preConfigure
@ -135,11 +151,15 @@ let
export GOCACHE=$TMPDIR/go-cache export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go" export GOPATH="$TMPDIR/go"
export GOSUMDB=off export GOSUMDB=off
export GOPROXY=off
cd "$modRoot" cd "$modRoot"
'' + lib.optionalString (go-modules != "") '' '' + lib.optionalString (go-modules != "") ''
${if proxyVendor then ''
export GOPROXY=file://${go-modules}
'' else ''
export GOPROXY=off
rm -rf vendor rm -rf vendor
cp -r --reflink=auto ${go-modules} vendor cp -r --reflink=auto ${go-modules} vendor
''}
'' + '' '' + ''
runHook postConfigure runHook postConfigure
@ -156,7 +176,7 @@ let
echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0 echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0
[ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
local OUT local OUT
if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then
if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
echo "$OUT" >&2 echo "$OUT" >&2
return 1 return 1

5
third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix vendored
View file

@ -10,6 +10,9 @@
# Go linker flags, passed to go via -ldflags # Go linker flags, passed to go via -ldflags
, ldflags ? [] , ldflags ? []
# Go tags, passed to go via -tag
, tags ? []
# We want parallel builds by default # We want parallel builds by default
, enableParallelBuilding ? true , enableParallelBuilding ? true
@ -151,7 +154,7 @@ let
echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0
[ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
local OUT local OUT
if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then
if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
echo "$OUT" >&2 echo "$OUT" >&2
return 1 return 1

4
third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix vendored
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "armadillo"; pname = "armadillo";
version = "10.6.1"; version = "10.6.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
sha256 = "sha256-HQbDI31lx7xGHqEvT9/YtaabapZbSQCucJYM6SCIF58="; sha256 = "sha256-KoA9b4921AfbnBXtw4lJZSOMjliflMyQeoNz7pRXKKg=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

7
third_party/nixpkgs/pkgs/development/libraries/libgrss/default.nix vendored
View file

@ -1,11 +1,8 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }: { lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }:
let stdenv.mkDerivation rec {
version = "0.7.0";
pname = "libgrss"; pname = "libgrss";
in version = "0.7.0";
stdenv.mkDerivation {
name = "${pname}-${version}";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];

6
third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix vendored
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libraspberrypi"; pname = "libraspberrypi";
version = "unstable-2021-03-17"; version = "unstable-2021-06-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "userland"; repo = "userland";
rev = "3fd8527eefd8790b4e8393458efc5f94eb21a615"; rev = "97bc8180ad682b004ea224d1db7b8e108eda4397";
sha256 = "099qxh4bjzwd431ffpdhzx0gzlrkdyf66wplgkwg2rrfrc9zlv5a"; sha256 = "0cnjc7w8ynayj90vlpl13xzm9izd8m5b4cvrq52si9vc6wlm4in5";
}; };
patches = [ patches = [

4
third_party/nixpkgs/pkgs/development/libraries/ndi/default.nix vendored
View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ndi"; pname = "ndi";
fullVersion = "4.6.0"; fullVersion = "4.6.2";
version = builtins.head (builtins.splitVersion fullVersion); version = builtins.head (builtins.splitVersion fullVersion);
src = requireFile rec { src = requireFile rec {
name = "InstallNDISDK_v${version}_Linux.tar.gz"; name = "InstallNDISDK_v${version}_Linux.tar.gz";
sha256 = "19jrj2v7x1amdpc9pdq3042vm2l3szwqbzb83lirgbc24s2q043m"; sha256 = "181ypfj1bl0kljzrfr6037i14ykg2y4plkzdhym6m3z7kcrnm1fl";
message = '' message = ''
In order to use NDI SDK version ${fullVersion}, you need to comply with In order to use NDI SDK version ${fullVersion}, you need to comply with
NewTek's license and download the appropriate Linux tarball from: NewTek's license and download the appropriate Linux tarball from:

1
third_party/nixpkgs/pkgs/development/node-packages/node-packages.json vendored
View file

@ -266,6 +266,7 @@
, "unified-language-server" , "unified-language-server"
, "vega-cli" , "vega-cli"
, "vega-lite" , "vega-lite"
, "vercel"
, "vim-language-server" , "vim-language-server"
, "vls" , "vls"
, "vscode-css-languageserver-bin" , "vscode-css-languageserver-bin"

1432
third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix generated vendored
View file

File diff suppressed because it is too large Load diff

17
third_party/nixpkgs/pkgs/development/python-modules/GitPython/default.nix vendored
View file

@ -1,7 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchFromGitHub
, isPy27
, substituteAll , substituteAll
, git , git
, gitdb , gitdb
@ -11,13 +10,15 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "GitPython"; pname = "gitpython";
version = "3.1.19"; version = "3.1.20";
disabled = isPy27; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "gitpython-developers";
sha256 = "0lqf5plm02aw9zl73kffk7aa4mp4girm3f2yfk27nmmmjsdh7x0q"; repo = "GitPython";
rev = version;
sha256 = "1ygrxn8br2ff87j02ibijxzxa0ax9lgjdviwddslqxiarfggik9h";
}; };
patches = [ patches = [

37
third_party/nixpkgs/pkgs/development/python-modules/adax/default.nix vendored Normal file
View file

@ -0,0 +1,37 @@
{ lib
, aiohttp
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "adax";
version = "0.1.0";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pyadax";
rev = version;
sha256 = "06qk8xbv8lsaabdpi6pclnbkp3vmb4k18spahldazqj8235ii237";
};
propagatedBuildInputs = [
aiohttp
async-timeout
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "adax" ];
meta = with lib; {
description = "Python module to communicate with Adax";
homepage = "https://github.com/Danielhiversen/pyAdax";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix vendored
View file

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mdformat"; pname = "mdformat";
version = "0.7.7"; version = "0.7.8";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "executablebooks"; owner = "executablebooks";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-1qwluHxZnSuyNJENzeJzkuhIQN5njTOch2Wz45J0qRI="; sha256 = "0zvgz2c517ig31hcrf05gv4h68zpqk56asnmwx072ld8gk2ff8ag";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

2
third_party/nixpkgs/pkgs/development/python-modules/notmuch/2.nix vendored
View file

@ -10,7 +10,7 @@ buildPythonPackage {
pname = "notmuch2"; pname = "notmuch2";
inherit (notmuch) version src; inherit (notmuch) version src;
sourceRoot = "${notmuch.src.name}/bindings/python-cffi"; sourceRoot = "notmuch-${notmuch.version}/bindings/python-cffi";
buildInputs = [ python notmuch cffi ]; buildInputs = [ python notmuch cffi ];

37
third_party/nixpkgs/pkgs/development/python-modules/open-garage/default.nix vendored Normal file
View file

@ -0,0 +1,37 @@
{ lib
, aiohttp
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "open-garage";
version = "0.1.5";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pyOpenGarage";
rev = version;
sha256 = "1iqcqkbb1ik5lmsvwgy6i780x6y3wlm1gx257anxyvp1b21gm24p";
};
propagatedBuildInputs = [
aiohttp
async-timeout
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "opengarage" ];
meta = with lib; {
description = "Python module to communicate with opengarage.io";
homepage = "https://github.com/Danielhiversen/pyOpenGarage";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

39
third_party/nixpkgs/pkgs/development/python-modules/pyprosegur/default.nix vendored Normal file
View file

@ -0,0 +1,39 @@
{ lib
, aiohttp
, backoff
, buildPythonPackage
, click
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyprosegur";
version = "0.0.5";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "dgomes";
repo = pname;
rev = version;
sha256 = "0bpzxm8s548fw6j36brp7bcx9481x2hrypcw3yyg4ihsjhka5qln";
};
propagatedBuildInputs = [
aiohttp
backoff
click
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pyprosegur" ];
meta = with lib; {
description = "Python module to communicate with Prosegur Residential Alarms";
homepage = "https://github.com/dgomes/pyprosegur";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix vendored
View file

@ -5,13 +5,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "tfsec"; pname = "tfsec";
version = "0.55.1"; version = "0.56.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aquasecurity"; owner = "aquasecurity";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0s18hfy1gnnvhppvapj8n066pb0fc7w3sm0zm0mzjd58h11x0bbr"; sha256 = "0kv9g11jgbrbb50qhlfznw9i473gw8vadrrlkvki6y3cfcavghkv";
}; };
goPackagePath = "github.com/aquasecurity/tfsec"; goPackagePath = "github.com/aquasecurity/tfsec";

4
third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix vendored
View file

@ -8,11 +8,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sbt"; pname = "sbt";
version = "1.5.4"; version = "1.5.5";
src = fetchurl { src = fetchurl {
url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
sha256 = "035jl4czx9ixl12z874bksq5wxdnajxr06cl1yvfj2v92yx3l5wf"; sha256 = "1jdknan2gckkfl79pzshgb4009xn2y3nlp0ws1xd47n9yl6dbz60";
}; };
postPatch = '' postPatch = ''

4
third_party/nixpkgs/pkgs/development/tools/butane/default.nix vendored
View file

@ -4,13 +4,13 @@ with lib;
buildGoModule rec { buildGoModule rec {
pname = "butane"; pname = "butane";
version = "0.13.0"; version = "0.13.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coreos"; owner = "coreos";
repo = "butane"; repo = "butane";
rev = "v${version}"; rev = "v${version}";
sha256 = "0z1cq43dnj73k0idjhc310h00a1mryk2297w3yy6k1sa95swlz9m"; sha256 = "sha256-wrz9+McHW2NNMsB3uOZIceykYBlSgl2WErAT8bMlkXo=";
}; };
vendorSha256 = null; vendorSha256 = null;

13
third_party/nixpkgs/pkgs/development/tools/doctl/default.nix vendored
View file

@ -10,13 +10,12 @@ buildGoModule rec {
subPackages = [ "cmd/doctl" ]; subPackages = [ "cmd/doctl" ];
buildFlagsArray = let t = "github.com/digitalocean/doctl"; in '' ldflags = let t = "github.com/digitalocean/doctl"; in [
-ldflags= "-X ${t}.Major=${lib.versions.major version}"
-X ${t}.Major=${lib.versions.major version} "-X ${t}.Minor=${lib.versions.minor version}"
-X ${t}.Minor=${lib.versions.minor version} "-X ${t}.Patch=${lib.versions.patch version}"
-X ${t}.Patch=${lib.versions.patch version} "-X ${t}.Label=release"
-X ${t}.Label=release ];
'';
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

4
third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix vendored
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "esbuild"; pname = "esbuild";
version = "0.12.17"; version = "0.12.18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "evanw"; owner = "evanw";
repo = "esbuild"; repo = "esbuild";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-wZOBjNOgGmwIQNCrhzwGPmI/fW/yZiDqq8l4oSDTvZs="; sha256 = "sha256-sq5gdsrcakghd71+nXrtI980mlA6+GZW36tJkJkaJ2U=";
}; };
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";

4
third_party/nixpkgs/pkgs/development/tools/jbang/default.nix vendored
View file

@ -1,12 +1,12 @@
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.77.0"; version = "0.78.0";
pname = "jbang"; pname = "jbang";
src = fetchzip { src = fetchzip {
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
sha256 = "sha256-EOseHe0CrSzOI/NgPk0Q24nzeOSV6X8GVFNPstou/Ng="; sha256 = "sha256-03CuKNQtKdhD6fFYfsmeNR18oRGL5vWG7Lb+srNw8XU=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

2
third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix vendored
View file

@ -17,7 +17,7 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; ldflags = [ "-X main.version=${version}" ];
postInstall = '' postInstall = ''
installManPage docs/editorconfig-checker.1 installManPage docs/editorconfig-checker.1

2
third_party/nixpkgs/pkgs/development/tools/packer/default.nix vendored
View file

@ -15,7 +15,7 @@ buildGoModule rec {
subPackages = [ "." ]; subPackages = [ "." ];
buildFlagsArray = [ "-ldflags=-s -w" ]; ldflags = [ "-s" "-w" ];
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

2
third_party/nixpkgs/pkgs/development/tools/tychus/default.nix vendored
View file

@ -17,7 +17,7 @@ buildGoPackage rec {
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ];
buildFlags = [ "--tags" "release" ]; tags = [ "release" ];
meta = { meta = {
description = "Command line utility to live-reload your application"; description = "Command line utility to live-reload your application";

10
third_party/nixpkgs/pkgs/games/terraria-server/default.nix vendored
View file

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
urlVersion = lib.replaceChars [ "." ] [ "" ] version; urlVersion = lib.replaceChars [ "." ] [ "" ] version;
src = fetchurl { src = fetchurl {
url = "https://terraria.org/system/dedicated_servers/archives/000/000/046/original/terraria-server-${urlVersion}.zip"; url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip";
sha256 = "0qm4pbm1d9gax47fk4zhw9rcxvajxs36w7dghirli89i994r7g8j"; sha256 = "0qm4pbm1d9gax47fk4zhw9rcxvajxs36w7dghirli89i994r7g8j";
}; };
@ -14,17 +14,21 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoPatchelfHook unzip ]; nativeBuildInputs = [ autoPatchelfHook unzip ];
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/bin mkdir -p $out/bin
cp -r Linux $out/ cp -r Linux $out/
chmod +x "$out/Linux/TerrariaServer.bin.x86_64" chmod +x "$out/Linux/TerrariaServer.bin.x86_64"
ln -s "$out/Linux/TerrariaServer.bin.x86_64" $out/bin/TerrariaServer ln -s "$out/Linux/TerrariaServer.bin.x86_64" $out/bin/TerrariaServer
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {
homepage = "https://terraria.org"; homepage = "https://terraria.org";
description = description = "Dedicated server for Terraria, a 2D action-adventure sandbox";
"Dedicated server for Terraria, a 2D action-adventure sandbox";
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ ncfavier ];
}; };
} }

168
third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix vendored
View file

@ -77,12 +77,12 @@ final: prev:
ale = buildVimPluginFrom2Nix { ale = buildVimPluginFrom2Nix {
pname = "ale"; pname = "ale";
version = "2021-08-04"; version = "2021-08-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dense-analysis"; owner = "dense-analysis";
repo = "ale"; repo = "ale";
rev = "9eb39348e928e6a89938784e67ba4168c5a295c0"; rev = "10f984673c51d2affbf8dc69d79a6280d7b69060";
sha256 = "18j5zpkkir9yxcvmyggglh76fzny1i9z6pkj2bdszvz8rxw8z88y"; sha256 = "1gj2hg9qpkxnqks395a4rvgy40a7qg4q260xa8a8zymdf476h57f";
}; };
meta.homepage = "https://github.com/dense-analysis/ale/"; meta.homepage = "https://github.com/dense-analysis/ale/";
}; };
@ -281,12 +281,12 @@ final: prev:
barbar-nvim = buildVimPluginFrom2Nix { barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar-nvim"; pname = "barbar-nvim";
version = "2021-08-03"; version = "2021-08-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "romgrk"; owner = "romgrk";
repo = "barbar.nvim"; repo = "barbar.nvim";
rev = "f677f1d93be06c41eaabc87d845cdd5bd46a259f"; rev = "fbe62f62bbe16c871073868fe29d7ffdd3d1251e";
sha256 = "1crd8gyzqgycbcb9aipn31kphz3j1y1rlzqivfvgk2zqf550dqis"; sha256 = "14hzbpgkalia7j42zr0gnddbh2rnxv149xvlzl39wkzjk7gxjz0y";
}; };
meta.homepage = "https://github.com/romgrk/barbar.nvim/"; meta.homepage = "https://github.com/romgrk/barbar.nvim/";
}; };
@ -425,12 +425,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix { chadtree = buildVimPluginFrom2Nix {
pname = "chadtree"; pname = "chadtree";
version = "2021-08-05"; version = "2021-08-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "chadtree"; repo = "chadtree";
rev = "681950778d7b4e18cb28d5cc7ba54bc480aad232"; rev = "7db60eee751787035a3f152040fdf6b48104453e";
sha256 = "11g7a86sprfdch68xwabkfr5gv9jpmji587cw1h5cabbzxslrvcg"; sha256 = "08hqx031gd8sd7lvzx4n429311p3nihhp1k1knsq3yn8yfrj915m";
}; };
meta.homepage = "https://github.com/ms-jpq/chadtree/"; meta.homepage = "https://github.com/ms-jpq/chadtree/";
}; };
@ -1667,12 +1667,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix { friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets"; pname = "friendly-snippets";
version = "2021-08-04"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rafamadriz"; owner = "rafamadriz";
repo = "friendly-snippets"; repo = "friendly-snippets";
rev = "97942a726bf7e4851d8d1812e910e8f9d489f909"; rev = "bf2ebdfba23a10a7b9dea62b23dfaa7a1bc0852d";
sha256 = "1mqgy6jps6g69x1jj3x60hcr3szpfnwvvyjyafqbd3wpc313pnwq"; sha256 = "100iif4is145fgr3hzqk4k9d3jhdl3lh6nbl4n7xrahkh9fxw6s8";
}; };
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
}; };
@ -1871,12 +1871,12 @@ final: prev:
gitsigns-nvim = buildVimPluginFrom2Nix { gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim"; pname = "gitsigns-nvim";
version = "2021-08-03"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "f8786ea3bfe69fccadec6ef7fa64d4188f788729"; rev = "8d284060170bcc96987b3c431a7c8fa3aef9e1cc";
sha256 = "028l9x94yi5ffjp44vsjyyalxnax0691aiiy22c143pcd5wv5w3q"; sha256 = "1x2pwb8d8azfmpfpyhx9anfh6ji2viwi98zfgqp12q7bq9rvf9h3";
}; };
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
}; };
@ -2231,12 +2231,12 @@ final: prev:
indent-blankline-nvim = buildVimPluginFrom2Nix { indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline-nvim"; pname = "indent-blankline-nvim";
version = "2021-08-04"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lukas-reineke"; owner = "lukas-reineke";
repo = "indent-blankline.nvim"; repo = "indent-blankline.nvim";
rev = "f452ba25ecae318c591b4e6983aa5bd9ac6fd8e6"; rev = "134a1ace3274e14cf3f2c9b845f6a62c58d2f2de";
sha256 = "13aqr4gigpjjz0g25y8q48hb0sfa6xxgp0lr8hk1ykv8w0nwlgra"; sha256 = "1n3cbfvm4jdiwhv2hc6379xqjpjpdfzvz9zs2zpb1pj9qjdznqcc";
}; };
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
}; };
@ -2592,12 +2592,12 @@ final: prev:
lightline-bufferline = buildVimPluginFrom2Nix { lightline-bufferline = buildVimPluginFrom2Nix {
pname = "lightline-bufferline"; pname = "lightline-bufferline";
version = "2021-06-09"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mengelbrecht"; owner = "mengelbrecht";
repo = "lightline-bufferline"; repo = "lightline-bufferline";
rev = "ce6b2e1e09654af34a80af774879eac4708cc11e"; rev = "2d2e57009a613c3c6cb7a2112d822ef91024cc38";
sha256 = "0cv5845d1gg9mv5pcp8c9afydvgihgfyk7ibjr3fgkqacwcfzjmy"; sha256 = "066x2hkav2k83rjdnv3hmmm7fx4rrp4ab8704sc7p57q965kpwgc";
}; };
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
}; };
@ -2712,12 +2712,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix { lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature-nvim"; pname = "lsp_signature-nvim";
version = "2021-08-04"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ray-x"; owner = "ray-x";
repo = "lsp_signature.nvim"; repo = "lsp_signature.nvim";
rev = "444f5e0a27ca58040c33715be8c3b6051db17230"; rev = "04126aa17cbe863a4fe8ca43653cd9ef70f29c18";
sha256 = "0rijkdsnxdkyrrpib0qlszjkkx33cm3nb9spcmjrcqi6674kyq88"; sha256 = "0w2jxbbmgdlh9hakzjy2i229qlcj7krh1xb7b1ds7y27prb1h144";
}; };
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
}; };
@ -3144,12 +3144,12 @@ final: prev:
neco-vim = buildVimPluginFrom2Nix { neco-vim = buildVimPluginFrom2Nix {
pname = "neco-vim"; pname = "neco-vim";
version = "2021-08-03"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Shougo"; owner = "Shougo";
repo = "neco-vim"; repo = "neco-vim";
rev = "fb97a98717450fca16e5d2f8db667f7df227ba3c"; rev = "ec50b3cbb4537625c2aaba7601232a53ccd779aa";
sha256 = "1d0l7d2mlm0dq6m13mr8958qc257bhhgl0y4xilpdkfgx35vir34"; sha256 = "0k5l9phs211xw6c3q9q52x6m6gfhk4b2fxhyr3m19mghbzmichha";
}; };
meta.homepage = "https://github.com/Shougo/neco-vim/"; meta.homepage = "https://github.com/Shougo/neco-vim/";
}; };
@ -3180,12 +3180,12 @@ final: prev:
neoformat = buildVimPluginFrom2Nix { neoformat = buildVimPluginFrom2Nix {
pname = "neoformat"; pname = "neoformat";
version = "2021-07-23"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sbdchd"; owner = "sbdchd";
repo = "neoformat"; repo = "neoformat";
rev = "b676afbf57bd3fb256a7a45605cac06407eff5a1"; rev = "1ff0099c62dad62f1126dba15b61b35d54aa607f";
sha256 = "1ln4sqj00xw2dnn3gwshxdzaq5gaknbs59cksrr7i7mj902lqr8v"; sha256 = "18xczksv70v18xh6f40d5bad2f890vm8gyg5xqh7sh2vh9jdg0jz";
}; };
meta.homepage = "https://github.com/sbdchd/neoformat/"; meta.homepage = "https://github.com/sbdchd/neoformat/";
}; };
@ -3708,12 +3708,12 @@ final: prev:
nvim-highlite = buildVimPluginFrom2Nix { nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite"; pname = "nvim-highlite";
version = "2021-08-04"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Iron-E"; owner = "Iron-E";
repo = "nvim-highlite"; repo = "nvim-highlite";
rev = "9465c24cb8f4293569f6a4e937a3a38a4416a072"; rev = "929cb313e90589576348c3a2e9a18bac8a56999c";
sha256 = "0l484w17bb0kdk1k7dhxj5322a8xsh374ma6yci92jh7sv3dp60f"; sha256 = "0j48zy517px40w119xad97zja0p7fspapnd1n70w3lq9ank0l7a1";
}; };
meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
}; };
@ -3768,12 +3768,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2021-08-01"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "4bcc485e2e6ccb4ed7bdd9f1e12c9c4ad6fe1f0e"; rev = "662159eeb112c076d90b2c3fe799f16a8165e4a6";
sha256 = "18csqavwmdz7yn6j1wp9ypmpdkw6147xvn4gmd50wkphfh74bc67"; sha256 = "0jazw69444zcvvzj7j8k2zjqwyymgcsvz42pxq10ll58apmjrzri";
}; };
meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
}; };
@ -3804,12 +3804,12 @@ final: prev:
nvim-notify = buildVimPluginFrom2Nix { nvim-notify = buildVimPluginFrom2Nix {
pname = "nvim-notify"; pname = "nvim-notify";
version = "2021-08-04"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rcarriga"; owner = "rcarriga";
repo = "nvim-notify"; repo = "nvim-notify";
rev = "bc18fb4552f051639eade5318f1d538ffe0302f5"; rev = "14029645caaecaa4392a6f89bf087a4aec5672cd";
sha256 = "1l5fi8c59zqyjgkikbrxas4klfa11j17bl72qxg3kj8isnfalspj"; sha256 = "0pviz0dh519yaddrb3lrsa8pg1q4dp4h2a2chzh2nnwhr7973qjr";
}; };
meta.homepage = "https://github.com/rcarriga/nvim-notify/"; meta.homepage = "https://github.com/rcarriga/nvim-notify/";
}; };
@ -3982,6 +3982,18 @@ final: prev:
meta.homepage = "https://github.com/roxma/nvim-yarp/"; meta.homepage = "https://github.com/roxma/nvim-yarp/";
}; };
nvim_context_vt = buildVimPluginFrom2Nix {
pname = "nvim_context_vt";
version = "2021-08-03";
src = fetchFromGitHub {
owner = "haringsrob";
repo = "nvim_context_vt";
rev = "7e93fc59c2af9e36d64a230ec77c1ef1ebe47c57";
sha256 = "0mgafpcx5mz9hw7pv3a4v74kdikcrf9mv10mqnp5pg71m0f6sjmn";
};
meta.homepage = "https://github.com/haringsrob/nvim_context_vt/";
};
nvimdev-nvim = buildVimPluginFrom2Nix { nvimdev-nvim = buildVimPluginFrom2Nix {
pname = "nvimdev-nvim"; pname = "nvimdev-nvim";
version = "2019-10-09"; version = "2019-10-09";
@ -4092,12 +4104,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix { packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim"; pname = "packer-nvim";
version = "2021-08-01"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wbthomason"; owner = "wbthomason";
repo = "packer.nvim"; repo = "packer.nvim";
rev = "2794f0767920c884736b746d1c0824cc55874f4b"; rev = "a6901b9d15dc17be94a2caf6b2fb8d1323278a74";
sha256 = "19cwjm98nq0f9z0kxc8l4350pkaw3m2dv5wb7nlwcz0m9w3dri0w"; sha256 = "0lyq8pi0c9665gjhg3wzx8889xq649fjld1cbv5bm2znmq000c8j";
}; };
meta.homepage = "https://github.com/wbthomason/packer.nvim/"; meta.homepage = "https://github.com/wbthomason/packer.nvim/";
}; };
@ -4887,12 +4899,12 @@ final: prev:
sql-nvim = buildVimPluginFrom2Nix { sql-nvim = buildVimPluginFrom2Nix {
pname = "sql-nvim"; pname = "sql-nvim";
version = "2021-07-19"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tami5"; owner = "tami5";
repo = "sql.nvim"; repo = "sql.nvim";
rev = "9983108bc9941af842d3b847b60564d180fc8e4b"; rev = "527a306000c02f81075045d461349efcfa26c022";
sha256 = "1f1f1v107w61b86pdrs9qvchyg286nif31c5cp3yx6rq22fynbgd"; sha256 = "1v99ibx1ypijpm1icy0lsyfvf41rz0zhv18rvhrinyphr0jl546j";
}; };
meta.homepage = "https://github.com/tami5/sql.nvim/"; meta.homepage = "https://github.com/tami5/sql.nvim/";
}; };
@ -4983,12 +4995,12 @@ final: prev:
swift-vim = buildVimPluginFrom2Nix { swift-vim = buildVimPluginFrom2Nix {
pname = "swift-vim"; pname = "swift-vim";
version = "2021-05-30"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "keith"; owner = "keith";
repo = "swift.vim"; repo = "swift.vim";
rev = "7ef452b47f14a2bfed26324793777cf12d2a8d78"; rev = "e83ca052e88805b8b20bc2558e7995461665e306";
sha256 = "0s12iv8vmqp8yr8fg7a6yf73kgq84i9zy18fhgb0jcc6cwwwz3iq"; sha256 = "1in7dz0h9a4phw57a3fk7h2lmn3hrcn17vaqjimpp7hwlc160467";
}; };
meta.homepage = "https://github.com/keith/swift.vim/"; meta.homepage = "https://github.com/keith/swift.vim/";
}; };
@ -5152,12 +5164,12 @@ final: prev:
telescope-frecency-nvim = buildVimPluginFrom2Nix { telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency-nvim"; pname = "telescope-frecency-nvim";
version = "2021-08-04"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope-frecency.nvim"; repo = "telescope-frecency.nvim";
rev = "31e8158d54ce945dc416b1f53df827aa3c096c55"; rev = "459041fb42d81c65444b147d25b1e28b0c8ac8f9";
sha256 = "1q2bf21gymjjx603159x59sg1ahwgsqais6q5laz4cpcwmxmwq7f"; sha256 = "0n4bv22azqgvqk00dcnxzafpx1mkdfm6ds3w6pyn0mflkfninfb7";
}; };
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
}; };
@ -5321,12 +5333,12 @@ final: prev:
todo-comments-nvim = buildVimPluginFrom2Nix { todo-comments-nvim = buildVimPluginFrom2Nix {
pname = "todo-comments-nvim"; pname = "todo-comments-nvim";
version = "2021-07-11"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "todo-comments.nvim"; repo = "todo-comments.nvim";
rev = "4a27e05519827ba1594d5ce3fde874040f005bfe"; rev = "808a2e524b3720804716a99fd900986b9d727d4d";
sha256 = "0g6dxyd7vh89rg4xfdl20djfdcv1scq44mvxd3imzb7yhrhdpa95"; sha256 = "1j1ls4d6c3shbm9pd0b6lwmccxsvlr8j12c3fhn9q6dizkir08qx";
}; };
meta.homepage = "https://github.com/folke/todo-comments.nvim/"; meta.homepage = "https://github.com/folke/todo-comments.nvim/";
}; };
@ -5346,12 +5358,12 @@ final: prev:
tokyonight-nvim = buildVimPluginFrom2Nix { tokyonight-nvim = buildVimPluginFrom2Nix {
pname = "tokyonight-nvim"; pname = "tokyonight-nvim";
version = "2021-07-21"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "tokyonight.nvim"; repo = "tokyonight.nvim";
rev = "0ee0bcf14d8c7c70081a0e9967c211121c4300c7"; rev = "a5b3cbe750ed6a05a018ac81782bb01de512a6c9";
sha256 = "0rkw544dzgyp76ag3zrh8d3n0mri5c0cjpy8mvbfpgyj87w18m8d"; sha256 = "1zggbj1xkqigc9rk6mm6jdwk67kcq1avrrq3hxy7jkfc11ynbl91";
}; };
meta.homepage = "https://github.com/folke/tokyonight.nvim/"; meta.homepage = "https://github.com/folke/tokyonight.nvim/";
}; };
@ -5394,12 +5406,12 @@ final: prev:
trouble-nvim = buildVimPluginFrom2Nix { trouble-nvim = buildVimPluginFrom2Nix {
pname = "trouble-nvim"; pname = "trouble-nvim";
version = "2021-07-22"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "trouble.nvim"; repo = "trouble.nvim";
rev = "169b2ec3a4d0cac01f22cc8f7332f1d0a11f1fa4"; rev = "51dd9175eb506b026189c70f81823dfa77defe86";
sha256 = "08r1ivzw6v5bfyhd7cy6kysryd123f68aa3kpamzy168ixvihbii"; sha256 = "0cd3xiiwsqivy8vx408wdz622i7kcvxw6whmkm1dcw6lnsp4bcg1";
}; };
meta.homepage = "https://github.com/folke/trouble.nvim/"; meta.homepage = "https://github.com/folke/trouble.nvim/";
}; };
@ -5430,12 +5442,12 @@ final: prev:
twilight-nvim = buildVimPluginFrom2Nix { twilight-nvim = buildVimPluginFrom2Nix {
pname = "twilight-nvim"; pname = "twilight-nvim";
version = "2021-07-17"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "twilight.nvim"; repo = "twilight.nvim";
rev = "f722fa24411d0423a3d2daf6f1b5f8b11df9db2b"; rev = "0ac66e85f2d8d7c6eb7d263ffc39fa19b56d882f";
sha256 = "0k2vbhs960h346w37ky2mpv1syzjxi19zl9zmnvlsy6annqd892x"; sha256 = "0a0bbj9lwpxwql8m56qxr1qjvfb3qb1cj6knfhdvgaskilv5mlg1";
}; };
meta.homepage = "https://github.com/folke/twilight.nvim/"; meta.homepage = "https://github.com/folke/twilight.nvim/";
}; };
@ -6102,12 +6114,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix { vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap"; pname = "vim-clap";
version = "2021-07-27"; version = "2021-08-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "liuchengxu"; owner = "liuchengxu";
repo = "vim-clap"; repo = "vim-clap";
rev = "5fa131dc95a7b3e03fa1307802b3a43419571921"; rev = "cf229cd88ecf9ee9e157d6737770b289de24d3bd";
sha256 = "10viqhmyvw8lik53gbslfxfsv36f1vl8qi0vzn7zi6waqdrr3n79"; sha256 = "06cn9z7p39qvp34533azj2xc3jyj6bi8kb4aasq52awizdg3flvz";
}; };
meta.homepage = "https://github.com/liuchengxu/vim-clap/"; meta.homepage = "https://github.com/liuchengxu/vim-clap/";
}; };
@ -6882,12 +6894,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix { vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive"; pname = "vim-fugitive";
version = "2021-08-03"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tpope"; owner = "tpope";
repo = "vim-fugitive"; repo = "vim-fugitive";
rev = "7a087725eebedf4c23b621d9a25ca6fac9a0a985"; rev = "e9f913ff8a6f76062e0aa95b60d740ec690f6f4f";
sha256 = "0gvgi6sp6imjf865jfj5di8zvivm8hsfpg2qjjx0q4kss821yznm"; sha256 = "0i2j15yqndzfisf7x1cdszs7s32gh57wravgar3pmk13ffcx4n0s";
}; };
meta.homepage = "https://github.com/tpope/vim-fugitive/"; meta.homepage = "https://github.com/tpope/vim-fugitive/";
}; };
@ -7748,12 +7760,12 @@ final: prev:
vim-maktaba = buildVimPluginFrom2Nix { vim-maktaba = buildVimPluginFrom2Nix {
pname = "vim-maktaba"; pname = "vim-maktaba";
version = "2021-08-03"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "vim-maktaba"; repo = "vim-maktaba";
rev = "92b8483abb3b128b2a64782c60c2a236b2484a99"; rev = "339ab52b488b2d9ced5dde5ebd734b95bc6500f3";
sha256 = "1prx8hhjdh4bs1c25jxjis151d1kg3vxdy5f9scwgas9a79ii3lw"; sha256 = "1191bdrlc2sxwfick7y82cvl2hsxai32sdspxpwskbigyzsd6xks";
}; };
meta.homepage = "https://github.com/google/vim-maktaba/"; meta.homepage = "https://github.com/google/vim-maktaba/";
}; };
@ -9923,12 +9935,12 @@ final: prev:
which-key-nvim = buildVimPluginFrom2Nix { which-key-nvim = buildVimPluginFrom2Nix {
pname = "which-key-nvim"; pname = "which-key-nvim";
version = "2021-07-06"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "which-key.nvim"; repo = "which-key.nvim";
rev = "dc9c3be7acae2a486c117f5a9f6ada62b2243336"; rev = "b582c9d78f0d105041ed29ec3a8ee11d98ddfd50";
sha256 = "105fnr3qa64izllb9s4r6lsg5mfddiap784j7zz7gh3znpy43n3m"; sha256 = "00k4x121v5zmd70xn24ipiqnpvzlvbv5p089mxsd0wpkng3q31ks";
}; };
meta.homepage = "https://github.com/folke/which-key.nvim/"; meta.homepage = "https://github.com/folke/which-key.nvim/";
}; };
@ -10056,12 +10068,12 @@ final: prev:
YouCompleteMe = buildVimPluginFrom2Nix { YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe"; pname = "YouCompleteMe";
version = "2021-07-28"; version = "2021-08-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ycm-core"; owner = "ycm-core";
repo = "YouCompleteMe"; repo = "YouCompleteMe";
rev = "8c6081c79b2250467c45f475332e3a3a33028467"; rev = "518275b599ab6dd7844c24022f6aec505fb4b07c";
sha256 = "1m0yjngysk0hngrp7awc7m5ahg39yb6hg17zd2fj0ywcf18fw7kf"; sha256 = "0wkd83xlzfbk3h19gn3jhp6lpkb1wnxrhcdnczhdwhy81lizfq4w";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";

2
third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix vendored
View file

@ -651,7 +651,7 @@ self: super: {
libiconv libiconv
]; ];
cargoSha256 = "sha256-E16fwBb9ZDRrcs+rZVKG0UESDqrVIcybr+kbFIxrS1o="; cargoSha256 = "sha256-wYxUo9zfflU7RTsTb7W9wc/WBsXhz3OLjC8CwUkRRiE=";
}; };
in in
'' ''

1
third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names vendored
View file

@ -194,6 +194,7 @@ guns/vim-clojure-highlight
guns/vim-clojure-static guns/vim-clojure-static
guns/vim-sexp guns/vim-sexp
guns/xterm-color-table.vim guns/xterm-color-table.vim
haringsrob/nvim_context_vt
hashivim/vim-packer hashivim/vim-packer
hashivim/vim-terraform hashivim/vim-terraform
hashivim/vim-vagrant hashivim/vim-vagrant

4
third_party/nixpkgs/pkgs/os-specific/linux/extrace/default.nix vendored
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "extrace"; pname = "extrace";
version = "0.7"; version = "0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "leahneukirchen"; owner = "leahneukirchen";
repo = "extrace"; repo = "extrace";
rev = "v${version}"; rev = "v${version}";
sha256 = "0acspj3djspfvgr3ng5b61qws6v2md6b0lc5qkby10mqnfpkvq85"; sha256 = "sha256-Kg5yzVg9sqlOCzAq/HeFUPZ89Enfkt/r7EunCfOqdA0=";
}; };
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

8
third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix vendored
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "raspberrypi-wireless-firmware"; pname = "raspberrypi-wireless-firmware";
version = "2021-01-28"; version = "2021-06-28";
srcs = [ srcs = [
(fetchFromGitHub { (fetchFromGitHub {
@ -16,8 +16,8 @@ stdenv.mkDerivation {
name = "firmware-nonfree"; name = "firmware-nonfree";
owner = "RPi-Distro"; owner = "RPi-Distro";
repo = "firmware-nonfree"; repo = "firmware-nonfree";
rev = "83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5"; rev = "00de3194a96397c913786945ac0af1fd6fbec45b";
sha256 = "1l4zz86y2hjyvdwjy75abyjwh3wqknd71y3vh1iw5nd0hws8ranp"; sha256 = "1xnr364dkiq6gmr21lcrj23hwc0g9y5qad8dm2maij647bgzp07r";
}) })
]; ];
@ -28,6 +28,7 @@ stdenv.mkDerivation {
dontFixup = true; dontFixup = true;
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p "$out/lib/firmware/brcm" mkdir -p "$out/lib/firmware/brcm"
# Wifi firmware # Wifi firmware
@ -37,6 +38,7 @@ stdenv.mkDerivation {
# Bluetooth firmware # Bluetooth firmware
cp bluez-firmware/broadcom/*.hcd "$out/lib/firmware/brcm" cp bluez-firmware/broadcom/*.hcd "$out/lib/firmware/brcm"
runHook postInstall
''; '';
outputHashMode = "recursive"; outputHashMode = "recursive";

12
third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix vendored
View file

@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: { lib, stdenv, fetchFromGitHub }:
let let
inherit (lib) optionals; inherit (lib) optionals;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "raspberrypi-armstubs"; pname = "raspberrypi-armstubs";
version = "2020-10-08"; version = "2021-07-05";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "tools"; repo = "tools";
rev = "fc0e73c13865450e95edd046200e42a6e52d8256"; rev = "2e59fc67d465510179155973d2b959e50a440e47";
sha256 = "1g6ikpjcrm5x0rk5aiwjdd8grf997qkvgamcrdxy6k9ln746h25s"; sha256 = "1ysdl4qldy6ldf8cm1igxjisi14xl3s2pi6cnqzpxb38sgihb1vy";
}; };
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [
@ -37,13 +37,15 @@ stdenv.mkDerivation {
; ;
installPhase = '' installPhase = ''
runHook preInstall
mkdir -vp $out/ mkdir -vp $out/
cp -v *.bin $out/ cp -v *.bin $out/
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {
description = "Firmware related ARM stubs for the Raspberry Pi"; description = "Firmware related ARM stubs for the Raspberry Pi";
homepage = https://github.com/raspberrypi/tools; homepage = "https://github.com/raspberrypi/tools";
license = licenses.bsd3; license = licenses.bsd3;
platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
maintainers = with maintainers; [ samueldr ]; maintainers = with maintainers; [ samueldr ];

4
third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix vendored
View file

@ -3,13 +3,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
# NOTE: this should be updated with linux_rpi # NOTE: this should be updated with linux_rpi
pname = "raspberrypi-firmware"; pname = "raspberrypi-firmware";
version = "1.20210303"; version = "1.20210805";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "firmware"; repo = "firmware";
rev = version; rev = version;
sha256 = "0pgiw93hq4gfph5dnwbi8w59g0f7yhmagwzam971k529mh5yl86m"; sha256 = "1nndhjv4il42yw3pq8ni3r4nlp1m0r229fadrf4f9v51mgcg11i1";
}; };
installPhase = '' installPhase = ''

4
third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix vendored
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ipset"; pname = "ipset";
version = "7.14"; version = "7.15";
src = fetchurl { src = fetchurl {
url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2"; url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2";
sha256 = "sha256-JwMcNtNVkHAxzOQeZVU+mbsBPXYvzVU5L2PX6Edg+QA="; sha256 = "sha256-ClVFqq22QBQsH4iNNmp43fhyR5mWf6IGhqcAU71iF1E=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

13
third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix vendored
View file

@ -2,8 +2,8 @@
let let
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
modDirVersion = "5.10.17"; modDirVersion = "5.10.52";
tag = "1.20210303"; tag = "1.20210805";
in in
lib.overrideDerivation (buildLinux (args // { lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}-${tag}"; version = "${modDirVersion}-${tag}";
@ -12,8 +12,8 @@ lib.overrideDerivation (buildLinux (args // {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "raspberrypi"; owner = "raspberrypi";
repo = "linux"; repo = "linux";
rev = "raspberrypi-kernel_${tag}-1"; rev = tag;
sha256 = "0ffsllayl18ka4mgp4rdy9h0da5gy1n6g0kfvinvzdzabb5wzvrx"; sha256 = "1j71xblflslfi4c3zx2srw6fahnhp3bjx4yjfqrp39kzaa41ij0b";
}; };
defconfig = { defconfig = {
@ -33,6 +33,11 @@ lib.overrideDerivation (buildLinux (args // {
# | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ # | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ../drivers/gpu/drm/ast/ast_mode.c:851:18: note: (near initialization for 'ast_crtc_helper_funcs.atomic_flush') # ../drivers/gpu/drm/ast/ast_mode.c:851:18: note: (near initialization for 'ast_crtc_helper_funcs.atomic_flush')
DRM_AST n DRM_AST n
# ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_atomic_commit_tail':
# ../drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:7757:4: error: implicit declaration of function 'is_hdr_metadata_different' [-Werror=implicit-function-declaration]
# 7757 | is_hdr_metadata_different(old_con_state, new_con_state);
# | ^~~~~~~~~~~~~~~~~~~~~~~~~
DRM_AMDGPU n
''; '';
extraMeta = if (rpiVersion < 3) then { extraMeta = if (rpiVersion < 3) then {

11
third_party/nixpkgs/pkgs/servers/consul/default.nix vendored
View file

@ -32,12 +32,11 @@ buildGoModule rec {
deleteVendor = true; deleteVendor = true;
preBuild = '' ldflags = [
buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version}"
"-X github.com/hashicorp/consul/version.GitDescribe=v${version} "-X github.com/hashicorp/consul/version.Version=${version}"
-X github.com/hashicorp/consul/version.Version=${version} "-X github.com/hashicorp/consul/version.VersionPrerelease="
-X github.com/hashicorp/consul/version.VersionPrerelease=") ];
'';
meta = with lib; { meta = with lib; {
description = "Tool for service discovery, monitoring and configuration"; description = "Tool for service discovery, monitoring and configuration";

4
third_party/nixpkgs/pkgs/servers/corosync/default.nix vendored
View file

@ -10,11 +10,11 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "corosync"; pname = "corosync";
version = "3.1.4"; version = "3.1.5";
src = fetchurl { src = fetchurl {
url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz"; url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz";
sha256 = "sha256-sxoYlAi5RJCQcg0bSqO23t9nTkuuzOeLWPa/dLZZzuo="; sha256 = "sha256-O7o+PtgasrCAcRsu4kEC+7530GCwXUvi2jEAgghPC7w=";
}; };
nativeBuildInputs = [ makeWrapper pkg-config ]; nativeBuildInputs = [ makeWrapper pkg-config ];

4
third_party/nixpkgs/pkgs/servers/headscale/default.nix vendored
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "headscale"; pname = "headscale";
version = "0.3.6"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "juanfont"; owner = "juanfont";
repo = "headscale"; repo = "headscale";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-cjaA62YRfZSbXwbW1pz51hc/opCLsN26GxWnBcVTvyE="; sha256 = "sha256-0fa6V85NwURwsW1Mk1eMPtOWNqTe7x9BSuoCUrSJ/s8=";
}; };
vendorSha256 = "sha256-3cGvp9hnajNJtvDn4K6fkCzLYrEFXQk9ZhQ4n+WnQEo="; vendorSha256 = "sha256-3cGvp9hnajNJtvDn4K6fkCzLYrEFXQk9ZhQ4n+WnQEo=";

2
third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix vendored
View file

@ -607,7 +607,7 @@
"openerz" = ps: with ps; [ openerz-api ]; "openerz" = ps: with ps; [ openerz-api ];
"openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi "openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi
"openexchangerates" = ps: with ps; [ ]; "openexchangerates" = ps: with ps; [ ];
"opengarage" = ps: with ps; [ ]; # missing inputs: open-garage "opengarage" = ps: with ps; [ open-garage ];
"openhardwaremonitor" = ps: with ps; [ ]; "openhardwaremonitor" = ps: with ps; [ ];
"openhome" = ps: with ps; [ openhomedevice ]; "openhome" = ps: with ps; [ openhomedevice ];
"opensensemap" = ps: with ps; [ opensensemap-api ]; "opensensemap" = ps: with ps; [ opensensemap-api ];

2
third_party/nixpkgs/pkgs/servers/interlock/default.nix vendored
View file

@ -21,7 +21,7 @@ buildGoPackage rec {
goDeps = ./deps.nix; goDeps = ./deps.nix;
nativeBuildInputs = [ sudo ]; nativeBuildInputs = [ sudo ];
buildFlags = [ "-tags textsecure" ]; tags = [ "textsecure" ];
postPatch = '' postPatch = ''
grep -lr '/s\?bin/' | xargs sed -i \ grep -lr '/s\?bin/' | xargs sed -i \
-e 's|/bin/mount|${mount}/bin/mount|' \ -e 's|/bin/mount|${mount}/bin/mount|' \

4
third_party/nixpkgs/pkgs/servers/mail/dovecot/default.nix vendored
View file

@ -11,7 +11,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dovecot"; pname = "dovecot";
version = "2.3.15"; version = "2.3.16";
nativeBuildInputs = [ perl pkg-config ]; nativeBuildInputs = [ perl pkg-config ];
buildInputs = buildInputs =
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
sha256 = "141manrh54cy8xizr7f8fsa3vdzc2ccfgdz87l9rjylm8mfxvfr1"; sha256 = "04ngqv5mml5z0i4p7fkchp4xw2awy7x7mq2mim9frnav0m9iv9q3";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

4
third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix vendored
View file

@ -3,11 +3,11 @@ let
dovecotMajorMinor = lib.versions.majorMinor dovecot.version; dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "dovecot-pigeonhole"; pname = "dovecot-pigeonhole";
version = "0.5.15"; version = "0.5.16";
src = fetchurl { src = fetchurl {
url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz"; url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
sha256 = "1l2h0p8ddsl3ja2lnwk0mfqplqh8n0iw8k27awd3ak7prr88yjg1"; sha256 = "0f79qsiqnhaxn7mrrfcrnsjyv6357kzb7wa0chhfd69vwa06g8sw";
}; };
buildInputs = [ dovecot openssl ]; buildInputs = [ dovecot openssl ];

3
third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix vendored
View file

@ -15,7 +15,8 @@ buildGoModule rec {
sha256 = "sha256-8shyNKwSg3pUxfQsIHBNnIaks/86vHuHN/SroDE3QFU="; sha256 = "sha256-8shyNKwSg3pUxfQsIHBNnIaks/86vHuHN/SroDE3QFU=";
}; };
vendorSha256 = "sha256-jP6P2NShzlFCptCQ04XY4cIrONNArwthiEONEo32Btw="; vendorSha256 = "sha256-GMNyeWa2dz+q4RYS+DDkpj9sx1PlPvSuWYcHSM2umRE=";
proxyVendor = true;
preBuild = '' preBuild = ''
buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}") buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}")

6
third_party/nixpkgs/pkgs/servers/traefik/default.nix vendored
View file

@ -2,15 +2,15 @@
buildGoModule rec { buildGoModule rec {
pname = "traefik"; pname = "traefik";
version = "2.4.8"; version = "2.4.13";
src = fetchzip { src = fetchzip {
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
sha256 = "sha256-hCBhJazI0Y1qQjULF+CBfUfz6PvkgLXafvXKR6iKHmU="; sha256 = "sha256-kGCzw8B7fCh6oh0ziB1eBedWEeGOBJVBvUf++TK/Lo0=";
stripRoot = false; stripRoot = false;
}; };
vendorSha256 = "sha256-MW/JG4TbUvbo4dQnQbKIbLlLgkQvOqsfagpXILJ/BYQ="; vendorSha256 = "sha256-jn4Ud+MrX7no+s69LAAbDOoFg1yIQ2lmoy8r37JIVz8=";
doCheck = false; doCheck = false;

8
third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix vendored
View file

@ -15,7 +15,7 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.11.9"; # also update communityModules version = "0.11.10"; # also update communityModules
pname = "prosody"; pname = "prosody";
# The following community modules are necessary for the nixos module # The following community modules are necessary for the nixos module
# prosody module to comply with XEP-0423 and provide a working # prosody module to comply with XEP-0423 and provide a working
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
]; ];
src = fetchurl { src = fetchurl {
url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
sha256 = "02gzvsaq0l5lx608sfh7hfz14s6yfsr4sr4kzcsqd1cxljp35h6c"; sha256 = "1q84s9cq7cgzd295qxa2iy0r3vd3v3chbck62bdx3pd6skk19my6";
}; };
# A note to all those merging automated updates: Please also update this # A note to all those merging automated updates: Please also update this
@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
# version. # version.
communityModules = fetchhg { communityModules = fetchhg {
url = "https://hg.prosody.im/prosody-modules"; url = "https://hg.prosody.im/prosody-modules";
rev = "c149edb37349"; rev = "64fafbeba14d";
sha256 = "1njw17k0nhf15hc20l28v0xzcc7jha85lqy3j97nspv9zdxmshk1"; sha256 = "02gj1b8sdmdvymsdmjpq47zrl7sg578jcdxbbq18s44f3njmc9q1";
}; };
buildInputs = [ buildInputs = [

2
third_party/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix vendored
View file

@ -19,7 +19,7 @@ buildGoModule rec {
}; };
buildInputs = [ libX11 libXi libXt libXtst ]; buildInputs = [ libX11 libXi libXt libXtst ];
buildFlags = [ "-tags" "portal,x11" ]; tags = [ "portal,x11" ];
vendorSha256 = "1pgj0m67g759mcs4s34h4pq3mc7gni643z5cp6ffq4rrn8mdi060"; vendorSha256 = "1pgj0m67g759mcs4s34h4pq3mc7gni643z5cp6ffq4rrn8mdi060";

6
third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix vendored
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "chezmoi"; pname = "chezmoi";
version = "2.1.3"; version = "2.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "twpayne"; owner = "twpayne";
repo = "chezmoi"; repo = "chezmoi";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-F4ad2P4NF7MSp6Lttk9hjAixiMTG/vtMe7YItmXdc4w="; sha256 = "sha256-+KSLmr6tia22XFHYFmn3leRdT6TTKdrQa9PrGGJNPaw=";
}; };
vendorSha256 = "sha256-S/aP+oBH+bChoTLqqcB0aDzR7xtg9/qBqxxcLCwAbqY="; vendorSha256 = "sha256-9vLOJOWsa6XADvWBLZKlyenqfDSvHuh5Ron4FE2tY7Y=";
doCheck = false; doCheck = false;

6
third_party/nixpkgs/pkgs/tools/misc/dua/default.nix vendored
View file

@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "dua"; pname = "dua";
version = "2.14.3"; version = "2.14.4";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
owner = "Byron"; owner = "Byron";
repo = "dua-cli"; repo = "dua-cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Tste5DdUwCu1CNRzIcBEvyckrvhEg9C8M3y89luIMbE="; sha256 = "sha256-0L5IiB/J4RO/KGSk/zZKLPpAneNGPDvhmPsNiZxImac=";
# Remove unicode file names which leads to different checksums on HFS+ # Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation. # vs. other filesystems because of unicode normalisation.
extraPostFetch = '' extraPostFetch = ''
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
''; '';
}; };
cargoSha256 = "sha256-iHRPgQtanW2LcFLPPHmr2n1NeAPi0mDmHNeIv524lrM="; cargoSha256 = "sha256-Mb59ZkIQVAZ01e3njdIR+0pM+PKQgEDaUP4saMGYn/8=";
doCheck = false; doCheck = false;

4
third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix vendored
View file

@ -19,8 +19,8 @@ buildGoModule rec {
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];
buildFlagsArray = [ ldflags = [
"-ldflags=-s -w -X main.version=${version} -X main.revision=${src.rev}" "-s" "-w" "-X main.version=${version} -X main.revision=${src.rev}"
]; ];
# The vim plugin expects a relative path to the binary; patch it to abspath. # The vim plugin expects a relative path to the binary; patch it to abspath.

2
third_party/nixpkgs/pkgs/tools/misc/kepubify/default.nix vendored
View file

@ -14,7 +14,7 @@ buildGoModule rec {
vendorSha256 = "sha256-bLQH7ZY2hE8fBTcW7DNoUQxe4N3m9Mv3JjjKO4cG7DY="; vendorSha256 = "sha256-bLQH7ZY2hE8fBTcW7DNoUQxe4N3m9Mv3JjjKO4cG7DY=";
# remove when built with >= go 1.17 # remove when built with >= go 1.17
buildFlags = [ "-tags" "zip117" ]; tags = [ "zip117" ];
ldflags = [ "-s" "-w" "-X main.version=${version}" ]; ldflags = [ "-s" "-w" "-X main.version=${version}" ];

38
third_party/nixpkgs/pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patch vendored Normal file
View file

@ -0,0 +1,38 @@
From 20c3fe76340981c43eeed16a5509480a0f5cb56d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 6 Aug 2021 10:55:01 +0200
Subject: [PATCH] Forcefully disable docs build
This currently affects the following statement in `src/Makefile.am`
only:
if !DISABLE_DOCUMENTATION
all-local: lnav
if test -w $(srcdir)/internals; then \
env DUMP_INTERNALS_DIR=$(srcdir)/internals DUMP_CRASH=1 ./lnav Makefile; \
mv $(srcdir)/internals/*.schema.json $(top_srcdir)/docs/schemas; \
fi
endif
We cannot do this (even on non-cross builds) since `lnav` requires e.g.
`/etc/nsswitch.conf` and other impurities here.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index ce311fd8..e3c9ebe0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,7 +287,7 @@ AS_IF([test $? -eq 0],
AM_CONDITIONAL(USE_INCLUDED_YAJL, test $HAVE_LOCAL_YAJL -eq 0)
AM_CONDITIONAL(HAVE_LIBCURL, test x"$LIBCURL" != x"")
-AM_CONDITIONAL([DISABLE_DOCUMENTATION], [ test x"$cross_compiling" != x"no" ])
+AM_CONDITIONAL([DISABLE_DOCUMENTATION], [ true ])
AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_FILES([Makefile])
--
2.31.1

19
third_party/nixpkgs/pkgs/tools/misc/lnav/default.nix vendored
View file

@ -3,18 +3,25 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lnav"; pname = "lnav";
version = "0.9.0"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tstack"; owner = "tstack";
repo = "lnav"; repo = "lnav";
rev = "v${version}"; rev = "v${version}";
sha256 = "1frdrr3yjlk2fns3ny0qbr30rpswhwlvv3kyhdl3l6a0q5cqaqsg"; sha256 = "sha256-hAFyMypGC065aRgX2L4LdyFGpZ/LnX5SjA2iQv5Iuas=";
}; };
patches = [ ./0001-Forcefully-disable-docs-build.patch ];
postPatch = ''
substituteInPlace Makefile.am \
--replace "SUBDIRS = src test" "SUBDIRS = src"
'';
enableParallelBuilding = true;
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ buildInputs = [
autoconf
automake
zlib zlib
bzip2 bzip2
ncurses ncurses
@ -24,10 +31,6 @@ stdenv.mkDerivation rec {
curl curl
]; ];
postPatch = ''
sed -ie '/DUMP_INTERNALS/d' src/Makefile.am
'';
preConfigure = '' preConfigure = ''
./autogen.sh ./autogen.sh
''; '';

4
third_party/nixpkgs/pkgs/tools/misc/mimeo/default.nix vendored
View file

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "mimeo"; pname = "mimeo";
version = "2019.7"; version = "2021.2";
src = fetchurl { src = fetchurl {
url = "https://xyne.archlinux.ca/projects/mimeo/src/${pname}-${version}.tar.xz"; url = "https://xyne.archlinux.ca/projects/mimeo/src/${pname}-${version}.tar.xz";
sha256 = "0nzn7qvmpbb17d6q16llnhz1qdmyg718q59ic4gw2rq23cd6q47r"; sha256 = "113ip024ggajjdx0l406g6lwypdrddxz6k3640y6lzqjivcgybjf";
}; };
buildInputs = [ file desktop-file-utils ]; buildInputs = [ file desktop-file-utils ];

2
third_party/nixpkgs/pkgs/tools/misc/mmv-go/default.nix vendored
View file

@ -13,7 +13,7 @@ buildGoModule rec {
vendorSha256 = "0xnrai15ww9lfk02bc9p5ssycwnqkyjj5ch1srh7yvnbw3fakx68"; vendorSha256 = "0xnrai15ww9lfk02bc9p5ssycwnqkyjj5ch1srh7yvnbw3fakx68";
buildFlagsArray = [ "-ldflags=-s -w -X main.revision=${src.rev}" ]; ldflags = [ "-s" "-w" "-X main.revision=${src.rev}" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/itchyny/mmv"; homepage = "https://github.com/itchyny/mmv";

5
third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix vendored
View file

@ -15,9 +15,8 @@ buildGoModule rec {
sha256 = "03713b4bkhcz61maz0r5mkd36kv3rq8rji3qcpi9zf5bkkjs1yzb"; sha256 = "03713b4bkhcz61maz0r5mkd36kv3rq8rji3qcpi9zf5bkkjs1yzb";
}; };
vendorSha256 = if stdenv.isDarwin vendorSha256 = "sha256-sNI2OoDsSNtcQP8rNO4OCboFqSC7v6g4xEPNRKjv3sQ=";
then "0anw3l6pq8yys2g2607ndhklb9m1i9krgjrw4wb99igavjzp3wpj" proxyVendor = true;
else "04h463d2d7g6wqp5mzkqlszwzdbq0pix6j7n2s9s80lwg7nh8k3h";
subPackages = [ "cmd/otelcontribcol" ]; subPackages = [ "cmd/otelcontribcol" ];

4
third_party/nixpkgs/pkgs/tools/misc/pferd/default.nix vendored
View file

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "pferd"; pname = "pferd";
version = "3.1.0"; version = "3.2.0";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Garmelon"; owner = "Garmelon";
repo = "PFERD"; repo = "PFERD";
rev = "v${version}"; rev = "v${version}";
sha256 = "08kcl1c8z8qx65dfz5ghmbfqyjgkng4g9ymcnhydiz8j27smkj5d"; sha256 = "0r75a128r8ghrccc1flmpxblfrab5kg6fypzrlfmv2aqhkqg1brb";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [

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