MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-09-11 12:01:45 +00:00 committed by GitHub
commit ff5297bcd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 2100 additions and 931 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/doc/manual/from_md/release-notes/rl-2009.section.xml
View file

@ -1684,13 +1684,17 @@ CREATE ROLE postgres LOGIN SUPERUSER;
</listitem>
<listitem>
<para>
The notmuch package move its emacs-related binaries and emacs
The notmuch package moves its emacs-related binaries and emacs
lisp files to a separate output. They're not part of the
default <literal>out</literal> output anymore - if you relied
on the <literal>notmuch-emacs-mua</literal> binary or the
emacs lisp files, access them via the
<literal>notmuch.emacs</literal> output. Device tree overlay
support was improved in
<literal>notmuch.emacs</literal> output.
</para>
</listitem>
<listitem>
<para>
Device tree overlay support was improved in
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/79370">#79370</link>
and now uses
<link xlink:href="options.html#opt-hardware.deviceTree.kernelPackage">hardware.deviceTree.kernelPackage</link>

4
nixos/doc/manual/release-notes/rl-2009.section.md
View file

@ -578,7 +578,9 @@ When upgrading from a previous release, please be aware of the following incompa
- `services.journald.rateLimitBurst` was updated from `1000` to `10000` to follow the new upstream systemd default.
- The notmuch package move its emacs-related binaries and emacs lisp files to a separate output. They\'re not part of the default `out` output anymore - if you relied on the `notmuch-emacs-mua` binary or the emacs lisp files, access them via the `notmuch.emacs` output. Device tree overlay support was improved in [\#79370](https://github.com/NixOS/nixpkgs/pull/79370) and now uses [hardware.deviceTree.kernelPackage](options.html#opt-hardware.deviceTree.kernelPackage) instead of `hardware.deviceTree.base`. [hardware.deviceTree.overlays](options.html#opt-hardware.deviceTree.overlays) configuration was extended to support `.dts` files with symbols. Device trees can now be filtered by setting [hardware.deviceTree.filter](options.html#opt-hardware.deviceTree.filter) option.
- The notmuch package moves its emacs-related binaries and emacs lisp files to a separate output. They\'re not part of the default `out` output anymore - if you relied on the `notmuch-emacs-mua` binary or the emacs lisp files, access them via the `notmuch.emacs` output.
- Device tree overlay support was improved in [\#79370](https://github.com/NixOS/nixpkgs/pull/79370) and now uses [hardware.deviceTree.kernelPackage](options.html#opt-hardware.deviceTree.kernelPackage) instead of `hardware.deviceTree.base`. [hardware.deviceTree.overlays](options.html#opt-hardware.deviceTree.overlays) configuration was extended to support `.dts` files with symbols. Device trees can now be filtered by setting [hardware.deviceTree.filter](options.html#opt-hardware.deviceTree.filter) option.
- The default output of `buildGoPackage` is now `$out` instead of `$bin`.

10
pkgs/applications/editors/vscode/vscodium.nix
View file

@ -13,10 +13,10 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "1z8sxdzwbjip8csrili5l36v1kl3iq8fw19dhfnkjs3fl0sn360k";
x86_64-darwin = "0sp5k4pk9yjx16c79hqrwn64f2ab82iizm1cy93y9rr2r3px1yga";
aarch64-linux = "03qm5008knigsahs6zz5c614g1kid3k0ndg8vb0flfwmdrajrdw3";
armv7l-linux = "0sls3m5zwz6w01k7jym0vwbz006bkwv23yba7gf1gg84vbqgpb1x";
x86_64-linux = "1l3khnqb8icapnwk4pr4s639dqsvjy1k51km2p9ywnrjdg9byc12";
x86_64-darwin = "1lb63rz9mzcw5yg3cqi022m1ldvmbxz5z70axc9n6dci8aals663";
aarch64-linux = "0c0rxzhayklgnaf0r4hj6rwdh5qbb449vi5ja0asfyni4k2nalr5";
armv7l-linux = "0xs8wsad64cni8vpzfh2aqgdsnsy4hwc25msl79prvh17794k8jy";
}.${system};
sourceRoot = {
@ -31,7 +31,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.59.1";
version = "1.60.0";
pname = "vscodium";
executableName = "codium";

10
pkgs/applications/misc/gallery-dl/default.nix
View file

@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "gallery_dl";
version = "1.18.3";
version = "1.18.4";
src = fetchPypi {
inherit pname version;
sha256 = "6e058dd25a8a54ead41479579fd73de71472abb980a6254765c5e538b591d162";
sha256 = "bdb84706fdde867fe2ee11c74c8c51af4e560399bd5fa562f19bfcaf8fc0dac9";
};
propagatedBuildInputs = [ requests ];
@ -21,8 +21,8 @@ buildPythonApplication rec {
meta = with lib; {
description = "Command-line program to download image-galleries and -collections from several image hosting sites";
homepage = "https://github.com/mikf/gallery-dl";
license = licenses.gpl2;
maintainers = with maintainers; [ dawidsowa ];
platforms = platforms.unix;
changelog = "https://github.com/mikf/gallery-dl/raw/v${version}/CHANGELOG.md";
license = licenses.gpl2Only;
maintainers = with maintainers; [ dawidsowa marsam ];
};
}

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.3.3";
version = "0.3.5";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "OweKV+vF8H1QMNhIs0Z9/uUAuu1cCTitH2P7barS0ao=";
sha256 = "ruJALAI0YQNwG8An5VzoJX06Qu/pXZ9zsrPZ7EH+5Pk=";
name = "${pname}-${version}.AppImage";
};

5
pkgs/applications/misc/masterpdfeditor/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "masterpdfeditor";
version = "5.7.20";
version = "5.7.90";
src = fetchurl {
url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz";
sha256 = "0lyfss0r0dc6skhdlkslcdagdp9k1mi0w8n5pbrskwcd09c9mxym";
sha256 = "sha256-wUHLesJ/YV3QyTJfGUr1lFD55JBnfSmjO2VvriaqlII=";
};
nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ];
@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
homepage = "https://code-industry.net/free-pdf-editor/";
license = licenses.unfreeRedistributable;
platforms = with platforms; [ "x86_64-linux" ];
broken = true;
maintainers = with maintainers; [ cmcdragonkai ];
};
}

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

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "skytemple";
version = "1.2.5";
version = "1.3.0";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
sha256 = "0780517gjc97wb2g67pwdv3fz3sqxm2ica1hdbrhqm4rfbnb28xr";
sha256 = "03qmjp257rk4p1zkz89cv26awdgngvakqyg6jc3g6xrhmsvr4r2p";
};
buildInputs = [

24
pkgs/applications/misc/sqls/default.nix Normal file
View file

@ -0,0 +1,24 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "sqls";
version = "0.2.19";
src = fetchFromGitHub {
owner = "lighttiger2505";
repo = pname;
rev = "v${version}";
sha256 = "1myypq9kdfbhl5h9h8d30a3pi89mix48wm1c38648ky9vhx0s4az";
};
vendorSha256 = "13c7nv0anj260z34bd7w1hz0rkmsj9r1zz55qiwcr1vdgmvy84cz";
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.revision=${src.rev}" ];
meta = with lib; {
homepage = "https://github.com/lighttiger2505/sqls";
description = "SQL language server written in Go";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};
}

27
pkgs/applications/misc/zk-shell/default.nix
View file

@ -1,8 +1,8 @@
{ lib, fetchFromGitHub, pythonPackages }:
{ lib, fetchFromGitHub, python3Packages }:
pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "zk-shell";
version = "1.0.0";
name = "zk-shell-" + version;
src = fetchFromGitHub {
owner = "rgs1";
@ -11,18 +11,23 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0zisvvlclsf4sdh7dpqcl1149xbxw6pi1aqcwjbqblgf8m4nm0c7";
};
propagatedBuildInputs = (with pythonPackages; [
ansi kazoo nose six tabulate twitter
]);
propagatedBuildInputs = with python3Packages; [
ansi
kazoo
nose
six
tabulate
twitter
];
#requires a running zookeeper, don't know how to fix that for the moment
# requires a running zookeeper, don't know how to fix that for the moment
doCheck = false;
meta = {
meta = with lib; {
description = "A powerful & scriptable shell for Apache ZooKeeper";
homepage = "https://github.com/rgs1/zk_shell";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.mahe ];
platforms = lib.platforms.all;
license = licenses.asl20;
maintainers = [ maintainers.mahe ];
platforms = platforms.all;
};
}

24
pkgs/applications/networking/p2p/dht/default.nix Normal file
View file

@ -0,0 +1,24 @@
{ stdenv, lib, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "dht";
version = "0.25";
src = fetchFromGitHub {
# Use transmission fork from post-0.25-transmission branch
owner = "transmission";
repo = pname;
rev = "25e12bb39eea3d433602de6390796fec8a8f3620";
sha256 = "fksi8WBQPydgSlISaZMMnxzt4xN7/Hh7aN6QQ+g/L7s=";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "BitTorrent DHT library";
homepage = "https://github.com/transmission/dht";
license = licenses.mit;
maintainers = with maintainers; [ angustrau ];
platforms = platforms.unix;
};
}

78
pkgs/applications/networking/p2p/fragments/default.nix Normal file
View file

