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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-27 18:14:28 +00:00 committed by GitHub
commit 97889a52e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
59 changed files with 2985 additions and 2110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
doc/languages-frameworks/agda.section.md
View File

@ -2,16 +2,19 @@
## How to use Agda
Agda can be installed from `agda`:
```ShellSession
$ nix-env -iA agda
```
Agda is available as the [agda](https://search.nixos.org/packages?channel=unstable&show=agda&from=0&size=30&sort=relevance&query=agda)
package.
To use Agda with libraries, the `agda.withPackages` function can be used. This function either takes:
The `agda` package installs an Agda-wrapper, which calls `agda` with `--library-file`
set to a generated library-file within the nix store, this means your library-file in
`$HOME/.agda/libraries` will be ignored. By default the agda package installs Agda
with no libraries, i.e. the generated library-file is empty. To use Agda with libraries,
the `agda.withPackages` function can be used. This function either takes:
* A list of packages,
* or a function which returns a list of packages when given the `agdaPackages` attribute set,
* or an attribute set containing a list of packages and a GHC derivation for compilation (see below).
* or an attribute set containing a function which returns a list of packages when given the `agdaPackages` attribute set and a GHC derivation for compilation (see below).
For example, suppose we wanted a version of Agda which has access to the standard library. This can be obtained with the expressions:
@ -27,9 +30,66 @@ agda.withPackages (p: [ p.standard-library ])
or can be called as in the [Compiling Agda](#compiling-agda) section.
If you want to use a library in your home directory (for instance if it is a development version) then typecheck it manually (using `agda.withPackages` if necessary) and then override the `src` attribute of the package to point to your local repository.
If you want to use a different version of a library (for instance a development version)
override the `src` attribute of the package to point to your local repository
Agda will not by default use these libraries. To tell Agda to use the library we have some options:
```nix
agda.withPackages (p: [
(p.standard-library.overrideAttrs (oldAttrs: {
version = "local version";
src = /path/to/local/repo/agda-stdlib;
}))
])
```
You can also reference a GitHub repository
```nix
agda.withPackages (p: [
(p.standard-library.overrideAttrs (oldAttrs: {
version = "1.5";
src = fetchFromGitHub {
repo = "agda-stdlib";
owner = "agda";
rev = "v1.5";
sha256 = "16fcb7ssj6kj687a042afaa2gq48rc8abihpm14k684ncihb2k4w";
};
}))
])
```
If you want to use a library not added to Nixpkgs, you can add a
dependency to a local library by calling `agdaPackages.mkDerivation`.
```nix
agda.withPackages (p: [
(p.mkDerivation {
pname = "your-agda-lib";
version = "1.0.0";
src = /path/to/your-agda-lib;
})
])
```
Again you can reference GitHub
```nix
agda.withPackages (p: [
(p.mkDerivation {
pname = "your-agda-lib";
version = "1.0.0";
src = fetchFromGitHub {
repo = "repo";
owner = "owner";
version = "...";
rev = "...";
sha256 = "...";
};
})
])
```
See [Building Agda Packages](#building-agda-packages) for more information on `mkDerivation`.
Agda will not by default use these libraries. To tell Agda to use a library we have some options:
* Call `agda` with the library flag:
```ShellSession
@ -46,7 +106,7 @@ depend: standard-library
More information can be found in the [official Agda documentation on library management](https://agda.readthedocs.io/en/v2.6.1/tools/package-system.html).
## Compiling Agda
Agda modules can be compiled with the `--compile` flag. A version of `ghc` with `ieee754` is made available to the Agda program via the `--with-compiler` flag.
Agda modules can be compiled using the GHC backend with the `--compile` flag. A version of `ghc` with `ieee754` is made available to the Agda program via the `--with-compiler` flag.
This can be overridden by a different version of `ghc` as follows:
```nix
@ -65,6 +125,21 @@ A derivation can then be written using `agdaPackages.mkDerivation`. This has sim
* `libraryName` should be the name that appears in the `*.agda-lib` file, defaulting to `pname`.
* `libraryFile` should be the file name of the `*.agda-lib` file, defaulting to `${libraryName}.agda-lib`.
Here is an example `default.nix`
```nix
{ nixpkgs ? <nixpkgs> }:
with (import nixpkgs {});
agdaPackages.mkDerivation {
version = "1.0";
pname = "my-agda-lib";
src = ./.;
buildInputs = [
agdaPackages.standard-library
];
}
```
### Building Agda packages
The default build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file.
If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden.
@ -80,10 +155,16 @@ By default, Agda sources are files ending on `.agda`, or literate Agda files end
## Adding Agda packages to Nixpkgs
To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other Agda libraries, so the top line of the `default.nix` can look like:
```nix
{ mkDerivation, standard-library, fetchFromGitHub }:
```
and `mkDerivation` should be called instead of `agdaPackages.mkDerivation`. Here is an example skeleton derivation for iowa-stdlib:
Note that the derivation function is called with `mkDerivation` set to `agdaPackages.mkDerivation`, therefore you
could use a similar set as in your `default.nix` from [Writing Agda Packages](#writing-agda-packages) with
`agdaPackages.mkDerivation` replaced with `mkDerivation`.
Here is an example skeleton derivation for iowa-stdlib:
```nix
mkDerivation {

6
nixos/doc/manual/release-notes/rl-2105.xml
View File

@ -94,6 +94,12 @@
been introduced.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://nginx.org">Nginx</link> has been updated to stable version 1.20.0.
Now nginx uses the zlib-ng library by default.
</para>
</listitem>
</itemizedlist>
</section>

6
nixos/modules/services/misc/gitlab.nix
View File

@ -588,7 +588,7 @@ in {
the DB. If you change or lose this key you will be unable to
access variables stored in database.
Make sure the secret is at least 30 characters and all random,
Make sure the secret is at least 32 characters and all random,
no regular words or you'll be exposed to dictionary attacks.
This should be a string, not a nix path, since nix paths are
@ -604,7 +604,7 @@ in {
the DB. If you change or lose this key you will be unable to
access variables stored in database.
Make sure the secret is at least 30 characters and all random,
Make sure the secret is at least 32 characters and all random,
no regular words or you'll be exposed to dictionary attacks.
This should be a string, not a nix path, since nix paths are
@ -620,7 +620,7 @@ in {
tokens. If you change or lose this key, users which have 2FA
enabled for login won't be able to login anymore.
Make sure the secret is at least 30 characters and all random,
Make sure the secret is at least 32 characters and all random,
no regular words or you'll be exposed to dictionary attacks.
This should be a string, not a nix path, since nix paths are

6
nixos/tests/gitlab.nix
View File

@ -57,9 +57,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
};
};
secrets = {
secretFile = pkgs.writeText "secret" "r8X9keSKynU7p4aKlh4GO1Bo77g5a7vj";
otpFile = pkgs.writeText "otpsecret" "Zu5hGx3YvQx40DvI8WoZJQpX2paSDOlG";
dbFile = pkgs.writeText "dbsecret" "lsGltKWTejOf6JxCVa7nLDenzkO9wPLR";
secretFile = pkgs.writeText "secret" "Aig5zaic";
otpFile = pkgs.writeText "otpsecret" "Riew9mue";
dbFile = pkgs.writeText "dbsecret" "we2quaeZ";
jwsFile = pkgs.runCommand "oidcKeyBase" {} "${pkgs.openssl}/bin/openssl genrsa 2048 > $out";
};
};

10
pkgs/applications/audio/qmmp/default.nix
View File

@ -4,7 +4,7 @@
, curl, libmms
# input plugins
, libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile
, libcdio, cdparanoia, libcddb, faad2, ffmpeg_3, wildmidi
, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi
# output plugins
, alsaLib, libpulseaudio
# effect plugins
@ -44,7 +44,7 @@ mkDerivation rec {
curl libmms
# input plugins
libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile
libcdio cdparanoia libcddb faad2 ffmpeg_3 wildmidi
libcdio cdparanoia libcddb faad2 ffmpeg wildmidi
# output plugins
alsaLib libpulseaudio
# effect plugins
@ -53,10 +53,10 @@ mkDerivation rec {
meta = with lib; {
description = "Qt-based audio player that looks like Winamp";
homepage = "http://qmmp.ylsoftware.com/";
license = licenses.gpl2;
homepage = "https://qmmp.ylsoftware.com/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
repositories.svn = "http://qmmp.googlecode.com/svn/";
repositories.svn = "https://svn.code.sf.net/p/qmmp-dev/code";
};
}

1
pkgs/applications/editors/gophernotes/default.nix
View File

@ -21,6 +21,5 @@ buildGoModule rec {
homepage = "https://github.com/gopherdata/gophernotes";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
platforms = platforms.all;
};
}

7
pkgs/applications/editors/jetbrains/default.nix
View File

@ -1,8 +1,7 @@
{ lib, stdenv, callPackage, fetchurl
, jdk, cmake, libxml2, zlib, python3, ncurses5
, dotnet-sdk_3
, jdk, cmake, zlib, python3
, dotnet-sdk_5
, autoPatchelfHook
, glib
, libdbusmenu
, vmopts ? null
}:
@ -197,7 +196,7 @@ let
patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + ''
rm -rf lib/ReSharperHost/linux-x64/dotnet
mkdir -p lib/ReSharperHost/linux-x64/dotnet/
ln -s ${dotnet-sdk_3}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
ln -s ${dotnet-sdk_5}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
'');
});

6
pkgs/applications/graphics/mcomix3/default.nix
View File

@ -17,13 +17,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "mcomix3";
version = "unstable-2020-11-23";
version = "unstable-2021-04-23";
# no official release on pypi/github and no build system
src = fetchFromGitHub {
repo = "${pname}";
owner = "multiSnow";
rev = "cdcb27533dc7ee2ebf7b0a8ab5ba10e61c0b8ff8";
rev = "139344e23898c28484328fc29fd0c6659affb12d";
sha256 = "0q9xgl60ryf7qmy5vgzgfry4rvw5j9rb4d1ilxmpjmvm7dd3fm2k";
};
@ -46,6 +46,8 @@ python3.pkgs.buildPythonApplication rec {
installPhase = ''
runHook preInstall
substituteInPlace mime/*.desktop \
--replace "Exec=mcomix" "Exec=mcomix3"
${python3.executable} installer.py --srcdir=mcomix --target=$libdir
mv $libdir/mcomix/mcomixstarter.py $out/bin/${pname}
mv $libdir/mcomix/comicthumb.py $out/bin/comicthumb

11
pkgs/applications/misc/bottles/default.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub
, meson, ninja, pkg-config, wrapGAppsHook
, desktop-file-utils, gsettings-desktop-schemas, libnotify
, desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy
, python3Packages, gettext
, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3
, steam-run-native
@ -8,13 +8,13 @@
python3Packages.buildPythonApplication rec {
pname = "bottles";
version = "2.1.1";
version = "3.1.6";
src = fetchFromGitHub {
owner = "bottlesdevs";
repo = pname;
rev = version;
sha256 = "1hbjnd06h0h47gcwb1s1b9py5nwmia1m35da6zydbl70vs75imhn";
sha256 = "1izks01010akjf83xvi70dr4yzgk6yr84kd0slzz22yq204pdh5m";
};
postPatch = ''
@ -39,6 +39,7 @@ python3Packages.buildPythonApplication rec {
gsettings-desktop-schemas
gspell
gtk3
libhandy
libnotify
];
@ -69,9 +70,9 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
description = "An easy-to-use wineprefix manager";
homepage = "https://github.com/bottlesdevs/Bottles";
homepage = "https://usebottles.com/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ bloomvdomino ];
maintainers = with maintainers; [ bloomvdomino shamilton ];
platforms = platforms.linux;
};
}

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

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "coolreader";
version = "3.2.55";
version = "3.2.57";
src = fetchFromGitHub {
owner = "buggins";
repo = pname;
rev = "cr${version}";
sha256 = "sha256-gYAaYGEjw7p6y4h5j6j/4Ld+b37Nv+kt04Wp+qb8gzY=";
sha256 = "sha256-ZfgaLCLvBU6xP7nx7YJTsJSpvpdQgLpSMWH+BsG8E1g=";
};
nativeBuildInputs = [ cmake pkg-config ];

6
pkgs/applications/misc/joplin-desktop/default.nix
View File

@ -2,7 +2,7 @@
let
pname = "joplin-desktop";
version = "1.7.10";
version = "1.7.11";
name = "${pname}-${version}";
inherit (stdenv.hostPlatform) system;
@ -16,8 +16,8 @@ let
src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
sha256 = {
x86_64-linux = "1f8pfssfqigh0fl5r5wpvdpn48dx1q9qq4mfqi2s5z94h7ci2jxg";
x86_64-darwin = "0s29mhf88nlhaabmd32k21h1qiavgpqqksbdjxkx8bfg591s8jqb";
x86_64-linux = "11vjipvhfvf6wxldcg743anma005j8dbbngqk6sq9hlf677ahxii";
x86_64-darwin = "1l7m86jlf1m066n6rwmh5fkpx2pj3wj5h9ncxdd24v0zll6ki8vs";
}.${system} or throwSystem;
};

26
pkgs/applications/misc/kile-wl/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, fetchFromGitLab, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "kile-wl";
version = "unstable-2021-04-22";
src = fetchFromGitLab {
owner = "snakedye";
repo = "kile";
rev = "b97b9f1e5b33862b33918efaf23fd1c0c5d7058a";
sha256 = "sha256-97qJd3o8nJt8IX5tyGWtAmJsIv5Gcw1xoBFwxAqk7I8=";
};
# Upstream has Cargo.lock gitignored
cargoPatches = [ ./update-Cargo-lock.diff ];
cargoSha256 = "sha256-TEgIiw/XTDUOe9K7agHWI86f88w+eDJ332V0CgNHtfo=";
meta = with lib; {
description = "A tiling layout generator for river";
homepage = "https://gitlab.com/snakedye/kile";
license = licenses.mit;
platforms = platforms.linux; # It's meant for river, a wayland compositor
maintainers = with maintainers; [ fortuneteller2k ];
};
}

153
pkgs/applications/misc/kile-wl/update-Cargo-lock.diff Normal file
View File

@ -0,0 +1,153 @@
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..05cf87b
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,147 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "cc"
+version = "1.0.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "downcast-rs"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+
+[[package]]
+name = "kile"
+version = "0.1.0"
+dependencies = [
+ "wayland-client",
+ "wayland-commons",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
+
+[[package]]
+name = "nix"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+[[package]]
+name = "wayland-client"
+version = "0.28.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ca44d86554b85cf449f1557edc6cc7da935cc748c8e4bf1c507cbd43bae02c"
+dependencies = [
+ "bitflags",
+ "downcast-rs",
+ "libc",
+ "nix",
+ "wayland-commons",
+ "wayland-scanner",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-commons"
+version = "0.28.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bd75ae380325dbcff2707f0cd9869827ea1d2d6d534cff076858d3f0460fd5a"
+dependencies = [
+ "nix",
+ "once_cell",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.28.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "389d680d7bd67512dc9c37f39560224327038deb0f0e8d33f870900441b68720"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "xml-rs",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.28.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2907bd297eef464a95ba9349ea771611771aa285b932526c633dc94d5400a8e2"
+dependencies = [
+ "pkg-config",
+]
+
+[[package]]
+name = "xml-rs"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a"

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -1,8 +1,8 @@
{
"stable": {
"version": "90.0.4430.85",
"sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81",
"sha256bin64": "0li9w6zfsmx5r90jm5v5gfv3l2a76jndg6z5jvb9yx9xvrp9gpir",
"version": "90.0.4430.93",
"sha256": "0zimr975vp0v12zz1nqjwag3f0q147wrmdhpzgi4yf089rgwfbjk",
"sha256bin64": "1vifcrrfv69i0q7qnnml43xr0c20bi22hfw6lygq3k2x70zdzgl6",
"deps": {
"gn": {
"version": "2021-02-09",

1
pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
View File

@ -30,6 +30,5 @@ buildGoModule rec {
inherit (src.meta) homepage;
license = licenses.apsl20;
maintainers = with maintainers; [ yurrriq ];
platforms = platforms.all;
};
}

1
pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
View File

@ -33,6 +33,5 @@ buildGoModule rec {
inherit (src.meta) homepage;
license = licenses.apsl20;
maintainers = with maintainers; [ yurrriq ];
platforms = platforms.all;
};
}

13
pkgs/applications/networking/cluster/terraform/default.nix
View File

@ -49,7 +49,6 @@ let
babariviere
kalbasit
marsam
peterhoeg
timstott
zimbatm
];
@ -137,8 +136,8 @@ let
];
in rec {
terraform_0_12 = pluggable (generic {
version = "0.12.30";
sha256 = "0mv2nsy2ygb1kgkw98xckihcdqxpzhdmks5p2gi2l7wb7lx51yz2";
version = "0.12.31";
sha256 = "03p698xdbk5gj0f9v8v1fpd74zng3948dyy4f2hv7zgks9hid7fg";
patches = [
./provider-path.patch
(fetchpatch {
@ -150,15 +149,15 @@ in rec {
});
terraform_0_13 = pluggable (generic {
version = "0.13.6";
sha256 = "04vas8i894ssfhncdvljdvmvj2qzfrcs20zcv71l1wmnnv9ibs6l";
version = "0.13.7";
sha256 = "1cahnmp66dk21g7ga6454yfhaqrxff7hpwpdgc87cswyq823fgjn";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
terraform_0_14 = pluggable (generic {
version = "0.14.10";
sha256 = "05vfb8hzma3qxq4w1h25mmgv96g90if214zlar0sm9fq8zsvb1yw";
version = "0.14.11";
sha256 = "1yi1jj3n61g1kn8klw6l78shd23q79llb7qqwigqrx3ki2mp279j";
vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };

55
pkgs/applications/networking/instant-messengers/qtox/default.nix
View File

@ -1,9 +1,30 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, perl
, libtoxcore, libpthreadstubs, libXdmcp, libXScrnSaver
, qtbase, qtsvg, qttools, qttranslations
, ffmpeg_3, filter-audio, libexif, libsodium, libopus
, libvpx, openal, pcre, qrencode, sqlcipher
, AVFoundation }:
{ lib
, stdenv
, mkDerivation
, fetchFromGitHub
, cmake
, pkg-config
, perl
, libtoxcore
, libpthreadstubs
, libXdmcp
, libXScrnSaver
, qtbase
, qtsvg
, qttools
, qttranslations
, ffmpeg
, filter-audio
, libexif
, libsodium
, libopus
, libvpx
, openal
, pcre
, qrencode
, sqlcipher
, AVFoundation
}:
mkDerivation rec {
pname = "qtox";
@ -18,11 +39,23 @@ mkDerivation rec {
buildInputs = [
libtoxcore
libpthreadstubs libXdmcp libXScrnSaver
qtbase qtsvg qttranslations
ffmpeg_3 filter-audio libexif libopus libsodium
libvpx openal pcre qrencode sqlcipher
] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ;
libpthreadstubs
libXdmcp
libXScrnSaver
qtbase
qtsvg
qttranslations
ffmpeg
filter-audio
libexif
libopus
libsodium
libvpx
openal
pcre
qrencode
sqlcipher
] ++ lib.optionals stdenv.isDarwin [ AVFoundation ];
nativeBuildInputs = [ cmake pkg-config qttools ]
++ lib.optionals stdenv.isDarwin [ perl ];

12
pkgs/applications/office/scribus/unstable.nix
View File

@ -2,7 +2,6 @@
, cairo
, cmake
, cups
, fetchpatch
, fetchurl
, fontconfig
, freetype
@ -36,20 +35,13 @@ in
mkDerivation rec {
pname = "scribus";
version = "1.5.6.1";
version = "1.5.7";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s=";
sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4=";
};
patches = [
(fetchpatch { # fix build with podofo 0.9.7
url = "https://github.com/scribusproject/scribus/commit/c6182ef92820b422d61c904e40e9fed865458eb5.patch";
sha256 = "0vp275xfbd4xnj5s55cgzsihgihby5mmjlbmrc7sa6jbrsm8aa2c";
})
];
nativeBuildInputs = [
cmake
pkg-config

1
pkgs/applications/version-management/git-and-tools/ghorg/default.nix
View File

@ -32,6 +32,5 @@ buildGoModule rec {
homepage = "https://github.com/gabrie30/ghorg";
license = licenses.asl20;
maintainers = with maintainers; [ vidbina ];
platforms = platforms.all;
};
}

11
pkgs/applications/version-management/gitlab/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv
, ruby, tzdata, git, nettools, nixosTests, nodejs, openssl
, gitlabEnterprise ? false, callPackage, yarn
, fixup_yarn_lock, replace, file
@ -125,6 +125,15 @@ stdenv.mkDerivation {
patches = [
# Change hardcoded paths to the NixOS equivalent
./remove-hardcoded-locations.patch
# Use the exactly 32 byte long version of db_key_base with
# aes-256-gcm, see
# https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53602
(fetchpatch {
name = "secrets_db_key_base_length.patch";
url = "https://gitlab.com/gitlab-org/gitlab/-/commit/dea620633d446ca0f53a75674454ff0dd4bd8f99.patch";
sha256 = "19m4z4np3sai9kqqqgabl44xv7p8lkcyqr6s5471axfxmf9m2023";
})
];
postPatch = ''

4
pkgs/applications/video/mplayer/default.nix
View File

@ -1,4 +1,4 @@
{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg_3
{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg
, aalibSupport ? true, aalib ? null
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
, fribidiSupport ? true, fribidi ? null
@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config yasm ];
buildInputs = with lib;
[ freetype ffmpeg_3 ]
[ freetype ffmpeg ]
++ optional aalibSupport aalib
++ optional fontconfigSupport fontconfig
++ optional fribidiSupport fribidi

4
pkgs/development/interpreters/clojure/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.10.3.814";
version = "1.10.3.822";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-+jpnhuKPvxKJA8xDo9GiRKpFJdPYRJTssmZtafadEn4=";
sha256 = "14vl2lycbcihashs8443rgwi4llkjkrfwls9sfr7dq3mi2g7fidb";
};
nativeBuildInputs = [

1
pkgs/development/libraries/boringssl/default.nix
View File

@ -52,7 +52,6 @@ buildGoModule {
meta = with lib; {
description = "Free TLS/SSL implementation";
homepage = "https://boringssl.googlesource.com";
platforms = platforms.all;
maintainers = [ maintainers.thoughtpolice ];
license = with licenses; [ openssl isc mit bsd3 ];
};

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

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, sqlite, cppcheck, gtest }:
stdenv.mkDerivation rec {
pname = "SQLiteCpp";
pname = "sqlitecpp";
version = "3.1.1";
src = fetchFromGitHub {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "http://srombauts.github.com/SQLiteCpp";
homepage = "https://srombauts.github.io/SQLiteCpp/";
description = "C++ SQLite3 wrapper";
license = licenses.mit;
platforms = platforms.unix;

30
pkgs/development/libraries/waffle/default.nix
View File

@ -1,36 +1,34 @@
{ stdenv
, fetchFromGitLab
, lib
, cmake
, meson
, ninja
, bash-completion
, libGL
, libglvnd ? null
, libglvnd
, makeWrapper
, pkg-config
, python3
, x11Support ? true, libxcb ? null, libX11 ? null
, waylandSupport ? true, wayland ? null
, useGbm ? true, mesa ? null, libudev ? null
, x11Support ? true, libxcb, libX11
, waylandSupport ? true, wayland, wayland-protocols
, useGbm ? true, mesa, udev
}:
assert x11Support -> (libxcb != null && libX11 != null);
assert waylandSupport -> wayland != null;
assert useGbm -> (mesa != null && libudev != null);
assert with stdenv.hostPlatform; isUnix && !isDarwin -> libglvnd != null;
stdenv.mkDerivation rec {
pname = "waffle";
version = "1.6.1";
version = "1.7.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mesa";
repo = "waffle";
rev = "v${version}";
sha256 = "0s8gislmhccfa04zsj1yqk97lscbbnmxirr2zm4q3p8ybmpfhpqr";
sha256 = "iY+dAgXutD/uDFocwd9QXjq502IOsk+3RQMA2S/CMV4=";
};
buildInputs = [
bash-completion
libGL
] ++ lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [
libglvnd
@ -39,19 +37,25 @@ stdenv.mkDerivation rec {
libxcb
] ++ lib.optionals waylandSupport [
wayland
wayland-protocols
] ++ lib.optionals useGbm [
udev
mesa
libudev
];
dontUseCmakeConfigure = true;
nativeBuildInputs = [
cmake
makeWrapper
meson
ninja
makeWrapper
pkg-config
python3
];
PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions";
postInstall = ''
wrapProgram $out/bin/wflinfo \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libglvnd ]}

1
pkgs/development/node-packages/node-packages.json
View File

@ -252,6 +252,7 @@
, "vega-cli"
, "vega-lite"
, "vim-language-server"
, "vls"
, "vscode-css-languageserver-bin"
, "vscode-html-languageserver-bin"
, "vscode-json-languageserver"

4135
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/php-packages/composer/1.x.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
let
pname = "composer";
version = "1.10.15";
version = "1.10.22";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "1shsxsrc2kq74s1jbq3njn9wzidcz7ak66n9vyz8z8d0hqpg37d6";
sha256 = "00073smi1jja00d4bqfs6p4fqs38mki2ziy7b1kwsmiv5lcsw9v1";
};
dontUnpack = true;
@ -16,11 +16,13 @@ mkDerivation {
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
install -D $src $out/libexec/composer/composer.phar
makeWrapper ${php}/bin/php $out/bin/composer \
--add-flags "$out/libexec/composer/composer.phar" \
--prefix PATH : ${lib.makeBinPath [ unzip ]}
runHook postInstall
'';
meta = with lib; {

6
pkgs/development/php-packages/composer/default.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
let
pname = "composer";
version = "2.0.12";
version = "2.0.13";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "sha256-guqMFTfPrOt+VvYATHzN+Z3a/OcjfAc3TZIOY1cwpjE=";
sha256 = "sha256-EW/fB8ySavZGY1pqvJLYiv97AqXcNlOPgcUKfSc2bb8=";
};
dontUnpack = true;
@ -16,11 +16,13 @@ mkDerivation {
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
install -D $src $out/libexec/composer/composer.phar
makeWrapper ${php}/bin/php $out/bin/composer \
--add-flags "$out/libexec/composer/composer.phar" \
--prefix PATH : ${lib.makeBinPath [ unzip ]}
runHook postInstall
'';
meta = with lib; {

29
pkgs/development/python-modules/ghp-import/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib
, buildPythonPackage
, fetchPypi
, dateutil
}:
buildPythonPackage rec {
pname = "ghp-import";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-wiqc4Qw3dT4miNFk12WnANrkuNefptsKLDEyuniBiU8=";
};
propagatedBuildInputs = [ dateutil ];
# Does not include any unit tests
doCheck = false;
pythonImportsCheck = [ "ghp_import" ];
meta = with lib; {
description = "Copy your docs directly to the gh-pages branch";
homepage = "https://github.com/c-w/ghp-import";
license = licenses.asl20;
maintainers = with maintainers; [ veehaitch ];
};
}

56
pkgs/development/python-modules/mock-services/default.nix Normal file
View File

@ -0,0 +1,56 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, attrs
, funcsigs
, requests-mock
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "mock-services";
version = "0.3.1";
src = fetchFromGitHub {
owner = "peopledoc";
repo = "mock-services";
rev = version;
sha256 = "1rqyyfwngi1xsd9a81irjxacinkj1zf6nqfvfxhi55ky34x5phf9";
};
patches = [
# Fix issues due to internal API breaking in latest versions of requests-mock
(fetchpatch {
url = "https://github.com/peopledoc/mock-services/commit/88d3a0c9ef4dd7d5e011068ed2fdbbecc4a1a03a.patch";
sha256 = "0a4pwxr33kr525sp8q4mb4cr3n2b51mj2a3052lhg6brdbi4gnms";
})
];
propagatedBuildInputs = [
attrs
funcsigs
requests-mock
];
checkInputs = [
pytestCheckHook
];
disabledTests = [
# require networking
"test_real_http_1"
"test_restart_http_mock"
"test_start_http_mock"
"test_stop_http_mock"
];
pythonImportsCheck = [ "mock_services" ];
meta = with lib; {
description = "Mock an entire service API based on requests-mock";
homepage = "https://github.com/peopledoc/mock-services";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

44
pkgs/development/python-modules/pylxd/default.nix
View File

@ -1,24 +1,48 @@
{ lib, buildPythonPackage, fetchPypi, pbr, dateutil, ws4py, requests-unixsocket, requests-toolbelt, mock }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, cryptography
, python-dateutil
, requests
, requests-toolbelt
, requests-unixsocket
, ws4py
, ddt
, mock-services
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pylxd";
version = "2.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "1db88l55q974fm9z5gllx3i8bkj0jzi25xrr5cs6id3bfy4zp8a7";
src = fetchFromGitHub {
owner = "lxc";
repo = "pylxd";
rev = version;
sha256 = "144frnlsb21mglgyisms790hyrdfx1l91lcd7incch4m4a1cbpp6";
};
propagatedBuildInputs = [
pbr
dateutil
ws4py
requests-unixsocket
cryptography
python-dateutil
requests
requests-toolbelt
requests-unixsocket
ws4py
];
checkInputs = [
ddt
mock-services
pytestCheckHook
];
disabledTestPaths = [
"integration"
"migration"
];
# tests require an old version of requests-mock that we do not have a package for
doCheck = false;
pythonImportsCheck = [ "pylxd" ];
meta = with lib; {

7
pkgs/development/python-modules/python-language-server/default.nix
View File

@ -30,6 +30,13 @@ buildPythonPackage rec {
sha256 = "07x6jr4z20jxn03bxblwc8vk0ywha492cgwfhj7q97nb5cm7kx0q";
};
postPatch = ''
# Reading the changelog I don't expect an API break in pycodestyle and pyflakes
substituteInPlace setup.py \
--replace "pycodestyle>=2.6.0,<2.7.0" "pycodestyle>=2.6.0,<2.8.0" \
--replace "pyflakes>=2.2.0,<2.3.0" "pyflakes>=2.2.0,<2.4.0"
'';
propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ujson ]
++ lib.optional (withProvider "autopep8") autopep8
++ lib.optional (withProvider "mccabe") mccabe

12
pkgs/development/python-modules/spyder/default.nix
View File

@ -3,7 +3,7 @@
keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl,
cloudpickle, pygments, spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle,
watchdog, python-language-server, pyqtwebengine, atomicwrites, pyxdg,
diff-match-patch, three-merge, pyls-black, pyls-spyder, flake8
diff-match-patch, three-merge, pyls-black, pyls-spyder, flake8, textdistance
}:
buildPythonPackage rec {
@ -20,11 +20,11 @@ buildPythonPackage rec {
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
propagatedBuildInputs = [
intervaltree jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
intervaltree jedi pycodestyle psutil rope numpy scipy matplotlib pylint keyring
numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server
atomicwrites pyxdg diff-match-patch three-merge pyls-black pyls-spyder
flake8
flake8 textdistance
];
# There is no test for spyder
@ -44,9 +44,13 @@ buildPythonPackage rec {
# remove dependency on pyqtwebengine
# this is still part of the pyqt 5.11 version we have in nixpkgs
sed -i /pyqtwebengine/d setup.py
# The major version bump in watchdog is due to changes in supported
# platforms, not API break.
# https://github.com/gorakhargosh/watchdog/issues/761#issuecomment-777001518
substituteInPlace setup.py \
--replace "pyqt5<5.13" "pyqt5" \
--replace "parso==0.7.0" "parso"
--replace "parso==0.7.0" "parso" \
--replace "watchdog>=0.10.3,<2.0.0" "watchdog>=0.10.3,<3.0.0"
'';
postInstall = ''

23
pkgs/development/python-modules/textdistance/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "textdistance";
version = "4.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "114j3ignw4y9yq1cp08p4bfw518vyr3p0h8ba2mikwy74qxxzy26";
};
# There aren't tests
doCheck = false;
pythonImportsCheck = [ "textdistance" ];
meta = with lib; {
description = "Python library for comparing distance between two or more sequences";
homepage = "https://github.com/life4/textdistance";
license = licenses.mit;
maintainers = with maintainers; [ eduardosm ];
};
}

6
pkgs/development/tools/cue/default.nix
View File

@ -2,12 +2,12 @@
buildGoModule rec {
pname = "cue";
version = "0.3.0";
version = "0.3.2";
src = fetchgit {
url = "https://cue.googlesource.com/cue";
rev = "v${version}";
sha256 = "1h3809xgmn7dr57i3cnifr7r555i3zh3kfsv0gxa9nd7068w19xm";
sha256 = "0rfgpq4dyd3zm07vcjzn5vv0dhvvryrarxc50sd2pxagbq5cqc8l";
};
vendorSha256 = "10kvss23a8a6q26a7h1bqc3i0nskm2halsvc9wdv9zf9qsz7zjkp";
@ -17,7 +17,7 @@ buildGoModule rec {
subPackages = [ "cmd/cue" ];
buildFlagsArray = [
"-ldflags=-X cuelang.org/go/cmd/cue/cmd.version=${version}"
"-ldflags=-s -w -X cuelang.org/go/cmd/cue/cmd.version=${version}"
];
meta = {

4
pkgs/development/tools/esbuild/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.11.14";
version = "0.11.15";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "0qxylzc7lzpsp5hm3dl5jvy9aca8azn8dmbjz9z5n5rkdmm8vd9p";
sha256 = "1j6qli26i2hwkjqcigz7vyx6hg9daq4vlqigv7ddslw3h8hnp0md";
};
vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q";

28
pkgs/development/tools/ghp-import/default.nix
View File

@ -1,28 +0,0 @@
{ python3, glibcLocales, lib }:
with python3.pkgs;
buildPythonApplication rec {
version = "0.5.5";
pname = "ghp-import";
src = fetchPypi {
inherit pname version;
sha256 = "1mvmpi7lqflw2lr0g0y5f9s0d1pv9cav4gbmaqnziqg442klx4iy";
};
disabled = isPyPy;
buildInputs = [ glibcLocales ];
LC_ALL="en_US.UTF-8";
# No tests available
doCheck = false;
meta = {
description = "Copy your docs directly to the gh-pages branch";
homepage = "https://github.com/davisp/ghp-import";
license = "Tumbolia Public License";
maintainers = with lib.maintainers; [ ];
};
}

4
pkgs/development/tools/misc/strace/default.nix
View File

@ -6,11 +6,11 @@ assert stdenv.isLinux;
stdenv.mkDerivation rec {
pname = "strace";
version = "5.11";
version = "5.12";
src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-/+NAsQwUWg+Fc0Jx6czlZFfSPyGn6lkxqzL4z055OHk=";
sha256 = "sha256-KRce350lL4nJiKTDQN/exmL0WMuMY9hUMdZLq1kR58Q=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

1
pkgs/development/tools/protoc-gen-go-grpc/default.nix
View File

@ -24,6 +24,5 @@ buildGoPackage rec {
description = "The Go language implementation of gRPC. HTTP/2 based RPC";
license = licenses.asl20;
maintainers = [ maintainers.raboof ];
platforms = platforms.all;
};
}

61
pkgs/misc/emulators/punes/default.nix Normal file
View File

@ -0,0 +1,61 @@
{ mkDerivation
, stdenv
, lib
, fetchFromGitHub
, unstableGitUpdater
, qtbase
, qtsvg
, qttools
, autoreconfHook
, cmake
, pkg-config
, ffmpeg
, libGLU
, alsaLib
, sndio
}:
mkDerivation rec {
pname = "punes";
version = "unstable-2021-04-25";
src = fetchFromGitHub {
owner = "punesemu";
repo = "puNES";
rev = "4b4c3495a56d3989544cb56079ce641da8aa9b35";
sha256 = "1wszvdgm38513v26p14k58shbkxn1qhkn8l0hsqi04vviicad59s";
};
postPatch = ''
substituteInPlace configure.ac \
--replace '`$PKG_CONFIG --variable=host_bins Qt5Core`/lrelease' '${qttools.dev}/bin/lrelease'
'';
nativeBuildInputs = [ autoreconfHook cmake pkg-config qttools ];
buildInputs = [ ffmpeg qtbase qtsvg libGLU ]
++ lib.optionals stdenv.hostPlatform.isLinux [ alsaLib ]
++ lib.optionals stdenv.hostPlatform.isBSD [ sndio ];
dontUseCmakeConfigure = true;
enableParallelBuilding = true;
configureFlags = [
"--prefix=${placeholder "out"}"
"--without-opengl-nvidia-cg"
"--with-ffmpeg"
];
passthru.updateScript = unstableGitUpdater {
url = "https://github.com/punesemu/puNES.git";
};
meta = with lib; {
description = "Qt-based Nintendo Entertaiment System emulator and NSF/NSFe Music Player";
homepage = "https://github.com/punesemu/puNES";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ OPNA2608 ];
platforms = with platforms; linux ++ freebsd ++ openbsd ++ windows;
};
}

4
pkgs/misc/vscode-extensions/default.nix
View File

@ -839,8 +839,8 @@ let
mktplcRef = {
name = "metals";
publisher = "scalameta";
version = "1.10.3";
sha256 = "0m4qm1z1j6gfqjjnxl8v48ga7zkaspjy3gcnkrch3aj4fyafjl09";
version = "1.10.4";
sha256 = "0q6zjpdi98png4vpzz39q85nxmsh3h1nnan58saz5rr83d6jgj89";
};
meta = {
license = lib.licenses.asl20;

4
pkgs/servers/bazarr/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bazarr";
version = "0.9.2";
version = "0.9.4";
src = fetchurl {
url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz";
sha256 = "16mh7v8z5ijr75pvavcj6225w6bg12qy1d1w9vm2d5axnfm3wfbk";
sha256 = "1qnzjqpwsvanfhd1yn5789yx4d3ijk9983llm0w5xnjz6rmcxrw5";
};
nativeBuildInputs = [ makeWrapper ];

11
pkgs/servers/http/jetty/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "jetty";
version = "9.4.37.v20210219";
version = "9.4.39.v20210325";
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
sha256 = "sha256-Jyg0cQBnwYtcVJnr2uWwE/9yC3wq+CLTTGKtv3BsZs8=";
sha256 = "0mn3ranh599w946cnykj7sbkj4w7ddpdhly7njmalsgabfbk8qv5";
};
dontBuild = true;
@ -15,10 +15,11 @@ stdenv.mkDerivation rec {
mv etc lib modules start.ini start.jar $out
'';
meta = {
meta = with lib; {
description = "A Web server and javax.servlet container";
homepage = "https://www.eclipse.org/jetty/";
platforms = lib.platforms.all;
license = [ lib.licenses.asl20 lib.licenses.epl10 ];
platforms = platforms.all;
license = with licenses; [ asl20 epl10 ];
maintainers = with maintainers; [ emmanuelrosa ];
};
}

4
pkgs/servers/http/nginx/mainline.nix
View File

@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix args {
version = "1.19.9";
sha256 = "0hfqqyfgqa6wqazmb3d434nb3r5p8szfisa0m6nfh9lqdbqdyd9f";
version = "1.20.0";
sha256 = "072dn2qhgx20y4pfa3mi97qszbifhcnwj28ccin4iamwivn93vsl";
}

4
pkgs/servers/http/nginx/stable.nix
View File

@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix args {
version = "1.18.0";
sha256 = "16azscl74ym1far0s0p6xsjin1k1cm4wk80i9x5d74dznmx3wdsc";
version = "1.20.0";
sha256 = "072dn2qhgx20y4pfa3mi97qszbifhcnwj28ccin4iamwivn93vsl";
}

1
pkgs/servers/irc/robustirc-bridge/default.nix
View File

@ -24,6 +24,5 @@ buildGoModule rec {
homepage = "https://robustirc.net/";
license = licenses.bsd3;
maintainers = [ maintainers.hax404 ];
platforms = platforms.all;
};
}

1
pkgs/servers/monitoring/mackerel-agent/default.nix
View File

@ -37,6 +37,5 @@ buildGoModule rec {
homepage = "https://github.com/mackerelio/mackerel-agent";
license = licenses.asl20;
maintainers = with maintainers; [ midchildan ];
platforms = platforms.all;
};
}

4
pkgs/servers/sonarr/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "sonarr";
version = "3.0.5.1144";
version = "3.0.6.1196";
src = fetchurl {
url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz";
sha256 = "1ajqh3hvjfsbs6rb2f8dnndxsycmlzamp0cwjwkh1j2dinbzdbvp";
sha256 = "10fm5s1ayjmj0ip5510rb0nfh08gdaxin0xf2f3qw1z5kxys88fm";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/servers/sql/postgresql/ext/pgroonga.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pgroonga";
version = "2.2.8";
version = "2.2.9";
src = fetchurl {
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-YDDO3t6ARbQv72QotjA7DNxOlRo2O5CYzrH+/eEzj3w=";
sha256 = "1dz3800jrq41l833q5ihi511wj5fiyw329g7hbxsbc9whkx7hngn";
};
nativeBuildInputs = [ pkg-config ];

6
pkgs/shells/zsh/oh-my-zsh/default.nix
View File

@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
version = "2021-04-11";
version = "2021-04-26";
pname = "oh-my-zsh";
rev = "12669f29f0843b8b980dd137f150a74511f88842";
rev = "63a7422d8dd5eb93c849df0ab9e679e6f333818a";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "07vcxw60cvlh745lgy03l6vgsxkalmwh386akvrpvbg9a6p6k8rb";
sha256 = "1spi6y5jmha0bf1s69mycpmksxjniqmcnvkvmza4rhji8v8b120w";
};
installPhase = ''

29
pkgs/tools/compression/imagelol/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "imagelol";
version = "0.2";
src = fetchFromGitHub {
owner = "MCRedstoner2004";
repo = pname;
rev = "v${version}";
sha256 = "0978zdrfj41jsqm78afyyd1l64iki9nwjvhd8ynii1b553nn4dmd";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
installPhase = ''
mkdir -p $out/bin
cp ./ImageLOL $out/bin
'';
meta = with lib; {
homepage = "https://github.com/MCredstoner2004/ImageLOL";
description = "Simple program to store a file into a PNG image";
license = licenses.mit;
maintainers = [ maintainers.ivar ];
platforms = platforms.unix;
};
}

31
pkgs/tools/security/kubei/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "kubei";
version = "1.0.11";
src = fetchFromGitHub {
owner = "Portshift";
repo = pname;
rev = version;
sha256 = "0n9kzlw7wlzkc3yhq68jgjhnvig817kz0q81ydkjxp4snwc1kvw8";
};
vendorSha256 = "0q0vkajn5n1aqb8wwdkvg8jv6j98l70g4hb399ickamhnirk69g4";
meta = with lib; {
description = "Kubernetes runtime scanner";
longDescription = ''
Kubei is a vulnerabilities scanning and CIS Docker benchmark tool that
allows users to get an accurate and immediate risk assessment of their
kubernetes clusters. Kubei scans all images that are being used in a
Kubernetes cluster, including images of application pods and system pods.
'';
homepage = "https://github.com/Portshift/kubei";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

28
pkgs/tools/security/kubesec/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "kubesec";
version = "2.11.0";
src = fetchFromGitHub {
owner = "controlplaneio";
repo = pname;
rev = "v${version}";
sha256 = "0rv5qywh8107rqdly1x7wkb6dljalyn9abrkm12bxa7cqscp9b4z";
};
vendorSha256 = "0xngnx67giwp0g7c19xhb6kmc9m3bjlwk2wwp9bn9vwkmss3ysyp";
# Tests wants to download additional files
doCheck = false;
meta = with lib; {
description = "Security risk analysis tool for Kubernetes resources";
homepage = "https://github.com/controlplaneio/kubesec";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

19
pkgs/tools/security/rbw/bump-security-framework-crate.patch
View File

@ -1,19 +0,0 @@
Bump security-framework from 2.1.1 to 2.1.2
security-framework=2.1.1 doesn't build on Darwin 10.12.
https://github.com/kornelski/rust-security-framework/issues/124
--- i/Cargo.lock
+++ w/Cargo.lock
@@ -1361,9 +1361,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "security-framework"
-version = "2.1.1"
+version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166"
+checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d"
dependencies = [
"bitflags",
"core-foundation",

17
pkgs/tools/security/rbw/default.nix
View File

@ -5,6 +5,7 @@
, openssl
, pkg-config
, makeWrapper
, installShellFiles
, Security
, libiconv
@ -20,21 +21,20 @@
rustPlatform.buildRustPackage rec {
pname = "rbw";
version = "1.1.2";
version = "1.2.0";
src = fetchCrate {
inherit version;
crateName = pname;
sha256 = "1xihjx4f8kgyablxsy8vgn4w6i92p2xm5ncacdk39npa5g8wadlx";
sha256 = "14cnqc5cf6qm2g9ypv2pbqbvymawyrqn3fc778labgqg24khqcyq";
};
cargoSha256 = "0fvs06wd05a90dggi7n46d5gl9flnciqzg9j3ijmz3z5bb6aky1b";
cargoPatches = [ ./bump-security-framework-crate.patch ];
cargoSha256 = "0izn5bcvk1rx69sjwyfc49nmvw7k0jysqb0bpdpwdliaa06ggl86";
nativeBuildInputs = [
pkg-config
makeWrapper
installShellFiles
];
buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
@ -60,7 +60,12 @@ rustPlatform.buildRustPackage rec {
export OPENSSL_LIB_DIR="${openssl.out}/lib"
'';
postInstall = lib.optionalString withFzf ''
postInstall = ''
for shell in bash zsh fish; do
$out/bin/rbw gen-completions $shell > rbw.$shell
installShellCompletion rbw.$shell
done
'' + lib.optionalString withFzf ''
cp bin/rbw-fzf $out/bin
'' + lib.optionalString withRofi ''
cp bin/rbw-rofi $out/bin

15
pkgs/top-level/all-packages.nix
View File

@ -1481,6 +1481,8 @@ in
ili2c = callPackage ../tools/misc/ili2c { };
imagelol = callPackage ../tools/compression/imagelol { };
imageworsener = callPackage ../tools/graphics/imageworsener { };
imgpatchtools = callPackage ../development/mobile/imgpatchtools { };
@ -13103,8 +13105,12 @@ in
kube-prompt = callPackage ../development/tools/kube-prompt { };
kubei = callPackage ../tools/security/kubei { };
kubeprompt = callPackage ../development/tools/kubeprompt { };
kubesec = callPackage ../tools/security/kubesec { };
kubespy = callPackage ../applications/networking/cluster/kubespy { };
kubicorn = callPackage ../development/tools/kubicorn { };
@ -14528,7 +14534,7 @@ in
givaro_3 = callPackage ../development/libraries/givaro/3.nix {};
givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix {};
ghp-import = callPackage ../development/tools/ghp-import { };
ghp-import = with python3Packages; toPythonApplication ghp-import;
ghcid = haskellPackages.ghcid.bin;
@ -18809,6 +18815,7 @@ in
nginx = nginxStable;
nginxQuic = callPackage ../servers/http/nginx/quic.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
@ -18818,6 +18825,7 @@ in
};
nginxStable = callPackage ../servers/http/nginx/stable.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
@ -18825,6 +18833,7 @@ in
};
nginxMainline = callPackage ../servers/http/nginx/mainline.nix {
zlib = zlib-ng.override { withZlibCompat = true; };
withPerl = false;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
@ -24216,6 +24225,8 @@ in
linkerd = callPackage ../applications/networking/cluster/linkerd { };
kile-wl = callPackage ../applications/misc/kile-wl { };
kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { };
@ -30332,6 +30343,8 @@ in
protocol = python3Packages.callPackage ../applications/networking/protocol { };
punes = libsForQt5.callPackage ../misc/emulators/punes { };
pykms = callPackage ../tools/networking/pykms { };
pyupgrade = with python3Packages; toPythonApplication pyupgrade;

6
pkgs/top-level/python-packages.nix
View File

@ -2658,6 +2658,8 @@ in {
ghdiff = callPackage ../development/python-modules/ghdiff { };
ghp-import = callPackage ../development/python-modules/ghp-import { };
gidgethub = callPackage ../development/python-modules/gidgethub { };
gin-config = callPackage ../development/python-modules/gin-config { };
@ -4186,6 +4188,8 @@ in {
mock-open = callPackage ../development/python-modules/mock-open { };
mock-services = callPackage ../development/python-modules/mock-services { };
modeled = callPackage ../development/python-modules/modeled { };
moderngl = callPackage ../development/python-modules/moderngl { };
@ -7958,6 +7962,8 @@ in {
test-tube = callPackage ../development/python-modules/test-tube { };
textdistance = callPackage ../development/python-modules/textdistance { };
textacy = callPackage ../development/python-modules/textacy { };
texttable = callPackage ../development/python-modules/texttable { };