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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-08-21 06:01:11 +00:00
committed by GitHub
parent e54a1f5d44 121acc3649
commit 677ab4aebe
26 changed files with 316 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/stdenv/meta.chapter.md
+4
View File
@@ -114,6 +114,10 @@ For details, see [Licenses](#sec-meta-license).
A list of the maintainers of this Nix expression. Maintainers are defined in [`nixpkgs/maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix). There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled “maintainers: add alice”, and reference maintainers with `maintainers = with lib.maintainers; [ alice bob ]`.
### `mainProgram` {#var-meta-mainProgram}
The name of the main binary for the package. This effects the binary `nix run` executes and falls back to the name of the package. Example: `"rg"`
### `priority` {#var-meta-priority}
The *priority* of the package, used by `nix-env` to resolve file name conflicts between packages. See the Nix manual page for `nix-env` for details. Example: `"10"` (a low-priority package).
lib/systems/platforms.nix
+1 -1
View File
@@ -233,7 +233,7 @@ rec {
};
};
scaleway-c1 = lib.recursiveUpdate armv7l-hf-multiplatform {
scaleway-c1 = armv7l-hf-multiplatform // {
gcc = {
cpu = "cortex-a9";
fpu = "vfpv3";
maintainers/maintainer-list.nix
+10
View File
@@ -5668,6 +5668,16 @@
githubId = 148352;
name = "Jim Fowler";
};
kittywitch = {
email = "kat@kittywit.ch";
github = "kittywitch";
githubId = 67870215;
name = "kat witch";
keys = [{
longkeyid = "rsa4096/0x7248991EFA8EFBEE";
fingerprint = "01F5 0A29 D4AA 9117 5A11 BDB1 7248 991E FA8E FBEE";
}];
};
kiwi = {
email = "envy1988@gmail.com";
github = "Kiwi";
nixos/modules/services/mail/dovecot.nix
-4
View File
@@ -467,10 +467,6 @@ in
];
assertions = [
{
assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != [];
message = "dovecot needs at least one of the IMAP or POP3 listeners enabled";
}
{
assertion = (cfg.sslServerCert == null) == (cfg.sslServerKey == null)
&& (cfg.sslCACert != null -> !(cfg.sslServerCert == null || cfg.sslServerKey == null));
pkgs/applications/graphics/drawpile/default.nix
-1
View File
@@ -2,7 +2,6 @@
, lib
, mkDerivation
, fetchFromGitHub
, fetchpatch
, extra-cmake-modules
# common deps
pkgs/applications/networking/browsers/brave/default.nix
+2 -2
View File
@@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.28.105";
version = "1.28.106";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "1E2KWG5vHYBuph6Pv9J6FBOsUpegx4Ix/H99ZQ/x4zI=";
sha256 = "gr8d5Dh6ZHb2kThVOA61BoGo64MB77qF7ualUY2RRq0=";
};
dontConfigure = true;
pkgs/applications/terminal-emulators/kitty/default.nix
+11 -5
View File
@@ -21,14 +21,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.21.2";
version = "0.23.1";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "0y0mg8rr18mn0wzym7v48x6kl0ixd5q387kr5jhbdln55ph2jk9d";
sha256 = "sha256-2RwDU6EOJWF0u2ikJFg9U2yqSXergDkJH3h2i+QJ7G4=";
};
buildInputs = [
@@ -52,8 +52,14 @@ buildPythonApplication rec {
];
nativeBuildInputs = [
pkg-config sphinx ncurses
installShellFiles
ncurses
pkg-config
sphinx
furo
sphinx-copybutton
sphinxext-opengraph
sphinx-inline-tabs
] ++ lib.optionals stdenv.isDarwin [
imagemagick
libicns # For the png2icns tool.
@@ -111,12 +117,12 @@ buildPythonApplication rec {
cp -r linux-package/{bin,share,lib} $out
''}
wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick xsel ncurses.dev ]}"
runHook postInstall
installShellCompletion --cmd kitty \
--bash <("$out/bin/kitty" + complete setup bash) \
--fish <("$out/bin/kitty" + complete setup fish) \
--zsh <("$out/bin/kitty" + complete setup zsh)
runHook postInstall
'';
postInstall = ''
@@ -136,7 +142,7 @@ buildPythonApplication rec {
homepage = "https://github.com/kovidgoyal/kitty";
description = "A modern, hackable, featureful, OpenGL based terminal emulator";
license = licenses.gpl3Only;
changelog = "https://sw.kovidgoyal.net/kitty/changelog.html";
changelog = "https://sw.kovidgoyal.net/kitty/changelog/";
platforms = platforms.darwin ++ platforms.linux;
maintainers = with maintainers; [ tex rvolosatovs Luflosi ];
};
pkgs/build-support/templaterpm/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python toposort rpm ];
phases = [ "installPhase" "fixupPhase" ];
dontUnpack = true;
installPhase = ''
mkdir -p $out/bin
pkgs/data/fonts/julia-mono/default.nix
+2 -2
View File
@@ -1,13 +1,13 @@
{ lib, fetchzip }:
let
version = "0.040";
version = "0.041";
in
fetchzip {
name = "JuliaMono-ttf-${version}";
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz";
sha256 = "sha256-Rrsvs682aWXZqydnOifXTJMa4uPl/aCGbVNRPGxkZng=";
sha256 = "sha256-OjguPR2MFjbY72/PF0R43/g6i95uAPVPbXk+HS0B360=";
postFetch = ''
mkdir -p $out/share/fonts/truetype
pkgs/development/mobile/cocoapods/Gemfile-beta.lock
+36 -30
View File
@@ -1,23 +1,27 @@
GEM
specs:
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.3)
activesupport (5.2.4.5)
activesupport (6.1.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.10.1)
addressable (~> 2.6)
cocoapods (1.11.0.beta.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.10.1)
cocoapods-core (= 1.11.0.beta.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -28,66 +32,68 @@ GEM
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.19.0, < 2.0)
cocoapods-core (1.10.1)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
ruby-macho (>= 1.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
cocoapods-core (1.11.0.beta.2)
activesupport (>= 5.0, < 7)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.4.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-search (1.0.1)
cocoapods-trunk (1.5.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.8)
concurrent-ruby (1.1.9)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.15.0)
ethon (0.14.0)
ffi (>= 1.15.0)
ffi (1.15.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.8.9)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
json (2.5.1)
minitest (5.14.4)
molinillo (0.6.6)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
public_suffix (4.0.6)
ruby-macho (1.4.0)
thread_safe (0.3.6)
rexml (3.2.5)
ruby-macho (2.5.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
xcodeproj (1.19.0)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
xcodeproj (1.21.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
zeitwerk (2.4.2)
PLATFORMS
ruby
arm64-darwin-20
DEPENDENCIES
cocoapods (>= 1.7.0.beta.1)!
BUNDLED WITH
2.1.4
2.2.20
pkgs/development/mobile/cocoapods/Gemfile.lock
+20 -15
View File
@@ -1,23 +1,26 @@
GEM
specs:
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.3)
activesupport (5.2.4.5)
activesupport (5.2.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.10.1)
cocoapods (1.10.2)
addressable (~> 2.6)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.10.1)
cocoapods-core (= 1.10.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -32,7 +35,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.19.0, < 2.0)
cocoapods-core (1.10.1)
cocoapods-core (1.10.2)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
algoliasearch (~> 1.0)
@@ -42,26 +45,26 @@ GEM
netrc (~> 0.11)
public_suffix
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.4.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-search (1.0.1)
cocoapods-trunk (1.5.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.8)
concurrent-ruby (1.1.9)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.15.0)
ethon (0.14.0)
ffi (>= 1.15.0)
ffi (1.15.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.8.9)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
json (2.5.1)
minitest (5.14.4)
@@ -70,24 +73,26 @@ GEM
nap (1.1.0)
netrc (0.11.0)
public_suffix (4.0.6)
rexml (3.2.5)
ruby-macho (1.4.0)
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
xcodeproj (1.19.0)
xcodeproj (1.21.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
PLATFORMS
ruby
arm64-darwin-20
DEPENDENCIES
cocoapods!
BUNDLED WITH
2.1.4
2.2.20
pkgs/development/mobile/cocoapods/gemset-beta.nix
+51 -41
View File
@@ -1,14 +1,14 @@
{
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc";
sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk";
type = "gem";
};
version = "5.2.4.5";
version = "6.1.4";
};
addressable = {
dependencies = ["public_suffix"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
type = "gem";
};
version = "2.7.0";
version = "2.8.0";
};
algoliasearch = {
dependencies = ["httpclient" "json"];
@@ -68,10 +68,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a";
sha256 = "1rvmvxday0fg1p1ardmqc62xam212c6iaaf1djahvz70631grprq";
type = "gem";
};
version = "1.10.1";
version = "1.11.0.beta.2";
};
cocoapods-core = {
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
@@ -79,20 +79,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83";
sha256 = "0cnnmbajllp3mw2w2b2bs2y42cnh1y1zbq63m3asg097z4d1a9h1";
type = "gem";
};
version = "1.10.1";
version = "1.11.0.beta.2";
};
cocoapods-deintegrate = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn";
sha256 = "18pnng0lv5z6kpp8hnki0agdxx979iq6hxkfkglsyqzmir22lz2i";
type = "gem";
};
version = "1.0.4";
version = "1.0.5";
};
cocoapods-downloader = {
groups = ["default"];
@@ -120,10 +120,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6";
sha256 = "12amy0nknv09bvzix8bkmcjn996c50c4ms20v2dl7v8rcw73n4qv";
type = "gem";
};
version = "1.0.0";
version = "1.0.1";
};
cocoapods-trunk = {
dependencies = ["nap" "netrc"];
@@ -161,10 +161,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
type = "gem";
};
version = "1.1.8";
version = "1.1.9";
};
escape = {
groups = ["default"];
@@ -182,20 +182,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9";
sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh";
type = "gem";
};
version = "0.12.0";
version = "0.14.0";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432";
sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq";
type = "gem";
};
version = "1.15.0";
version = "1.15.3";
};
fourflusher = {
groups = ["default"];
@@ -243,10 +243,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
type = "gem";
};
version = "1.8.9";
version = "1.8.10";
};
json = {
groups = ["default"];
@@ -273,10 +273,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hh40z1adl4lw16dj4hxgabx4rr28mgqycih1y1d91bwww0jjdg6";
sha256 = "0p846facmh1j5xmbrpgzadflspvk7bzs3sykrh5s7qi4cdqz5gzg";
type = "gem";
};
version = "0.6.6";
version = "0.8.0";
};
nanaimo = {
groups = ["default"];
@@ -318,25 +318,25 @@
};
version = "4.0.6";
};
rexml = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
type = "gem";
};
version = "3.2.5";
};
ruby-macho = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lhdjn91jkifsy2hzq2hgcm0pp8pbik87m58zmw1ifh6hkp9adjb";
sha256 = "1jgmhj4srl7cck1ipbjys6q4klcs473gq90bm59baw4j1wpfaxch";
type = "gem";
};
version = "1.4.0";
};
thread_safe = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
type = "gem";
};
version = "0.3.6";
version = "2.5.1";
};
typhoeus = {
dependencies = ["ethon"];
@@ -350,25 +350,35 @@
version = "1.4.0";
};
tzinfo = {
dependencies = ["thread_safe"];
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
type = "gem";
};
version = "1.2.9";
version = "2.0.4";
};
xcodeproj = {
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn";
sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4";
type = "gem";
};
version = "1.19.0";
version = "1.21.0";
};
zeitwerk = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
type = "gem";
};
version = "2.4.2";
};
}
pkgs/development/mobile/cocoapods/gemset.nix
+35 -23
View File
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc";
sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj";
type = "gem";
};
version = "5.2.4.5";
version = "5.2.6";
};
addressable = {
dependencies = ["public_suffix"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
type = "gem";
};
version = "2.7.0";
version = "2.8.0";
};
algoliasearch = {
dependencies = ["httpclient" "json"];
@@ -66,10 +66,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a";
sha256 = "0d0vlzjizqkw2m6am9gcnjkxy73zl74ill28v17v0s2v8fzd7nbg";
type = "gem";
};
version = "1.10.1";
version = "1.10.2";
};
cocoapods-core = {
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
@@ -77,20 +77,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83";
sha256 = "1j1sapw5l3xc5d8mli09az1bbmfdynlx7xv8lbghvm9i1md14dl5";
type = "gem";
};
version = "1.10.1";
version = "1.10.2";
};
cocoapods-deintegrate = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn";
sha256 = "18pnng0lv5z6kpp8hnki0agdxx979iq6hxkfkglsyqzmir22lz2i";
type = "gem";
};
version = "1.0.4";
version = "1.0.5";
};
cocoapods-downloader = {
groups = ["default"];
@@ -112,12 +112,14 @@
version = "1.0.0";
};
cocoapods-search = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6";
sha256 = "12amy0nknv09bvzix8bkmcjn996c50c4ms20v2dl7v8rcw73n4qv";
type = "gem";
};
version = "1.0.0";
version = "1.0.1";
};
cocoapods-trunk = {
dependencies = ["nap" "netrc"];
@@ -153,10 +155,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
type = "gem";
};
version = "1.1.8";
version = "1.1.9";
};
escape = {
source = {
@@ -172,20 +174,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9";
sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh";
type = "gem";
};
version = "0.12.0";
version = "0.14.0";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432";
sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq";
type = "gem";
};
version = "1.15.0";
version = "1.15.3";
};
fourflusher = {
groups = ["default"];
@@ -229,10 +231,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
type = "gem";
};
version = "1.8.9";
version = "1.8.10";
};
json = {
groups = ["default"];
@@ -298,6 +300,16 @@
};
version = "4.0.6";
};
rexml = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
type = "gem";
};
version = "3.2.5";
};
ruby-macho = {
groups = ["default"];
platforms = [];
@@ -339,14 +351,14 @@
version = "1.2.9";
};
xcodeproj = {
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn";
sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4";
type = "gem";
};
version = "1.19.0";
version = "1.21.0";
};
}
pkgs/development/ocaml-modules/luv/default.nix
+2 -2
View File
@@ -6,12 +6,12 @@
buildDunePackage rec {
pname = "luv";
version = "0.5.9";
version = "0.5.10";
useDune2 = true;
src = fetchurl {
url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
sha256 = "0bbv28vgv5mnfbn1gag5fh3n4d9nkffqy3bif3pf47677c493ym2";
sha256 = "0zygir01d6vglfs4b3klnbg90glvyl9agq5xnzn8hmsb6d8z0jqp";
};
postConfigure = ''
pkgs/development/python-modules/oauthenticator/default.nix
+2 -8
View File
@@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "oauthenticator";
version = "14.0.0";
version = "14.2.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "1zfcl3dq9ladqg7fnpx6kgxf1ckjzlc8v3j6wa8w6iwglm40ax4r";
sha256 = "4baa02ff2c159cbba06f8d07fe11a6e624285ca2f813b1258b4c68766c0ee46b";
};
propagatedBuildInputs = [
@@ -36,12 +36,6 @@ buildPythonPackage rec {
requests-mock
];
postPatch = ''
# The constraint was removed. No longer needed for > 14.0.0
# https://github.com/jupyterhub/oauthenticator/pull/431
substituteInPlace test-requirements.txt --replace "pyjwt>=1.7,<2.0" "pyjwt"
'';
disabledTests = [
# Test are outdated, https://github.com/jupyterhub/oauthenticator/issues/432
"test_azuread"
pkgs/development/python-modules/pip-tools/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "pip-tools";
version = "6.1.0";
version = "6.2.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-QAv3finMpIwxq8IQBCkyu1LcwTjvTqTVLF20KaqK5u4=";
sha256 = "9ed38c73da4993e531694ea151f77048b4dbf2ba7b94c4a569daa39568cc6564";
};
LC_ALL = "en_US.UTF-8";
pkgs/development/tools/analysis/radare2/default.nix
+17 -2
View File
@@ -26,17 +26,32 @@
, luaBindings ? false
}:
let
# FIXME: how to keep this up-to-date
# https://github.com/radareorg/vector35-arch-arm64/
arm64 = fetchFromGitHub {
owner = "radareorg";
repo = "vector35-arch-arm64";
rev = "5837915960c2ce862a77c99a374abfb7d18a8534";
sha256 = "sha256-bs8wjOX+txB193oqIIZ7yx9pwpVhR3HAaWuDLPLG7m4=";
};
in
stdenv.mkDerivation rec {
pname = "radare2";
version = "5.3.1";
version = "5.4.0";
src = fetchFromGitHub {
owner = "radare";
repo = "radare2";
rev = version;
sha256 = "sha256-VS8eG5RXwKtJSLmyaSifopJU7WYGMUcznn+burPqEYE=";
sha256 = "sha256-KRHMJ0lW0OF8ejcrigp4caPsuR3iaGcglCYxJSUhGJw=";
};
preBuild = ''
cp -r ${arm64} libr/asm/arch/arm/v35arm64/arch-arm64
chmod -R +w libr/asm/arch/arm/v35arm64/arch-arm64
'';
postInstall = ''
install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm
'';
pkgs/games/factorio/versions.json
+20 -20
View File
@@ -2,20 +2,20 @@
"x86_64-linux": {
"alpha": {
"experimental": {
"name": "factorio_alpha_x64-1.1.37.tar.xz",
"name": "factorio_alpha_x64-1.1.38.tar.xz",
"needsAuth": true,
"sha256": "0aj8w38lx8bx3d894qxr416x515ijadrlcynvvqjaj1zx3acldzh",
"sha256": "0cjhfyz4j06yn08n239ajjjpgykh39hzifhmd0ygr5szw9gdc851",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.37/alpha/linux64",
"version": "1.1.37"
"url": "https://factorio.com/get-download/1.1.38/alpha/linux64",
"version": "1.1.38"
},
"stable": {
"name": "factorio_alpha_x64-1.1.37.tar.xz",
"name": "factorio_alpha_x64-1.1.38.tar.xz",
"needsAuth": true,
"sha256": "0aj8w38lx8bx3d894qxr416x515ijadrlcynvvqjaj1zx3acldzh",
"sha256": "0cjhfyz4j06yn08n239ajjjpgykh39hzifhmd0ygr5szw9gdc851",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.37/alpha/linux64",
"version": "1.1.37"
"url": "https://factorio.com/get-download/1.1.38/alpha/linux64",
"version": "1.1.38"
}
},
"demo": {
@@ -28,30 +28,30 @@
"version": "1.1.37"
},
"stable": {
"name": "factorio_demo_x64-1.1.37.tar.xz",
"name": "factorio_demo_x64-1.1.38.tar.xz",
"needsAuth": false,
"sha256": "06qwx9wd3990d3256y9y5qsxa0936076jgwhinmrlvjp9lxwl4ly",
"sha256": "0y53w01dyfmavw1yxbjqjiirmvw32bnf9bqz0isnd72dvkg0kziv",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.37/demo/linux64",
"version": "1.1.37"
"url": "https://factorio.com/get-download/1.1.38/demo/linux64",
"version": "1.1.38"
}
},
"headless": {
"experimental": {
"name": "factorio_headless_x64-1.1.37.tar.xz",
"name": "factorio_headless_x64-1.1.38.tar.xz",
"needsAuth": false,
"sha256": "0hawwjdaxgbrkb80vn9jk6dn0286mq35zkgg5vvv5zhi339pqwwg",
"sha256": "1c929pa9ifz0cvmx9k5yd267hjd5p7fdbln0czl3dq1vlskk1w71",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.37/headless/linux64",
"version": "1.1.37"
"url": "https://factorio.com/get-download/1.1.38/headless/linux64",
"version": "1.1.38"
},
"stable": {
"name": "factorio_headless_x64-1.1.37.tar.xz",
"name": "factorio_headless_x64-1.1.38.tar.xz",
"needsAuth": false,
"sha256": "0hawwjdaxgbrkb80vn9jk6dn0286mq35zkgg5vvv5zhi339pqwwg",
"sha256": "1c929pa9ifz0cvmx9k5yd267hjd5p7fdbln0czl3dq1vlskk1w71",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.37/headless/linux64",
"version": "1.1.37"
"url": "https://factorio.com/get-download/1.1.38/headless/linux64",
"version": "1.1.38"
}
}
}
pkgs/games/warzone2100/default.nix
+2 -2
View File
@@ -39,11 +39,11 @@ in
stdenv.mkDerivation rec {
inherit pname;
version = "4.1.1";
version = "4.1.3";
src = fetchurl {
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
sha256 = "sha256-CnMt3FytpTDAtibU3V24i6EvWRc9UkAuvC9ingphCM8=";
sha256 = "sha256-sKZiDjWwVFXT6RiY+zT+0S6Zb3uCC0CaZzOQYEWpWNs=";
};
buildInputs = [
pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix
+31
View File
@@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub, lib}:
stdenv.mkDerivation rec {
pname = "libreelec-dvb-firmware";
version = "1.4.2";
src = fetchFromGitHub {
repo = "dvb-firmware";
owner = "LibreElec";
rev = version;
sha256 = "1xnfl4gp6d81gpdp86v5xgcqiqz2nf1i43sb3a4i5jqs8kxcap2k";
};
installPhase = ''
runHook preInstall
mkdir -p $out/lib
cp -rv firmware $out/lib
find $out/lib \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm
runHook postInstall
'';
meta = with lib; {
description = "DVB firmware from LibreELEC";
homepage = "https://github.com/LibreELEC/dvb-firmware";
license = licenses.unfreeRedistributableFirmware;
maintainers = with maintainers; [ kittywitch ];
platforms = platforms.linux;
};
}
pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
-28
View File
@@ -1,28 +0,0 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "openelec-dvb-firmware";
version = "0.0.51";
src = fetchurl {
url = "https://github.com/OpenELEC/dvb-firmware/archive/${version}.tar.gz";
sha256 = "cef3ce537d213e020af794cecf9de207e2882c375ceda39102eb6fa2580bad8d";
};
installPhase = ''
runHook preInstall
DESTDIR="$out" ./install
find $out \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm
runHook postInstall
'';
meta = with lib; {
description = "DVB firmware from OpenELEC";
homepage = "https://github.com/OpenELEC/dvb-firmware";
license = licenses.unfreeRedistributableFirmware;
platforms = platforms.linux;
priority = 7;
};
}
pkgs/servers/monitoring/telegraf/default.nix
+3 -3
View File
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "telegraf";
version = "1.19.1";
version = "1.19.3";
excludedPackages = "test";
@@ -12,10 +12,10 @@ buildGoModule rec {
owner = "influxdata";
repo = "telegraf";
rev = "v${version}";
sha256 = "sha256-8shyNKwSg3pUxfQsIHBNnIaks/86vHuHN/SroDE3QFU=";
sha256 = "sha256-14nwSLCurI9vNgZwad3qc2/yrvpc8Og8jojTCAfJ5F0=";
};
vendorSha256 = "sha256-GMNyeWa2dz+q4RYS+DDkpj9sx1PlPvSuWYcHSM2umRE=";
vendorSha256 = "sha256-J48ezMi9+PxohDKFhBpbcu6fdojlZPXnQQw2IcyimTA=";
proxyVendor = true;
preBuild = ''
pkgs/tools/networking/stunnel/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "stunnel";
version = "5.59";
version = "5.60";
src = fetchurl {
url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz";
sha256 = "sha256-E3d232vo8XAfHNWQt3eZMuEjR5+5HlGSFxwWeYgVzp8=";
sha256 = "sha256-xF12WxUhhh/qmwO0JbndfUizBVEowK7Gc7ul75uPeH0=";
# please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
# not the output of `nix-prefetch-url`
};
pkgs/top-level/aliases.nix
+1
View File
@@ -561,6 +561,7 @@ mapAliases ({
olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05
opencl-icd = ocl-icd; # added 2017-01-20
openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21
openelec-dvb-firmware = libreelec-dvb-firmware; # added 2021-05-10
openexr_ctl = ctl; # added 2018-04-25
openisns = open-isns; # added 2020-01-28
openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -21059,7 +21059,7 @@ with pkgs;
linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
openelec-dvb-firmware = callPackage ../os-specific/linux/firmware/openelec-dvb-firmware { };
libreelec-dvb-firmware = callPackage ../os-specific/linux/firmware/libreelec-dvb-firmware { };
openiscsi = callPackage ../os-specific/linux/open-iscsi { };
pkgs/top-level/perl-packages.nix
+60
View File
@@ -16913,6 +16913,22 @@ let
};
};
PerlCriticCommunity = buildPerlModule {
pname = "Perl-Critic-Community";
version = "1.0.0";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-Critic-Community-v1.0.0.tar.gz";
sha256 = "311b775da4193e9de94cf5225e993cc54dd096ae1e7ef60738cdae1d9b8854e7";
};
buildInputs = [ ModuleBuildTiny ];
propagatedBuildInputs = [ PPI PathTiny PerlCritic PerlCriticPolicyVariablesProhibitLoopOnHash PerlCriticPulp ];
meta = {
homepage = "https://github.com/Grinnz/Perl-Critic-Community";
description = "Community-inspired Perl::Critic policies";
license = lib.licenses.artistic2;
};
};
PerlCriticMoose = buildPerlPackage rec {
pname = "Perl-Critic-Moose";
version = "1.05";
@@ -16927,6 +16943,35 @@ let
};
};
PerlCriticPolicyVariablesProhibitLoopOnHash = buildPerlPackage {
pname = "Perl-Critic-Policy-Variables-ProhibitLoopOnHash";
version = "0.008";
src = fetchurl {
url = "mirror://cpan/authors/id/X/XS/XSAWYERX/Perl-Critic-Policy-Variables-ProhibitLoopOnHash-0.008.tar.gz";
sha256 = "12f5f0be96ea1bdc7828058577bd1c5c63ca23c17fac9c3709452b3dff5b84e0";
};
propagatedBuildInputs = [ PerlCritic ];
meta = {
description = "Don't write loops on hashes, only on keys and values of hashes";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
PerlCriticPulp = buildPerlPackage {
pname = "Perl-Critic-Pulp";
version = "99";
src = fetchurl {
url = "mirror://cpan/authors/id/K/KR/KRYDE/Perl-Critic-Pulp-99.tar.gz";
sha256 = "b8fda842fcbed74d210257c0a284b6dc7b1d0554a47a3de5d97e7d542e23e7fe";
};
propagatedBuildInputs = [ IOString ListMoreUtils PPI PerlCritic PodMinimumVersion ];
meta = {
homepage = "http://user42.tuxfamily.org/perl-critic-pulp/index.html";
description = "Some add-on policies for Perl::Critic";
license = lib.licenses.gpl3Plus;
};
};
PerlDestructLevel = buildPerlPackage {
pname = "Perl-Destruct-Level";
version = "0.02";
@@ -17305,6 +17350,21 @@ let
Po4a = callPackage ../development/perl-modules/Po4a { };
PodMinimumVersion = buildPerlPackage {
pname = "Pod-MinimumVersion";
version = "50";
src = fetchurl {
url = "mirror://cpan/authors/id/K/KR/KRYDE/Pod-MinimumVersion-50.tar.gz";
sha256 = "0bd2812d9aacbd99bb71fa103a4bb129e955c138ba7598734207dc9fb67b5a6f";
};
propagatedBuildInputs = [ IOString PodParser ];
meta = {
homepage = "http://user42.tuxfamily.org/pod-minimumversion/index.html";
description = "Determine minimum Perl version of POD directives";
license = lib.licenses.free;
};
};
POE = buildPerlPackage {
pname = "POE";
version = "1.368";