@ -0,0 +1,78 @@
{ lib
, stdenv
, fetchFromGitLab
, meson
, vala
, ninja
, pkg-config
, wrapGAppsHook
, desktop-file-utils
, appstream-glib
, python3
, glib
, gtk3
, libhandy
, libtransmission
, libb64
, libutp
, miniupnpc
, dht
, libnatpmp
, libevent
, curl
, openssl
, zlib
}:
stdenv.mkDerivation rec {
pname = "fragments";
version = "1.5";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "Fragments";
rev = version;
sha256 = "0x1kafhlgyi65l4w67c24r8mpvasg3q3c4wlgnjc9sxvp6ki7xbn";
};
patches = [
# Fix dependency resolution
./dependency-resolution.patch
];
nativeBuildInputs = [
meson
vala
ninja
pkg-config
wrapGAppsHook
desktop-file-utils
appstream-glib
python3
];
buildInputs = [
glib
gtk3
libhandy
libtransmission
libb64
libutp
miniupnpc
dht
libnatpmp
libevent
curl
openssl
zlib
];
meta = with lib; {
homepage = "https://gitlab.gnome.org/World/Fragments";
description = "A GTK3 BitTorrent Client";
maintainers = with maintainers; [ angustrau ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

25
pkgs/applications/networking/p2p/fragments/dependency-resolution.patch Normal file
View file

@ -0,0 +1,25 @@
diff --git a/meson.build b/meson.build
index 5030d0c..6de7a20 100644
--- a/meson.build
+++ b/meson.build
@@ -32,10 +32,11 @@ transmission_dep = declare_dependency(
meson.get_compiler('c').find_library('dht'),
meson.get_compiler('c').find_library('natpmp'),
meson.get_compiler('c').find_library('event'),
- meson.get_compiler('c').find_library('libcurl'),
- meson.get_compiler('c').find_library('libcrypto'),
+ meson.get_compiler('c').find_library('curl'),
+ meson.get_compiler('c').find_library('crypto'),
+ meson.get_compiler('c').find_library('ssl'),
meson.get_compiler('c').find_library('libpthread'),
- meson.get_compiler('c').find_library('libz'),
+ meson.get_compiler('c').find_library('z'),
transmission_vapi,
transmission_lib
])
@@ -45,4 +46,4 @@ subdir('data')
subdir('po')
subdir('src')
-meson.add_install_script('build-aux/postinstall.py')
+meson.add_install_script('python3', '../build-aux/postinstall.py')

24
pkgs/applications/networking/p2p/libutp/default.nix Normal file
View file

@ -0,0 +1,24 @@
{ stdenv, lib, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "libutp";
version = "unstable-2017-01-02";
src = fetchFromGitHub {
# Use transmission fork from post-3.3-transmission branch
owner = "transmission";
repo = pname;
rev = "fda9f4b3db97ccb243fcbed2ce280eb4135d705b";
sha256 = "CvuZLOBksIl/lS6LaqOIuzNvX3ihlIPjI3Eqwo7YJH0=";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "uTorrent Transport Protocol library";
homepage = "https://github.com/transmission/libutp";
license = licenses.mit;
maintainers = with maintainers; [ angustrau ];
platforms = platforms.unix;
};
}

12
pkgs/applications/networking/p2p/transmission/default.nix
View file

@ -10,6 +10,11 @@
, systemd
, zlib
, pcre
, libb64
, libutp
, miniupnpc
, dht
, libnatpmp
# Build options
, enableGTK3 ? false
, gtk3
@ -69,6 +74,11 @@ in stdenv.mkDerivation {
libevent
zlib
pcre
libb64
libutp
miniupnpc
dht
libnatpmp
]
++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ]
++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ]
@ -123,7 +133,7 @@ in stdenv.mkDerivation {
* Full encryption, DHT, and PEX support
'';
homepage = "http://www.transmissionbt.com/";
license = lib.licenses.gpl2; # parts are under MIT
license = lib.licenses.gpl2Plus; # parts are under MIT
maintainers = with lib.maintainers; [ astsmtl vcunat wizeman ];
platforms = lib.platforms.unix;
};

4
pkgs/applications/video/mkvtoolnix/default.nix
View file

@ -47,13 +47,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
version = "60.0.0";
version = "61.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
sha256 = "sha256-WtEC/EH0G1Tm6OK6hmVRzloLkO8mxxOYYZY7k/Wi2zE=";
sha256 = "04f18jr0a5m1sah8163m28b82w1ikjzmahqy67pbbpzg0mc6rqr4";
};
nativeBuildInputs = [

11
pkgs/build-support/rust/import-cargo-lock.nix
View file

@ -12,14 +12,15 @@ let
# Parse a git source into different components.
parseGit = src:
let
parts = builtins.match ''git\+([^?]+)(\?rev=(.*))?#(.*)?'' src;
rev = builtins.elemAt parts 2;
parts = builtins.match ''git\+([^?]+)(\?(rev|tag|branch)=(.*))?#(.*)'' src;
type = builtins.elemAt parts 2; # rev, tag or branch
value = builtins.elemAt parts 3;
in
if parts == null then null
else {
url = builtins.elemAt parts 0;
sha = builtins.elemAt parts 3;
} // lib.optionalAttrs (rev != null) { inherit rev; };
sha = builtins.elemAt parts 4;
} // lib.optionalAttrs (type != null) { inherit type value; };
packages = (builtins.fromTOML (builtins.readFile lockFile)).package;
@ -137,7 +138,7 @@ let
cat > $out/.cargo-config <<EOF
[source."${gitParts.url}"]
git = "${gitParts.url}"
${lib.optionalString (gitParts ? rev) "rev = \"${gitParts.rev}\""}
${lib.optionalString (gitParts ? type) "${gitParts.type} = \"${gitParts.value}\""}
replace-with = "vendored-sources"
EOF
''

6
pkgs/build-support/rust/test/import-cargo-lock/default.nix
View file

@ -1,8 +1,12 @@
{ callPackage }:
# Build like this from nixpkgs root:
# $ nix-build -A tests.importCargoLock
{
basic = callPackage ./basic { };
gitDependency = callPackage ./git-dependency { };
gitDependencyNoRev = callPackage ./git-dependency-no-rev { };
gitDependencyRev = callPackage ./git-dependency-rev { };
gitDependencyTag = callPackage ./git-dependency-tag { };
gitDependencyBranch = callPackage ./git-dependency-branch { };
maturin = callPackage ./maturin { };
}

72
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.lock generated Normal file
View file

@ -0,0 +1,72 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "getrandom"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
dependencies = [
"cfg-if",
"libc",
"wasi",
]
[[package]]
name = "git-dependency-branch"
version = "0.1.0"
dependencies = [
"rand",
]
[[package]]
name = "libc"
version = "0.2.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
[[package]]
name = "ppv-lite86"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
[[package]]
name = "rand"
version = "0.8.4"
source = "git+https://github.com/rust-random/rand.git?branch=master#fcc5baf31565a94f63dce41c2e739e6f182475f4"
dependencies = [
"libc",
"rand_chacha",
"rand_core",
]
[[package]]
name = "rand_chacha"
version = "0.3.1"
source = "git+https://github.com/rust-random/rand.git?branch=master#fcc5baf31565a94f63dce41c2e739e6f182475f4"
dependencies = [
"ppv-lite86",
"rand_core",
]
[[package]]
name = "rand_core"
version = "0.6.3"
source = "git+https://github.com/rust-random/rand.git?branch=master#fcc5baf31565a94f63dce41c2e739e6f182475f4"
dependencies = [
"getrandom",
]
[[package]]
name = "wasi"
version = "0.10.2+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"

8
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.toml Normal file
View file

@ -0,0 +1,8 @@
[package]
name = "git-dependency-branch"
version = "0.1.0"
authors = ["Daniël de Kok <me@danieldk.eu>"]
edition = "2018"
[dependencies]
rand = { git = "https://github.com/rust-random/rand.git", branch = "master" }

6
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/default.nix → pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix
View file

@ -1,7 +1,7 @@
{ rustPlatform }:
rustPlatform.buildRustPackage {
pname = "git-dependency-no-rev";
pname = "git-dependency-branch";
version = "0.1.0";
src = ./.;
@ -9,13 +9,13 @@ rustPlatform.buildRustPackage {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa";
"rand-0.8.4" = "1ilk9wvfw3mdm57g199ys8f5nrgdrh0n3a4c8b7nz6lgnqvfrv6z";
};
};
doInstallCheck = true;
installCheckPhase = ''
$out/bin/git-dependency-no-rev
$out/bin/git-dependency-branch
'';
}

0
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/src/main.rs → pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/src/main.rs
View file

14
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.lock → pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.lock generated
View file

@ -1,5 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "cfg-if"
version = "1.0.0"
@ -18,7 +20,7 @@ dependencies = [
]
[[package]]
name = "git-dependency-no-rev"
name = "git-dependency-rev"
version = "0.1.0"
dependencies = [
"rand",
@ -39,7 +41,7 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
[[package]]
name = "rand"
version = "0.8.3"
source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef"
source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
dependencies = [
"libc",
"rand_chacha",
@ -50,7 +52,7 @@ dependencies = [
[[package]]
name = "rand_chacha"
version = "0.3.0"
source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef"
source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
dependencies = [
"ppv-lite86",
"rand_core",
@ -58,8 +60,8 @@ dependencies = [
[[package]]
name = "rand_core"
version = "0.6.2"
source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef"
version = "0.6.1"
source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
dependencies = [
"getrandom",
]
@ -67,7 +69,7 @@ dependencies = [
[[package]]
name = "rand_hc"
version = "0.3.0"
source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef"
source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
dependencies = [
"rand_core",
]

4
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.toml → pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.toml
View file

@ -1,8 +1,8 @@
[package]
name = "git-dependency-no-rev"
name = "git-dependency-rev"
version = "0.1.0"
authors = ["Daniël de Kok <me@danieldk.eu>"]
edition = "2018"
[dependencies]
rand = { git = "https://github.com/rust-random/rand.git" }
rand = { git = "https://github.com/rust-random/rand.git", rev = "0.8.3" }

21
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ rustPlatform }:
rustPlatform.buildRustPackage {
pname = "git-dependency-rev";
version = "0.1.0";
src = ./.;
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f";
};
};
doInstallCheck = true;
installCheckPhase = ''
$out/bin/git-dependency-rev
'';
}

9
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/src/main.rs Normal file
View file

@ -0,0 +1,9 @@
use rand::Rng;
fn main() {
let mut rng = rand::thread_rng();
// Always draw zero :).
let roll: u8 = rng.gen_range(0..1);
assert_eq!(roll, 0);
}

81
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.lock generated Normal file
View file

@ -0,0 +1,81 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "getrandom"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
dependencies = [
"cfg-if",
"libc",
"wasi",
]
[[package]]
name = "git-dependency-tag"
version = "0.1.0"
dependencies = [
"rand",
]
[[package]]
name = "libc"
version = "0.2.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
[[package]]
name = "ppv-lite86"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
[[package]]
name = "rand"
version = "0.8.3"
source = "git+https://github.com/rust-random/rand.git?tag=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
dependencies = [
"libc",
"rand_chacha",
"rand_core",
"rand_hc",
]
[[package]]
name = "rand_chacha"
version = "0.3.0"
source = "git+https://github.com/rust-random/rand.git?tag=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
dependencies = [
"ppv-lite86",
"rand_core",
]
[[package]]
name = "rand_core"
version = "0.6.1"
source = "git+https://github.com/rust-random/rand.git?tag=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
dependencies = [
"getrandom",
]
[[package]]
name = "rand_hc"
version = "0.3.0"
source = "git+https://github.com/rust-random/rand.git?tag=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
dependencies = [
"rand_core",
]
[[package]]
name = "wasi"
version = "0.10.2+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"

8
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.toml Normal file
View file

@ -0,0 +1,8 @@
[package]
name = "git-dependency-tag"
version = "0.1.0"
authors = ["Daniël de Kok <me@danieldk.eu>"]
edition = "2018"
[dependencies]
rand = { git = "https://github.com/rust-random/rand.git", tag = "0.8.3" }

21
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ rustPlatform }:
rustPlatform.buildRustPackage {
pname = "git-dependency-tag";
version = "0.1.0";
src = ./.;
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f";
};
};
doInstallCheck = true;
installCheckPhase = ''
$out/bin/git-dependency-tag
'';
}

9
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/src/main.rs Normal file
View file

@ -0,0 +1,9 @@
use rand::Rng;
fn main() {
let mut rng = rand::thread_rng();
// Always draw zero :).
let roll: u8 = rng.gen_range(0..1);
assert_eq!(roll, 0);
}

12
pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock generated
View file

@ -1,5 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "cfg-if"
version = "1.0.0"
@ -39,7 +41,7 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
[[package]]
name = "rand"
version = "0.8.3"
source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef"
dependencies = [
"libc",
"rand_chacha",
@ -50,7 +52,7 @@ dependencies = [
[[package]]
name = "rand_chacha"
version = "0.3.0"
source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef"
dependencies = [
"ppv-lite86",
"rand_core",
@ -58,8 +60,8 @@ dependencies = [
[[package]]
name = "rand_core"
version = "0.6.1"
source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
version = "0.6.2"
source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef"
dependencies = [
"getrandom",
]
@ -67,7 +69,7 @@ dependencies = [
[[package]]
name = "rand_hc"
version = "0.3.0"
source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef"
dependencies = [
"rand_core",
]

2
pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml
View file

@ -5,4 +5,4 @@ authors = ["Daniël de Kok <me@danieldk.eu>"]
edition = "2018"
[dependencies]
rand = { git = "https://github.com/rust-random/rand.git", rev = "0.8.3" }
rand = { git = "https://github.com/rust-random/rand.git" }

2
pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix
View file

@ -9,7 +9,7 @@ rustPlatform.buildRustPackage {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f";
"rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa";
};
};

8
pkgs/data/misc/hackage/pin.json
View file

@ -1,6 +1,6 @@
{
"commit": "182ca4558e20c333fb3f4c659b2af4267d4d9b46",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/182ca4558e20c333fb3f4c659b2af4267d4d9b46.tar.gz",
"sha256": "123dr3lza56nj7s53m37zm2qfvwl2qvrr2prwl0q32wzidfc12w9",
"msg": "Update from Hackage at 2021-09-03T13:28:39Z"
"commit": "332975af73ba6dc258ab7e103f00619e9bebeea2",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/332975af73ba6dc258ab7e103f00619e9bebeea2.tar.gz",
"sha256": "1fkc19vqylyjbhqa414mnz5ny235vp1f0wz70a2lbf5cwzg6185f",
"msg": "Update from Hackage at 2021-09-06T23:06:06Z"
}

13
pkgs/development/compilers/ghc/8.10.7.nix
View file

@ -106,6 +106,12 @@ let
GhcRtsHcOpts += -fPIC
'' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
EXTRA_CC_OPTS += -std=gnu99
''
# While split sections are now enabled by default in ghc 8.8 for windows,
# they seem to lead to `too many sections` errors when building base for
# profiling.
+ lib.optionalString targetPlatform.isWindows ''
SplitSections = NO
'';
# Splicer will pull out correct variations
@ -157,6 +163,13 @@ stdenv.mkDerivation (rec {
# upstream patch. Don't forget to check backport status of the upstream patch
# when adding new GHC releases in nixpkgs.
./respect-ar-path.patch
# cabal passes incorrect --host= when cross-compiling
# https://github.com/haskell/cabal/issues/5887
(fetchpatch {
url = "https://raw.githubusercontent.com/input-output-hk/haskell.nix/122bd81150386867da07fdc9ad5096db6719545a/overlays/patches/ghc/cabal-host.patch";
sha256 = "sha256:0yd0sajgi24sc1w5m55lkg2lp6kfkgpp3lgija2c8y3cmkwfpdc1";
})
] ++ lib.optionals stdenv.isDarwin [
# Make Block.h compile with c++ compilers. Remove with the next release
(fetchpatch {

20
pkgs/development/compilers/ghc/8.8.4.nix
View file

@ -2,7 +2,7 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx
, bash
, libiconv ? null, ncurses
@ -114,6 +114,12 @@ let
GhcRtsHcOpts += -fPIC
'' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
EXTRA_CC_OPTS += -std=gnu99
''
# While split sections are now enabled by default in ghc 8.8 for windows,
# they seem to lead to `too many sections` errors when building base for
# profiling.
+ lib.optionalString targetPlatform.isWindows ''
SplitSections = NO
'';
# Splicer will pull out correct variations
@ -168,6 +174,18 @@ stdenv.mkDerivation (rec {
# Fix documentation configuration which causes a syntax error with sphinx 4.*
# See also https://gitlab.haskell.org/ghc/ghc/-/issues/19962
./sphinx-4-configuration.patch
# cabal passes incorrect --host= when cross-compiling
# https://github.com/haskell/cabal/issues/5887
(fetchpatch {
url = "https://raw.githubusercontent.com/input-output-hk/haskell.nix/122bd81150386867da07fdc9ad5096db6719545a/overlays/patches/ghc/cabal-host.patch";
sha256 = "sha256:0yd0sajgi24sc1w5m55lkg2lp6kfkgpp3lgija2c8y3cmkwfpdc1";
})
# error: 'VirtualAllocExNuma' redeclared as different kind of symbol
# name conflict between rts/win32/OSMem.c and winbase.h from the mingw-w64 runtime package
# Renamed to match ghc8.8:
# https://gitlab.haskell.org/ghc/ghc/-/commit/4b431f334018eaef2cf36de3316025c68c922915#20d64c0bdc272817149d1d5cf20a73a8b5fd637f
./rename-numa-api-call.patch
];
postPatch = "patchShebangs .";

32
pkgs/development/compilers/ghc/rename-numa-api-call.patch Normal file
View file

@ -0,0 +1,32 @@
diff --git a/rts/win32/OSMem.c b/rts/win32/OSMem.c
--- a/rts/win32/OSMem.c
+++ b/rts/win32/OSMem.c
@@ -41,7 +41,7 @@ static block_rec* free_blocks = NULL;
typedef LPVOID(WINAPI *VirtualAllocExNumaProc)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD, DWORD);
/* Cache NUMA API call. */
-VirtualAllocExNumaProc VirtualAllocExNuma;
+VirtualAllocExNumaProc _VirtualAllocExNuma;
void
osMemInit(void)
@@ -52,8 +52,8 @@ osMemInit(void)
/* Resolve and cache VirtualAllocExNuma. */
if (osNumaAvailable() && RtsFlags.GcFlags.numa)
{
- VirtualAllocExNuma = (VirtualAllocExNumaProc)GetProcAddress(GetModuleHandleW(L"kernel32"), "VirtualAllocExNuma");
- if (!VirtualAllocExNuma)
+ _VirtualAllocExNuma = (VirtualAllocExNumaProc)(void*)GetProcAddress(GetModuleHandleW(L"kernel32"), "VirtualAllocExNuma");
+ if (!_VirtualAllocExNuma)
{
sysErrorBelch(
"osBindMBlocksToNode: VirtualAllocExNuma does not exist. How did you get this far?");
@@ -569,7 +569,7 @@ void osBindMBlocksToNode(
On windows also -xb is broken, it does nothing so that can't
be used to tweak it (see #12577). So for now, just let the OS decide.
*/
- temp = VirtualAllocExNuma(
+ temp = _VirtualAllocExNuma(
GetCurrentProcess(),
NULL, // addr? See base memory
size,

280
pkgs/development/compilers/go/1.17.nix Normal file
View file

@ -0,0 +1,280 @@
{ lib
, stdenv
, fetchurl
, tzdata
, iana-etc
, runCommand
, perl
, which
, pkg-config
, patch
, procps
, pcre
, cacert
, Security
, Foundation
, xcbuild
, mailcap
, runtimeShell
, buildPackages
, pkgsBuildTarget
, callPackage
}:
let
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
goBootstrap = runCommand "go-bootstrap" { } ''
mkdir $out
cp -rf ${go_bootstrap}/* $out/
chmod -R u+w $out
find $out -name "*.c" -delete
cp -rf $out/bin/* $out/share/go/bin/
'';
goarch = platform: {
"i686" = "386";
"x86_64" = "amd64";
"aarch64" = "arm64";
"arm" = "arm";
"armv5tel" = "arm";
"armv6l" = "arm";
"armv7l" = "arm";
"powerpc64le" = "ppc64le";
}.${platform.parsed.cpu.name} or (throw "Unsupported system");
# We need a target compiler which is still runnable at build time,
# to handle the cross-building case where build != host == target
targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
in
stdenv.mkDerivation rec {
pname = "go";
version = "1.17.1";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "sha256-SdwIM5dwrNVhMxLbjBQer2F3mZVXe4nZO1Qe+DBn5bE=";
};
# perl is used for testing go vet
nativeBuildInputs = [ perl which pkg-config patch procps ];
buildInputs = [ cacert pcre ]
++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ];
depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ];
hardeningDisable = [ "all" ];
prePatch = ''
patchShebangs ./ # replace /bin/bash
# This source produces shell script at run time,
# and thus it is not corrected by patchShebangs.
substituteInPlace misc/cgo/testcarchive/carchive_test.go \
--replace '#!/usr/bin/env bash' '#!${runtimeShell}'
# Patch the mimetype database location which is missing on NixOS.
# but also allow static binaries built with NixOS to run outside nix
sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go
# Disabling the 'os/http/net' tests (they want files not available in
# chroot builds)
rm src/net/{listen,parse}_test.go
rm src/syscall/exec_linux_test.go
# !!! substituteInPlace does not seems to be effective.
# The os test wants to read files in an existing path. Just don't let it be /usr/bin.
sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
# Fails on aarch64
sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go
# Skip this test since ssl patches mess it up.
sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go
# Disable another PIE test which breaks.
sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go
# Disable the BuildModePie test
sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go
# Disable the unix socket test
sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go
# Disable the hostname test
sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go
# ParseInLocation fails the test
sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go
# Remove the api check as it never worked
sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
# Remove the coverage test as we have removed this utility
sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go
# Remove the timezone naming test
sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go
# Remove disable setgid test
sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go
# Remove cert tests that conflict with NixOS's cert resolution
sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go
# TestWritevError hangs sometimes
sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go
# TestVariousDeadlines fails sometimes
sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
# Disable cgo lookup tests not works, they depend on resolver
rm src/net/cgo_unix_test.go
'' + lib.optionalString stdenv.isLinux ''
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
# that run outside a nix server
sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go
'' + lib.optionalString stdenv.isAarch32 ''
echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace src/race.bash --replace \
"sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go
sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go
sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go
sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go
sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go
sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go
sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go
sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
# TestCurrent fails because Current is not implemented on Darwin
sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go
sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go
touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
'';
patches = [
./remove-tools-1.11.patch
./ssl-cert-file-1.16.patch
./remove-test-pie-1.15.patch
./creds-test.patch
./go-1.9-skip-flaky-19608.patch
./go-1.9-skip-flaky-20072.patch
./skip-external-network-tests-1.16.patch
./skip-nohup-tests.patch
./skip-cgo-tests-1.15.patch
./go_no_vendor_checks-1.16.patch
] ++ [
# breaks under load: https://github.com/golang/go/issues/25628
(if stdenv.isAarch32
then ./skip-test-extra-files-on-aarch32-1.14.patch
else ./skip-test-extra-files-on-386-1.14.patch)
];
postPatch = ''
find . -name '*.orig' -exec rm {} ';'
'';
GOOS = stdenv.targetPlatform.parsed.kernel.name;
GOARCH = goarch stdenv.targetPlatform;
# GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
# Go will nevertheless build a for host system that we will copy over in
# the install phase.
GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
GOHOSTARCH = goarch stdenv.buildPlatform;
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
# to be different from CC/CXX
CC_FOR_TARGET =
if (stdenv.buildPlatform != stdenv.targetPlatform) then
"${targetCC}/bin/${targetCC.targetPrefix}cc"
else
null;
CXX_FOR_TARGET =
if (stdenv.buildPlatform != stdenv.targetPlatform) then
"${targetCC}/bin/${targetCC.targetPrefix}c++"
else
null;
GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]);
GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
CGO_ENABLED = 1;
# Hopefully avoids test timeouts on Hydra
GO_TEST_TIMEOUT_SCALE = 3;
# Indicate that we are running on build infrastructure
# Some tests assume things like home directories and users exists
GO_BUILDER_NAME = "nix";
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
postConfigure = ''
export GOCACHE=$TMPDIR/go-cache
# this is compiled into the binary
export GOROOT_FINAL=$out/share/go
export PATH=$(pwd)/bin:$PATH
${lib.optionalString (stdenv.buildPlatform != stdenv.targetPlatform) ''
# Independent from host/target, CC should produce code for the building system.
# We only set it when cross-compiling.
export CC=${buildPackages.stdenv.cc}/bin/cc
''}
ulimit -a
'';
postBuild = ''
(cd src && ./make.bash)
'';
doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin;
checkPhase = ''
runHook preCheck
(cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild)
runHook postCheck
'';
preInstall = ''
rm -r pkg/obj
# Contains the wrong perl shebang when cross compiling,
# since it is not used for anything we can deleted as well.
rm src/regexp/syntax/make_perl_groups.pl
'' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
mv bin/*_*/* bin
rmdir bin/*_*
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
''}
'' else if (stdenv.hostPlatform != stdenv.targetPlatform) then ''
rm -rf bin/*_*
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
''}
'' else "");
installPhase = ''
runHook preInstall
mkdir -p $GOROOT_FINAL
cp -a bin pkg src lib misc api doc $GOROOT_FINAL
ln -s $GOROOT_FINAL/bin $out/bin
runHook postInstall
'';
disallowedReferences = [ goBootstrap ];
meta = with lib; {
homepage = "http://golang.org/";
description = "The Go Programming language";
license = licenses.bsd3;
maintainers = teams.golang.members;
platforms = platforms.linux ++ platforms.darwin;
# requires >=10.13 stdenv on x86_64-darwin
badPlatforms = [ "x86_64-darwin" ];
};
}

3
pkgs/development/compilers/llvm/12/llvm/default.nix
View file

@ -54,7 +54,8 @@ in stdenv.mkDerivation (rec {
buildInputs = [ libxml2 libffi ]
++ optional enablePFM libpfm; # exegesis
propagatedBuildInputs = [ ncurses zlib ];
propagatedBuildInputs = optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ ncurses ]
++ [ zlib ];
patches = [
./gnu-install-dirs.patch

5
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -64,7 +64,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "0kcsb5kqyx256fp1bj3y0x6k3286j4cykrx0yr4k3vvb3maakf7k";
sha256 = "1022ff2x9jvi2a0820lbgmmh54cxh1vbn0qfdwr50w7ggvjp88i6";
# delete android and Android directories which cause issues on
# darwin (case insensitive directory). Since we don't need them
# during the build process, we can delete it to prevent a hash
@ -1926,9 +1926,6 @@ EOT
Cabal = self.Cabal_3_6_0_0;
};
# ghc-api-compat needlessly requires 8.10.5 exactly, but we have 8.10.6
ghc-api-compat = doJailbreak super.ghc-api-compat;
# 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
streamly-posix = doJailbreak super.streamly-posix;

2
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file

@ -129,5 +129,5 @@ self: super: {
# vector 0.12.2 indroduced doctest checks that don‘t work on older compilers
vector = dontCheck super.vector;
ghc-api-compat = super.ghc-api-compat_8_6;
ghc-api-compat = doDistribute super.ghc-api-compat_8_6;
}

5
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View file

@ -106,10 +106,13 @@ self: super: {
retry = dontCheck super.retry;
# hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
hlint = super.hlint_3_3_1.overrideScope (self: super: {
hlint = super.hlint_3_3_4.overrideScope (self: super: {
ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 {
doHaddock = false;
};
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4;
});
# pick right version for compiler
ghc-api-compat = doDistribute super.ghc-api-compat_9_0_1;
}

2
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View file

@ -109,7 +109,7 @@ self: super: {
retry = dontCheck super.retry;
# hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
hlint = super.hlint_3_3_1.overrideScope (self: super: {
hlint = super.hlint_3_3_4.overrideScope (self: super: {
ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 {
doHaddock = false;
};

3
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file

@ -1105,6 +1105,7 @@ broken-packages:
- docvim
- dominion
- domplate
- dormouse-uri
- do-spaces
- dotfs
- dot-linker
@ -4200,6 +4201,7 @@ broken-packages:
- servant-auth-hmac
- servant-auth-token-api
- servant-avro
- servant-benchmark
- servant-client-js
- servant-db
- servant-dhall
@ -5044,7 +5046,6 @@ broken-packages:
- urldecode
- url-decoders
- urldisp-happstack
- urlencoded
- url-generic
- urn
- urn-random

4
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -94,6 +94,8 @@ default-package-overrides:
- dhall-nix < 1.1.22
# reflex-dom-pandoc is only used by neuron which needs a version < 1.0.0.0
- reflex-dom-pandoc < 1.0.0.0
# 2021-09-07: pin to our current GHC version
- ghc-api-compat == 8.10.7
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.
@ -122,7 +124,7 @@ extra-packages:
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
- cabal-install-parsers == 0.4.2 # 2021-09-04: needed haskell-ci by until it upgrades to Cabal >= 3.6
- ghc-api-compat < 8.10.5 # 2021-08-18: ghc-api-compat 8.10.5 is only compatible with ghc 8.10.5
- ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4
package-maintainers:
abbradar:

45
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
View file

@ -1,4 +1,4 @@
# Stackage LTS 18.8
# Stackage LTS 18.9
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -224,7 +224,7 @@ default-package-overrides:
- base-compat ==0.11.2
- base-compat-batteries ==0.11.2
- basement ==0.0.12
- base-orphans ==0.8.4
- base-orphans ==0.8.5
- base-prelude ==1.4
- base-unicode-symbols ==0.2.4.2
- basic-prelude ==0.7.0
@ -276,7 +276,7 @@ default-package-overrides:
- blaze-html ==0.9.1.2
- blaze-markup ==0.8.2.8
- blaze-svg ==0.3.6.1
- blaze-textual ==0.2.1.0
- blaze-textual ==0.2.2.1
- bmp ==1.2.6.3
- BNFC ==2.9.2
- BNFC-meta ==0.6.1
@ -480,8 +480,8 @@ default-package-overrides:
- convertible ==1.1.1.0
- cookie ==0.4.5
- core-data ==0.2.1.9
- core-program ==0.2.7.1
- core-text ==0.3.0.0
- core-program ==0.2.9.1
- core-text ==0.3.2.0
- countable ==1.0
- country ==0.2.1
- cpphs ==1.20.9.1
@ -615,7 +615,7 @@ default-package-overrides:
- distributed-closure ==0.4.2.0
- distribution-opensuse ==1.1.1
- distributive ==0.6.2.1
- dl-fedora ==0.9
- dl-fedora ==0.9.1
- dlist ==1.0
- dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.1
@ -705,7 +705,7 @@ default-package-overrides:
- errors ==2.3.0
- errors-ext ==0.4.2
- ersatz ==0.4.9
- esqueleto ==3.5.2.1
- esqueleto ==3.5.2.2
- essence-of-live-coding ==0.2.5
- essence-of-live-coding-gloss ==0.2.5
- essence-of-live-coding-pulse ==0.2.5
@ -757,7 +757,7 @@ default-package-overrides:
- FenwickTree ==0.1.2.1
- fft ==0.1.8.7
- fgl ==5.7.0.3
- file-embed ==0.0.14.0
- file-embed ==0.0.15.0
- file-embed-lzma ==0
- filelock ==0.1.1.5
- filemanip ==0.3.6.3
@ -841,7 +841,7 @@ default-package-overrides:
- generic-constraints ==1.1.1.1
- generic-data ==0.9.2.0
- generic-data-surgery ==0.3.0.0
- generic-deriving ==1.14
- generic-deriving ==1.14.1
- generic-functor ==0.2.0.0
- generic-lens ==2.1.0.0
- generic-lens-core ==2.1.0.0
@ -1040,7 +1040,7 @@ default-package-overrides:
- hgeometry-combinatorial ==0.12.0.3
- hgrev ==0.2.6
- hidapi ==0.1.7
- hie-bios ==0.7.5
- hie-bios ==0.7.6
- hi-file-parser ==0.1.2.0
- higher-leveldb ==0.6.0.0
- highlighting-kate ==0.6.4
@ -1071,7 +1071,7 @@ default-package-overrides:
- hmpfr ==0.4.4
- hnock ==0.4.0
- hoauth2 ==1.16.0
- hoogle ==5.0.18.1
- hoogle ==5.0.18.2
- hOpenPGP ==2.9.5
- hopenpgp-tools ==0.23.6
- hopenssl ==2.2.4
@ -1404,7 +1404,7 @@ default-package-overrides:
- linux-namespaces ==0.1.3.0
- liquid-fixpoint ==0.8.10.2
- List ==0.6.2
- ListLike ==4.7.4
- ListLike ==4.7.6
- list-predicate ==0.1.0.1
- listsafe ==0.1.0.1
- list-singleton ==1.0.0.5
@ -1701,7 +1701,7 @@ default-package-overrides:
- optional-args ==1.0.2
- options ==1.2.1.1
- optparse-applicative ==0.16.1.0
- optparse-generic ==1.4.4
- optparse-generic ==1.4.5
- optparse-simple ==0.1.1.4
- optparse-text ==0.1.1.0
- ordered-containers ==0.2.2
@ -1762,9 +1762,9 @@ default-package-overrides:
- persist ==0.1.1.5
- persistable-record ==0.6.0.5
- persistable-types-HDBC-pg ==0.0.3.5
- persistent ==2.13.1.1
- persistent ==2.13.1.2
- persistent-mtl ==0.2.2.0
- persistent-mysql ==2.13.0.1
- persistent-mysql ==2.13.0.2
- persistent-pagination ==0.1.1.2
- persistent-postgresql ==2.13.0.3
- persistent-qq ==2.12.0.1
@ -1950,7 +1950,7 @@ default-package-overrides:
- reanimate ==1.1.4.0
- reanimate-svg ==0.13.0.1
- rebase ==1.13.0.1
- record-dot-preprocessor ==0.2.11
- record-dot-preprocessor ==0.2.12
- record-hasfield ==1.0
- records-sop ==0.1.1.0
- record-wrangler ==0.1.1.0
@ -2077,7 +2077,7 @@ default-package-overrides:
- semialign-optics ==1.1
- semigroupoid-extras ==5
- semigroupoids ==5.3.5
- semigroups ==0.19.1
- semigroups ==0.19.2
- semirings ==0.6
- semiring-simple ==1.0.0.1
- semver ==0.4.0.1
@ -2379,14 +2379,14 @@ default-package-overrides:
- text-regex-replace ==0.1.1.4
- text-region ==0.3.1.0
- text-short ==0.1.3
- text-show ==3.9
- text-show ==3.9.2
- text-show-instances ==3.8.4
- text-zipper ==0.11
- tfp ==1.0.2
- tf-random ==0.5
- th-abstraction ==0.4.2.0
- th-abstraction ==0.4.3.0
- th-bang-compat ==0.0.1.0
- th-compat ==0.1.2
- th-compat ==0.1.3
- th-constraint-compat ==0.0.1.0
- th-data-compat ==0.1.0.0
- th-desugar ==1.11
@ -2400,7 +2400,7 @@ default-package-overrides:
- th-lift ==0.8.2
- th-lift-instances ==0.1.18
- th-nowq ==0.1.0.5
- th-orphans ==0.13.11
- th-orphans ==0.13.12
- th-printf ==0.7
- thread-hierarchy ==0.3.0.2
- thread-local-storage ==0.2
@ -2527,7 +2527,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3
- unix-compat ==0.5.3
- unix-time ==0.4.7
- unliftio ==0.2.19
- unliftio ==0.2.20
- unliftio-core ==0.2.0.1
- unliftio-pool ==0.2.1.1
- unliftio-streams ==0.1.1.1
@ -2630,7 +2630,6 @@ default-package-overrides:
- wikicfp-scraper ==0.1.0.12
- wild-bind ==0.1.2.7
- wild-bind-x11 ==0.2.0.13
- Win32 ==2.6.1.0
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- witch ==0.3.4.0

6
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View file

@ -962,15 +962,14 @@ dont-distribute-packages:
- distribution-plot
- dixi
- dl-fedora
- dl-fedora_0_9_1
- dmenu-pkill
- dmenu-pmount
- dmenu-search
- doc-review
- doi
- domain
- domain-core
- domain-optics
- dormouse-client
- dow
- download-media-content
- dph-examples
@ -1125,6 +1124,7 @@ dont-distribute-packages:
- formlets-hsp
- forth-hll
- fortran-src-extras
- fortran-vars
- foscam-directory
- foscam-sort
- fp-ieee
@ -1907,6 +1907,7 @@ dont-distribute-packages:
- layouting
- lazy-hash
- lazy-hash-cache
- ldap-scim-bridge
- ldapply
- leaky
- lean
@ -3196,7 +3197,6 @@ dont-distribute-packages:
- wheb-strapped
- whitespace
- wikipedia4epub
- windowslive
- winio
- wl-pprint-ansiterm
- wl-pprint-terminfo

1478
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

File diff suppressed because it is too large Load diff

60
pkgs/development/libraries/gvm-libs/default.nix Normal file
View file

@ -0,0 +1,60 @@
{ lib
, stdenv
, cmake
, fetchFromGitHub
, glib
, glib-networking
, gnutls
, gpgme
, hiredis
, libgcrypt
, libnet
, libpcap
, libssh
, libuuid
, libxml2
, pkg-config
, zlib
, freeradius
}:
stdenv.mkDerivation rec {
pname = "gvm-libs";
version = "21.4.1";
src = fetchFromGitHub {
owner = "greenbone";
repo = pname;
rev = "v${version}";
sha256 = "1ap3m7f1gyv9p96czi8mzryhjijgaqcbdyr8lwvnw8ynzskx8s3y";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
glib
glib-networking
gnutls
gpgme
hiredis
libgcrypt
freeradius
libnet
libpcap
libssh
libuuid
libxml2
zlib
];
meta = with lib; {
description = "Libraries module for the Greenbone Vulnerability Management Solution";
homepage = "https://github.com/greenbone/gvm-libs";
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ fab ];
platforms = platforms.linux;
};
}

16
pkgs/development/mobile/cocoapods/Gemfile-beta.lock
View file

@ -5,7 +5,7 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.3)
activesupport (6.1.4)
activesupport (6.1.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@ -18,10 +18,10 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.11.0.beta.2)
cocoapods (1.11.0)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.11.0.beta.2)
cocoapods-core (= 1.11.0)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@ -36,7 +36,7 @@ GEM
nap (~> 1.0)
ruby-macho (>= 1.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
cocoapods-core (1.11.0.beta.2)
cocoapods-core (1.11.0)
activesupport (>= 5.0, < 7)
addressable (~> 2.8)
algoliasearch (~> 1.0)
@ -47,11 +47,11 @@ GEM
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.4.0)
cocoapods-downloader (1.5.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
cocoapods-trunk (1.5.0)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
@ -60,7 +60,7 @@ GEM
escape (0.0.4)
ethon (0.14.0)
ffi (>= 1.15.0)
ffi (1.15.3)
ffi (1.15.4)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
@ -90,7 +90,7 @@ GEM
zeitwerk (2.4.2)
PLATFORMS
arm64-darwin-20
ruby
DEPENDENCIES
cocoapods (>= 1.7.0.beta.1)!

47
pkgs/development/mobile/cocoapods/Gemfile.lock
View file

@ -5,11 +5,12 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.3)
activesupport (5.2.6)
activesupport (6.1.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
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)
@ -17,10 +18,10 @@ GEM
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.10.2)
addressable (~> 2.6)
cocoapods (1.11.0)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.10.2)
cocoapods-core (= 1.11.0)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@ -31,26 +32,26 @@ 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.2)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
ruby-macho (>= 1.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
cocoapods-core (1.11.0)
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.5)
cocoapods-downloader (1.4.0)
cocoapods-downloader (1.5.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
cocoapods-trunk (1.5.0)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
@ -59,7 +60,7 @@ GEM
escape (0.0.4)
ethon (0.14.0)
ffi (>= 1.15.0)
ffi (1.15.3)
ffi (1.15.4)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
@ -68,18 +69,17 @@ GEM
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)
rexml (3.2.5)
ruby-macho (1.4.0)
thread_safe (0.3.6)
ruby-macho (2.5.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
xcodeproj (1.21.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
@ -87,9 +87,10 @@ GEM
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
zeitwerk (2.4.2)
PLATFORMS
arm64-darwin-20
ruby
DEPENDENCIES
cocoapods!

24
pkgs/development/mobile/cocoapods/gemset-beta.nix
View file

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk";
sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4";
type = "gem";
};
version = "6.1.4";
version = "6.1.4.1";
};
addressable = {
dependencies = ["public_suffix"];
@ -68,10 +68,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rvmvxday0fg1p1ardmqc62xam212c6iaaf1djahvz70631grprq";
sha256 = "1b8773v98vkcr55yx5ydc28wq8ya53ya1v51cj7fxg5n3aa5h0cz";
type = "gem";
};
version = "1.11.0.beta.2";
version = "1.11.0";
};
cocoapods-core = {
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
@ -79,10 +79,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cnnmbajllp3mw2w2b2bs2y42cnh1y1zbq63m3asg097z4d1a9h1";
sha256 = "19bik6yj125vhq0vxb6fsb41b3i2bi4437l7dkhgrw317gx3wf9b";
type = "gem";
};
version = "1.11.0.beta.2";
version = "1.11.0";
};
cocoapods-deintegrate = {
groups = ["default"];
@ -99,10 +99,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1j03hxvz3m82fwgx3jayw0y2iqm7zpacn88r6nfj2arkbjxmvjwz";
sha256 = "161sjpyxipnbhwcr5kyfbcdbzs9zq20sigsazjm782cn3s466p0z";
type = "gem";
};
version = "1.4.0";
version = "1.5.1";
};
cocoapods-plugins = {
dependencies = ["nap"];
@ -131,10 +131,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12c6028bmdwrbqcb49mr5qj1p3vcijnjqbsbzywfx1isp44j9mv5";
sha256 = "0cgdx7z9psxxrsa13fk7qc9i6jskrwcafhrdz94avzia2y6dlnsz";
type = "gem";
};
version = "1.5.0";
version = "1.6.0";
};
cocoapods-try = {
groups = ["default"];
@ -192,10 +192,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq";
sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn";
type = "gem";
};
version = "1.15.3";
version = "1.15.4";
};
fourflusher = {
groups = ["default"];

60
pkgs/development/mobile/cocoapods/gemset.nix
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 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj";
sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4";
type = "gem";
};
version = "5.2.6";
version = "6.1.4.1";
};
addressable = {
dependencies = ["public_suffix"];
@ -66,10 +66,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d0vlzjizqkw2m6am9gcnjkxy73zl74ill28v17v0s2v8fzd7nbg";
sha256 = "1b8773v98vkcr55yx5ydc28wq8ya53ya1v51cj7fxg5n3aa5h0cz";
type = "gem";
};
version = "1.10.2";
version = "1.11.0";
};
cocoapods-core = {
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
@ -77,10 +77,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1j1sapw5l3xc5d8mli09az1bbmfdynlx7xv8lbghvm9i1md14dl5";
sha256 = "19bik6yj125vhq0vxb6fsb41b3i2bi4437l7dkhgrw317gx3wf9b";
type = "gem";
};
version = "1.10.2";
version = "1.11.0";
};
cocoapods-deintegrate = {
groups = ["default"];
@ -97,10 +97,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1j03hxvz3m82fwgx3jayw0y2iqm7zpacn88r6nfj2arkbjxmvjwz";
sha256 = "161sjpyxipnbhwcr5kyfbcdbzs9zq20sigsazjm782cn3s466p0z";
type = "gem";
};
version = "1.4.0";
version = "1.5.1";
};
cocoapods-plugins = {
dependencies = ["nap"];
@ -127,10 +127,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12c6028bmdwrbqcb49mr5qj1p3vcijnjqbsbzywfx1isp44j9mv5";
sha256 = "0cgdx7z9psxxrsa13fk7qc9i6jskrwcafhrdz94avzia2y6dlnsz";
type = "gem";
};
version = "1.5.0";
version = "1.6.0";
};
cocoapods-try = {
groups = ["default"];
@ -184,10 +184,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq";
sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn";
type = "gem";
};
version = "1.15.3";
version = "1.15.4";
};
fourflusher = {
groups = ["default"];
@ -257,12 +257,14 @@
version = "5.14.4";
};
molinillo = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hh40z1adl4lw16dj4hxgabx4rr28mgqycih1y1d91bwww0jjdg6";
sha256 = "0p846facmh1j5xmbrpgzadflspvk7bzs3sykrh5s7qi4cdqz5gzg";
type = "gem";
};
version = "0.6.6";
version = "0.8.0";
};
nanaimo = {
groups = ["default"];
@ -315,18 +317,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lhdjn91jkifsy2hzq2hgcm0pp8pbik87m58zmw1ifh6hkp9adjb";
sha256 = "1jgmhj4srl7cck1ipbjys6q4klcs473gq90bm59baw4j1wpfaxch";
type = "gem";
};
version = "1.4.0";
};
thread_safe = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
type = "gem";
};
version = "0.3.6";
version = "2.5.1";
};
typhoeus = {
dependencies = ["ethon"];
@ -340,15 +334,15 @@
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" "rexml"];
@ -361,4 +355,14 @@
};
version = "1.21.0";
};
zeitwerk = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
type = "gem";
};
version = "2.4.2";
};
}

3
pkgs/development/mobile/cocoapods/update
View file

@ -6,7 +6,10 @@ set -e
cd "$(dirname "${BASH_SOURCE[0]}")"
rm -f Gemfile.lock Gemfile-beta.lock
export BUNDLE_FORCE_RUBY_PLATFORM=1
bundler lock
BUNDLE_GEMFILE=Gemfile-beta bundler lock --lockfile=Gemfile-beta.lock
bundix --gemfile=Gemfile --lockfile=Gemfile.lock --gemset=gemset.nix
bundix --gemfile=Gemfile-beta --lockfile=Gemfile-beta.lock --gemset=gemset-beta.nix

33
pkgs/development/python-modules/aiohttp-swagger/default.nix
View file

@ -2,27 +2,46 @@
, buildPythonPackage
, fetchFromGitHub
, aiohttp
, flake8
, jinja2
, pytestCheckHook
, markupsafe
, pytest-aiohttp
, pytestCheckHook
, pythonOlder
, pyyaml
}:
buildPythonPackage rec {
pname = "aiohttp-swagger";
version = "1.0.5";
version = "1.0.15";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "cr0hn";
repo = pname;
rev = "5a59e86f8c5672d2cc97dd35dc730c2f809d95ce"; # corresponds to 1.0.5 on PyPi, no tag on GitHub
sha256 = "1vpfk5b3f7s9qzr2q48g776f39xzqppjwm57scfzqqmbldkk5nv7";
rev = version;
sha256 = "sha256-M43sNpbXWXFRTd549cZhvhO35nBB6OH+ki36BzSk87Q=";
};
propagatedBuildInputs = [ aiohttp jinja2 pyyaml ];
propagatedBuildInputs = [
aiohttp
jinja2
markupsafe
pyyaml
];
checkInputs = [ flake8 pytestCheckHook pytest-aiohttp ];
checkInputs = [
pytestCheckHook
pytest-aiohttp
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "markupsafe~=1.1.1" "markupsafe>=1.1.1" \
--replace "jinja2~=2.11.2" "jinja2>=2.11.2"
'';
pythonImportsCheck = [ "aiohttp_swagger" ];
meta = with lib; {
description = "Swagger API Documentation builder for aiohttp";

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aiomusiccast";
version = "0.9.1";
version = "0.9.2";
format = "pyproject";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "vigonotion";
repo = "aiomusiccast";
rev = version;
sha256 = "sha256-+BmymfRKwNPlksYcAUb/5cZYeOD5h85YhobmsNFJVE8=";
sha256 = "sha256-xZPNEynj0kbeika15ZDEIRUe519V6Asaw+CEiBu7VL4=";
};
nativeBuildInputs = [

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "amcrest";
version = "1.8.0";
version = "1.8.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "tchellomello";
repo = "python-amcrest";
rev = version;
sha256 = "180c0g840vh8dg4f08j0r29pdnhisav93d3axfvicd8fsb2cn36g";
sha256 = "sha256-a23AjLRNghu5CT3GHvnti0BHnku9CxLP1EkE0GrwB3w=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-containerservice";
version = "16.1.0";
version = "16.2.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "3654c8ace2b8868d0ea9c4c78c74f51e86e23330c7d8a636d132253747e6f3f4";
sha256 = "ee40fa76d84b82e37e1d8a364649de25bb1e0c6c07f182f145a3ade44ec43711";
};
propagatedBuildInputs = [

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "databricks-connect";
version = "8.1.11";
version = "8.1.12";
src = fetchPypi {
inherit pname version;
sha256 = "cd9d1b27edd9345a2a32b365a511f8457c5c1a8f107546fe1ef9063dd15aac00";
sha256 = "84e2db897731461a1d6bccd17923c7e8cd0f2512df018287b62fea55fd61891d";
};
sourceRoot = ".";

23
pkgs/development/python-modules/dungeon-eos/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ lib, buildPythonPackage, fetchFromGitHub }:
buildPythonPackage rec {
pname = "dungeon-eos";
version = "0.0.4";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
sha256 = "0hxygjk9i4qlwsxnxr52cxhqy3i62pc373z1x5sh2pas5ag59bvl";
};
doCheck = false; # there are no tests
pythonImportsCheck = [ "dungeon_eos" ];
meta = with lib; {
homepage = "https://github.com/SkyTemple/dungeon-eos";
description = "A package that simulates PMD EoS dungeon generation";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ marius851000 xfix ];
};
}

26
pkgs/development/python-modules/eventlet/default.nix
View file

@ -8,6 +8,9 @@
, monotonic
, six
, nose
, pyopenssl
, iana-etc
, libredirect
}:
buildPythonPackage rec {
@ -22,22 +25,31 @@ buildPythonPackage rec {
propagatedBuildInputs = [ dnspython greenlet monotonic six ]
++ lib.optional (pythonOlder "3.4") enum34;
prePatch = ''
substituteInPlace setup.py \
--replace "dnspython >= 1.15.0, < 2.0.0" "dnspython"
checkInputs = [ nose pyopenssl ];
preCheck = ''
echo "nameserver 127.0.0.1" > resolv.conf
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf)
export LD_PRELOAD=${libredirect}/lib/libredirect.so
export EVENTLET_IMPORT_VERSION_ONLY=0
'';
checkInputs = [ nose ];
checkPhase = ''
runHook preCheck
doCheck = false; # too much transient errors to bother
nosetests --exclude test_getaddrinfo --exclude test_hosts_no_network
runHook postCheck
'';
# unfortunately, it needs /etc/protocol to be present to not fail
#pythonImportsCheck = [ "eventlet" ];
# pythonImportsCheck = [ "eventlet" ];
meta = with lib; {
homepage = "https://pypi.python.org/pypi/eventlet/";
description = "A concurrent networking library for Python";
maintainers = with maintainers; [ SuperSandro2000 ];
license = licenses.mit;
};
}

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

@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "osmpythontools";
version = "0.3.0";
version = "0.3.2";
src = fetchFromGitHub {
owner = "mocnik-science";
repo = "osm-python-tools";
rev = "v${version}";
sha256 = "0r72z7f7kmvvbd9zvgci8rwmfj85xj34mb3x5dj3jcv5ij5j72yh";
sha256 = "1m5ai9h1zbp79x0vb138fmyh2hg8lqp859s7j33lra9hds6wb40a";
};
# Upstream setup.py has test dependencies in `install_requires` argument.

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

@ -35,14 +35,14 @@
buildPythonPackage rec {
pname = "python-lsp-server";
version = "1.2.1";
version = "1.2.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "python-lsp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-TyXKlXeXMyq+bQq9ngDm0SuW+rAhDlOVlC3mDI1THwk=";
sha256 = "sha256-RuZfCvYeO4mthZrg06UhwPp57qvuUI1yYyne5nzIHhE=";
};
postPatch = ''

19
pkgs/development/python-modules/skytemple-files/default.nix
View file

@ -1,26 +1,19 @@
{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips, fetchpatch }:
{ lib, buildPythonPackage, fetchFromGitHub, appdirs, dungeon-eos, explorerscript
, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips
}:
buildPythonPackage rec {
pname = "skytemple-files";
version = "1.2.4";
version = "1.3.0";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
sha256 = "1i3045bqg9h7kcx83nlrm1pmikfpi817n0gb8da29m3mqzk7lwws";
sha256 = "1gpmgdas7x1zmszs9hlxjb6nk683901cy1kc0gyhz0rzdn5jg3lb";
fetchSubmodules = true;
};
patches = [
# fix patching https://github.com/SkyTemple/skytemple-files/pull/128
# merged, remove for next update
(fetchpatch {
url = "http://github.com/SkyTemple/skytemple-files/commit/71dd71e6abb7435405e30225e8a37592b990d692.patch";
sha256 = "sha256-CSBaT+LVP9J0C1FlUCduTJroq9z2EAJG6lruvlHlQLI=";
})
];
postPatch = ''
substituteInPlace skytemple_files/patch/arm_patcher.py \
--replace "exec_name = os.getenv('SKYTEMPLE_ARMIPS_EXEC', f'{prefix}armips')" "exec_name = \"${armips}/bin/armips\""
@ -28,7 +21,7 @@ buildPythonPackage rec {
buildInputs = [ armips ];
propagatedBuildInputs = [ appdirs explorerscript ndspy pillow setuptools skytemple-rust tilequant ];
propagatedBuildInputs = [ appdirs dungeon-eos explorerscript ndspy pillow setuptools skytemple-rust tilequant ];
doCheck = false; # requires Pokémon Mystery Dungeon ROM
pythonImportsCheck = [ "skytemple_files" ];

4
pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
View file

@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "skytemple-ssb-debugger";
version = "1.2.5";
version = "1.3.0";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
sha256 = "0jkx75z8j03jfr9kzd40ip0fy24sfc7f2x430mf48xin272mc87q";
sha256 = "12v0071125m8xjcp2hxm9qvs0qw4hdhkx8r3gbl0plm22vl3fk0d";
};
buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];

40
pkgs/development/tools/build-managers/build2/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
pname = "build2";
version = "0.13.0";
src = fetchurl {
url = "https://download.build2.org/${version}/build2-toolchain-${version}.tar.xz";
sha256 = "01hmr5y8aa28qchwy9ci8x5q746flwxmlxarmy4w9zay9nmvryms";
};
dontConfigure = true;
dontInstall = true;
buildPhase = ''
runHook preBuild
./build.sh --local --trust yes --install-dir "$out" "$CXX"
runHook postBuild
'';
meta = with lib; {
homepage = "https://www.build2.org/";
description = "build2 build system";
license = licenses.mit;
longDescription = ''
build2 is an open source (MIT), cross-platform build toolchain
that aims to approximate Rust Cargo's convenience for developing
and packaging C/C++ projects while providing more depth and
flexibility, especially in the build system.
build2 is a hierarchy of tools consisting of a general-purpose
build system, package manager (for package consumption), and
project manager (for project development). It is primarily aimed
at C/C++ projects as well as mixed-language projects involving
one of these languages (see bash and rust modules, for example).
'';
platforms = platforms.all;
maintainers = with maintainers; [ hiro98 r-burns ];
};
}

20
pkgs/development/tools/build-managers/rebar3/default.nix
View file

@ -1,11 +1,11 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch,
{ lib, stdenv, fetchFromGitHub, fetchgit,
fetchHex, erlang, makeWrapper,
writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }:
let
version = "3.16.1";
version = "3.17.0";
owner = "erlang";
deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchHex; };
deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; };
rebar3 = stdenv.mkDerivation rec {
pname = "rebar3";
inherit version erlang;
@ -16,7 +16,7 @@ let
inherit owner;
repo = pname;
rev = version;
sha256 = "0dhwlx7zykf9y3znk2k8fxrq5j43jy3c3gd76k74q34p1xbajgzr";
sha256 = "02sk3whrbprzlih4pgcsd6ngmassfjfmkz21gwvb7mq64pib40k6";
};
buildInputs = [ erlang ];
@ -39,16 +39,6 @@ let
HOME=. escript bootstrap
'';
patches = [
# TODO: remove this on next rebar3 release
(fetchpatch {
name = "escriptize-erl-libs";
url = "https://github.com/erlang/rebar3/commit/11055384dbd5bf7d181bca83a33b0e100275ff21.patch";
sha256 = "01xjaqnhmjlxqdgb8ph15wssjq5crdhjslxnndbs5f0kscqpq14c";
})
];
checkPhase = ''
HOME=. escript ./rebar3 ct
'';
@ -98,7 +88,7 @@ let
update-source-version rebar3 "$latest" --version-key=version --print-changes --file="$nix_path/default.nix"
tmpdir=$(mktemp -d)
cp -R $(nix-build $nixpkgs --no-out-link -A rebar3.src)/* "$tmpdir"
(cd "$tmpdir" && rebar3 nix lock -o "$nix_path/rebar-deps.nix")
(cd "$tmpdir" && rebar3 as test nix lock -o "$nix_path/rebar-deps.nix")
else
echo "rebar3 is already up-to-date"
fi

8
pkgs/development/tools/build-managers/rebar3/rebar-deps.nix
View file

@ -1,6 +1,6 @@
# Generated by rebar3_nix
let fetchOnly = { src, ... }: src;
in { builder ? fetchOnly, fetchHex, fetchFromGitHub, overrides ? (x: y: { }) }:
in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }:
let
self = packages // (overrides self packages);
packages = with self; {
@ -16,11 +16,11 @@ let
};
relx = builder {
name = "relx";
version = "4.4.0";
version = "4.5.0";
src = fetchHex {
pkg = "relx";
version = "4.4.0";
sha256 = "sha256-VcDtY7tdVeuYOhnrlNfzB1320Sbb3/QxAqZmCpH86SU=";
version = "4.5.0";
sha256 = "sha256-3bWPIMzmymP1onJeklgW3XITR2aYo/PDy0+ownIgLFI=";
};
beamDeps = [ bbmustache ];
};

20
pkgs/development/tools/rust/cargo-crev/default.nix
View file

@ -3,28 +3,38 @@
, rustPlatform
, perl
, pkg-config
, SystemConfiguration
, Security
, curl
, libiconv
, openssl
, git
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-crev";
version = "0.19.4";
version = "0.20.1";
src = fetchFromGitHub {
owner = "crev-dev";
repo = "cargo-crev";
rev = "v${version}";
sha256 = "sha256-XwwzMo06TdyOtGE9Z48mkEr6DnB/89wtMrW+UWr0G/Q=";
rev = version;
sha256 = "sha256-j2dafXUI6rDEYboSAciMeNma/YaBYKuQZgMUGVU+oBQ=";
};
cargoSha256 = "sha256-gA2Fg4CCi0W+GqJoNPZWw/OjNYh2U2UsC6eMZ9W1QN8=";
cargoSha256 = "sha256-khrpS6QFpweKbTbR0YhAJTTrgDoZl9fzYPDs+JE1mtA=";
preCheck = ''
export HOME=$(mktemp -d)
git config --global user.name "Nixpkgs Test"
git config --global user.email "nobody@example.com"
'';
nativeBuildInputs = [ perl pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration Security libiconv curl ];
checkInputs = [ git ];
meta = with lib; {
description = "A cryptographically verifiable code review system for the cargo (Rust) package manager";

2
pkgs/os-specific/linux/bbswitch/default.nix
View file

@ -36,6 +36,8 @@ stdenv.mkDerivation {
--replace "/lib/modules" "${kernel.dev}/lib/modules"
'';
makeFlags = kernel.makeFlags;
installPhase = ''
mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc
cp bbswitch.ko $out/lib/modules/${kernel.modDirVersion}/misc

58
pkgs/servers/mautrix-facebook/default.nix Normal file
View file

@ -0,0 +1,58 @@
{ enableSystemd ? stdenv.isLinux
, fetchFromGitHub
, lib
, python3
, stdenv
}:
python3.pkgs.buildPythonPackage rec {
pname = "mautrix-facebook";
version = "0.3.1";
src = fetchFromGitHub {
owner = "mautrix";
repo = "facebook";
rev = "v${version}";
sha256 = "0m7nznx3z6cg4wgvjybdivx22ifxcdri4i8501yibsri0jnpf0y2";
};
propagatedBuildInputs = with python3.pkgs; [
CommonMark
aiohttp
asyncpg
mautrix
paho-mqtt
pillow
prometheus-client
pycryptodome
python-olm
python_magic
ruamel_yaml
unpaddedbase64
yarl
] ++ lib.optional enableSystemd systemd;
doCheck = false;
postPatch = ''
sed -ie 's/^asyncpg.*/asyncpg>=0.20/' requirements.txt
'';
postInstall = ''
mkdir -p $out/bin
cat <<-END >$out/bin/mautrix-facebook
#!/bin/sh
PYTHONPATH="$PYTHONPATH" exec ${python3}/bin/python -m mautrix_facebook "\$@"
END
chmod +x $out/bin/mautrix-facebook
'';
meta = with lib; {
homepage = "https://github.com/mautrix/facebook";
description = "A Matrix-Facebook Messenger puppeting bridge";
license = licenses.agpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ kevincox ];
};
}

6
pkgs/servers/sql/postgresql/ext/pg_hll.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_hll";
version = "2.15.1";
version = "2.16";
buildInputs = [ postgresql ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "citusdata";
repo = "postgresql-hll";
rev = "refs/tags/v${version}";
sha256 = "17lg05rw7299fvfhdzvznr692c21s5qar1wzzvgwfv7afv6xzr3y";
sha256 = "0icns4m3dkm20fs6gznciwsb8ba8gcc316igz6j7qwjdnyg2ppbf";
};
installPhase = ''
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "HyperLogLog for PostgreSQL";
homepage = "https://github.com/citusdata/postgresql-hll";
changelog = "https://github.com/citusdata/postgresql-hll/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/citusdata/postgresql-hll/raw/v${version}/CHANGELOG.md";
maintainers = with maintainers; [ thoughtpolice ];
platforms = postgresql.meta.platforms;
license = licenses.asl20;

8
pkgs/servers/sql/postgresql/ext/pg_topn.nix
View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_topn";
version = "2.3.1";
version = "2.4.0";
buildInputs = [ postgresql ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "citusdata";
repo = "postgresql-topn";
rev = "refs/tags/v${version}";
sha256 = "0ai07an90ywhk10q52hajgb33va5q76j7h8vj1r0rvq6dyii0wal";
sha256 = "1appxriw7h29kyhv3h6b338g5m2nz70q3mxasy4mjimqhbz1zyqs";
};
installPhase = ''
@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Efficient querying of 'top values' for PostgreSQL";
homepage = "https://github.com/citusdata/postgresql-topn";
changelog = "https://github.com/citusdata/postgresql-topn/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/citusdata/postgresql-topn/raw/v${version}/CHANGELOG.md";
maintainers = with maintainers; [ thoughtpolice ];
platforms = postgresql.meta.platforms;
license = licenses.agpl3;
license = licenses.agpl3Only;
};
}

8
pkgs/tools/nix/nix-query-tree-viewer/default.nix
View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "nix-query-tree-viewer";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "cdepillabout";
repo = "nix-query-tree-viewer";
repo = pname;
rev = "v${version}";
sha256 = "0vjcllhgq64n7mwxvyhmbqd6fpa9lwrpsnggc1kdlgd14ggq6jj6";
sha256 = "sha256-Lc9hfjybnRrkd7PZMa2ojxOM04bP4GJyagkZUX2nVwY=";
};
nativeBuildInputs = [
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
gtk3
];
cargoSha256 = "1i9sjs77v1c3lch93pzjgr1zl0k1mlwkdpf3zfp13hyjn6zpldnj";
cargoSha256 = "sha256-NSLBIvgo5EdCvZq52d+UbAa7K4uOST++2zbhO9DW38E=";
meta = with lib; {
description = "GTK viewer for the output of `nix store --query --tree`";

6
pkgs/tools/package-management/cargo-audit/default.nix
View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-audit";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "RustSec";
repo = "rustsec";
rev = "cargo-audit%2Fv${version}";
sha256 = "0pvb1m9277ysjzydjvx7viybi6bd23ch7sbjyx1wnz45ahrmia1j";
sha256 = "1rmhizgld35996kzp3fal2zl20aqpnmkzx0clc80n30p814isdrw";
};
cargoSha256 = "0cf8kg8vhfqbrkm227rzyl3394n7fsqhqgq13qks7374h5d04haw";
cargoSha256 = "10li9w3m4xxb8943802y74dgb1wsgjkn74hwn2x47c0w0yjiig7p";
nativeBuildInputs = [
pkg-config

4
pkgs/tools/security/exploitdb/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2021-09-08";
version = "2021-09-10";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-q6XALX0sGzgUm2PRwlDfcQHZFH+8ExageMahXJ+EYdM=";
sha256 = "sha256-OU9IchkouABYw0k4O4WBLu1aklLCH/S90IPMPLOZWY0=";
};
installPhase = ''

4
pkgs/tools/security/gitleaks/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gitleaks";
version = "7.6.0";
version = "7.6.1";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XRpbbtQiF9EnGMICjyXXm2XjuR0jGC7UiY+UHIAMODM=";
sha256 = "sha256-52Wi3bQvKdHoJ1nVb4OVJ9wd8hDVF+6zlVSpsEai0Jw=";
};
vendorSha256 = "sha256-86PspExE+T/IuCvpf6LAkWcCRlHPqP5VUbHAckEzALc=";

6
pkgs/tools/security/sn0int/default.nix
View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "sn0int";
version = "0.21.2";
version = "0.22.0";
src = fetchFromGitHub {
owner = "kpcyrd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BKdi/o/A0fJBlcKTDTCX7uGkK6QR0S9hIn0DI3CN5Gg=";
sha256 = "sha256-0BadgWZhP73WOVO18jtcdhsM0L7AM0TQ3PF7MNJM7M0=";
};
cargoSha256 = "sha256-MeMTXwb5v4iUJQSViOraXAck7n6VlIW2Qa0qNUZWu1g=";
cargoSha256 = "sha256-KYrJIOaFX2wTDj4KeHn3d8wBHfVevCKQK/bDglfLWAU=";
nativeBuildInputs = [
pkg-config

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

@ -3172,6 +3172,7 @@ with pkgs;
nfstrace = callPackage ../tools/networking/nfstrace { };
nix-direnv = callPackage ../tools/misc/nix-direnv { };
nix-direnv-flakes = callPackage ../tools/misc/nix-direnv { enableFlakes = true; };
nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor);
@ -6629,6 +6630,8 @@ with pkgs;
matrix-corporal = callPackage ../servers/matrix-corporal { };
mautrix-facebook = callPackage ../servers/mautrix-facebook { };
mautrix-signal = recurseIntoAttrs (callPackage ../servers/mautrix-signal { });
mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });
@ -9145,6 +9148,8 @@ with pkgs;
sqliteman = callPackage ../applications/misc/sqliteman { };
sqls = callPackage ../applications/misc/sqls { };
stdman = callPackage ../data/documentation/stdman { };
steck = callPackage ../servers/pinnwand/steck.nix { };
@ -11607,6 +11612,13 @@ with pkgs;
buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; };
});
go_1_17 = callPackage ../development/compilers/go/1.17.nix ({
inherit (darwin.apple_sdk.frameworks) Security Foundation;
} // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
stdenv = gcc8Stdenv;
buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; };
});
go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({
inherit (darwin.apple_sdk.frameworks) Security Foundation;
} // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
@ -12316,7 +12328,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-crev = callPackage ../development/tools/rust/cargo-crev {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
cargo-cross = callPackage ../development/tools/rust/cargo-cross { };
cargo-deny = callPackage ../development/tools/rust/cargo-deny {
@ -13517,6 +13529,8 @@ with pkgs;
buck = callPackage ../development/tools/build-managers/buck { };
build2 = callPackage ../development/tools/build-managers/build2 { };
buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };
buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { };
@ -16127,6 +16141,8 @@ with pkgs;
gvfs = callPackage ../development/libraries/gvfs { };
gvm-libs = callPackage ../development/libraries/gvm-libs { };
gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { };
hamlib = hamlib_3;
@ -19574,6 +19590,15 @@ with pkgs;
buildGo116Package = callPackage ../development/go-packages/generic {
go = buildPackages.go_1_16;
};
# go_1_17 has go module changes which may not be portable
# across different go versions and/or platforms,
# it also requires >=10.13 stdenv on darwin which
# is not currently available for x86_64-darwin
#
# do not uncomment this without approval from the go CODEOWNERS
#buildGo117Package = callPackage ../development/go-packages/generic {
# go = buildPackages.go_1_17;
#};
buildGoPackage = buildGo116Package;
@ -19583,6 +19608,15 @@ with pkgs;
buildGo116Module = callPackage ../development/go-modules/generic {
go = buildPackages.go_1_16;
};
# go_1_17 has go module changes which may not be portable
# across different go versions and/or platforms,
# it also requires >=10.13 stdenv on darwin which
# is not currently available for x86_64-darwin
#
# do not uncomment this without approval from the go CODEOWNERS
#buildGo117Module = callPackage ../development/go-modules/generic {
# go = buildPackages.go_1_17;
#};
buildGoModule = buildGo116Module;
@ -23589,6 +23623,8 @@ with pkgs;
dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { };
dht = callPackage ../applications/networking/p2p/dht { };
dia = callPackage ../applications/graphics/dia {
inherit (gnome2) libart_lgpl libgnomeui;
};
@ -24301,6 +24337,8 @@ with pkgs;
fractal = callPackage ../applications/networking/instant-messengers/fractal { };
fragments = callPackage ../applications/networking/p2p/fragments { };
freecad = libsForQt5.callPackage ../applications/graphics/freecad {
inherit (python3Packages)
GitPython
@ -25423,6 +25461,8 @@ with pkgs;
libvmi = callPackage ../development/libraries/libvmi { };
libutp = callPackage ../applications/networking/p2p/libutp { };
lifelines = callPackage ../applications/misc/lifelines { };
liferea = callPackage ../applications/networking/newsreaders/liferea { };

2
pkgs/top-level/python-packages.nix
View file

@ -2251,6 +2251,8 @@ in {
dulwich = callPackage ../development/python-modules/dulwich { };
dungeon-eos = callPackage ../development/python-modules/dungeon-eos { };
dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };
dyn = callPackage ../development/python-modules/dyn { };

1
pkgs/top-level/release-haskell.nix
View file

@ -312,6 +312,7 @@ let
language-nix = all;
nix-paths = all;
titlecase = all;
ghc-api-compat = all;
})
{
mergeable = pkgs.releaseTools.aggregate {