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

Merge branch 'staging-next' into staging 

In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
This commit is contained in:
Jan Tojnar 2021-04-08 17:14:31 +02:00
parent 97490e6783 bf6abedefb
commit 625ce6c7f6
112 changed files with 2577 additions and 1772 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -8167,6 +8167,12 @@
githubId = 16779;
name = "Rickard Nilsson";
};
riey = {
email = "creeper844@gmail.com";
github = "Riey";
githubId = 14910534;
name = "Riey";
};
rika = {
email = "rika@paymentswit.ch";
github = "NekomimiScience";

10
maintainers/team-list.nix
View File

@ -87,6 +87,16 @@ with lib.maintainers; {
scope = "Maintain GNOME desktop environment and platform.";
};
home-assistant = {
members = [
fab
globin
hexa
mic92
];
scope = "Maintain the Home Assistant ecosystem";
};
jitsi = {
members = [
mmilata

9
nixos/modules/hardware/video/amdgpu.nix
View File

@ -1,9 +0,0 @@
{ config, lib, ... }:
with lib;
{
config = mkIf (elem "amdgpu" config.services.xserver.videoDrivers) {
boot.blacklistedKernelModules = [ "radeon" ];
};
}

1
nixos/modules/module-list.nix
View File

@ -74,7 +74,6 @@
./hardware/sata.nix
./hardware/wooting.nix
./hardware/uinput.nix
./hardware/video/amdgpu.nix
./hardware/video/amdgpu-pro.nix
./hardware/video/ati.nix
./hardware/video/capture/mwprocapture.nix

8
nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json
View File

@ -8,7 +8,13 @@
}
],
"actions": {
"update-props": {}
"update-props": {
"bluez5.reconnect-profiles": [
"hfp_hf",
"hsp_hs",
"a2dp_sink"
]
}
}
},
{

2
nixos/modules/services/misc/home-assistant.nix
View File

@ -63,7 +63,7 @@ let
};
in {
meta.maintainers = with maintainers; [ ];
meta.maintainers = teams.home-assistant.members;
options.services.home-assistant = {
enable = mkEnableOption "Home Assistant";

1
nixos/modules/services/networking/tailscale.nix
View File

@ -28,6 +28,7 @@ in {
systemd.packages = [ cfg.package ];
systemd.services.tailscaled = {
wantedBy = [ "multi-user.target" ];
path = [ pkgs.openresolv ];
serviceConfig.Environment = "PORT=${toString cfg.port}";
};
};

4
pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "bitwig-studio";
version = "3.3.6";
version = "3.3.7";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
sha256 = "sha256-k7L6CU2lY9192tfaWtVOxq9BCY7FZZdxmHT8EA+ZFsk=";
sha256 = "13jr45kzv0xjhhqk30qpq793349qyx8jpas4kl6i6bk3xfrd3fbz";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];

7
pkgs/applications/audio/noisetorch/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "NoiseTorch";
version = "0.9.0";
version = "0.10.1";
src = fetchFromGitHub {
owner = "lawl";
@ -11,7 +11,10 @@ buildGoModule rec {
sha256 = "1a4g112h83m55pga8kq2a1wzxpycj59v4bygyjfyi1s09q1y97qg";
};
patches = [ ./version.patch ];
patches = [
# Get version from environment instead of git tags
./version.patch
];
vendorSha256 = null;

4
pkgs/applications/editors/sublime/2/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
name = "sublimetext-2.0.2.tar.bz2";
url = [
urls = [
"http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2"
"https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2"
];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
else
fetchurl {
name = "sublimetext-2.0.2.tar.bz2";
url = [
urls = [
"http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2"
"https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2"
];

25
pkgs/applications/misc/qcad/default.nix
View File

@ -10,18 +10,20 @@
, qtsvg
, qtxmlpatterns
, qttools
, lib, stdenv
, lib
, stdenv
, installShellFiles
}:
mkDerivationWith stdenv.mkDerivation rec {
pname = "qcad";
version = "3.26.0.1";
version = "3.26.1.0";
src = fetchFromGitHub {
owner = "qcad";
repo = "qcad";
rev = "v${version}";
sha256 = "sha256-V+QlwM8BWmcarwZtqJfc+MYHOZgIH1W5R8m2EHhNJls=";
sha256 = "sha256-OWAc7g8DiJR3z6dUF5D0Yo3wnRKd1Xe7D1eq15NRW5c=";
};
patches = [
@ -36,7 +38,7 @@ mkDerivationWith stdenv.mkDerivation rec {
src/3rdparty/qt-labs-qtscriptgenerator-5.14.0/qt-labs-qtscriptgenerator-5.14.0.pro \
src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}/qt-labs-qtscriptgenerator-${qtbase.version}.pro
fi
'';
'';
qmakeFlags = [
"MUPARSER_DIR=${muparser}"
@ -65,15 +67,27 @@ mkDerivationWith stdenv.mkDerivation rec {
cp -r scripts $out/lib
cp -r plugins $out/lib/plugins
cp -r patterns $out/lib/patterns
cp -r fonts $out/lib/fonts
cp -r libraries $out/lib/libraries
cp -r linetypes $out/lib/linetypes
cp -r ts $out/lib/ts
# workaround to fix the library browser:
rm -r $out/lib/plugins/sqldrivers
ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers
rm -r $out/lib/plugins/printsupport
ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/printsupport
rm -r $out/lib/plugins/imageformats
ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/imageformats
install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg
installManPage qcad.1
runHook postInstall
'';
'';
buildInputs = [
boost
@ -89,6 +103,7 @@ mkDerivationWith stdenv.mkDerivation rec {
pkg-config
qmake
qttools
installShellFiles
];
meta = with lib; {

67
pkgs/applications/misc/viking/default.nix
View File

@ -1,60 +1,57 @@
{ fetchurl, fetchpatch, lib, stdenv, makeWrapper
, pkg-config, intltool, gettext, gtk2, expat, curl
, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper
, docbook_xml_dtd_412, gexiv2, gpsbabel, expect
{ lib, stdenv, fetchurl
, docbook_xml_dtd_45, docbook_xsl, intltool, itstool, libxslt, pkg-config, wrapGAppsHook, yelp-tools
, curl, gdk-pixbuf, gtk3, json-glib, libxml2
, gpsbabel
, withGeoClue ? true, geoclue2
, withGeoTag ? true, gexiv2
, withMagic ? true, file
, withMapnik ? false, mapnik
, withMBTiles ? true, sqlite
, withOAuth ? true, liboauth
, withMd5Hash ? true, nettle
, withGeoClue ? true, geoclue2 }:
, withOAuth ? true, liboauth
, withRealtimeGPSTracking ? true, gpsd
}:
stdenv.mkDerivation rec {
pname = "viking";
version = "1.8";
version = "1.9";
src = fetchurl {
url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2";
sha256 = "1a0g0fbj4q5s9p8fv0mqvxws10q3naj81l72sz30vvqpbz6vqp45";
url = "mirror://sourceforge/viking/viking-${version}.tar.bz2";
sha256 = "0fybpy6k0vmjp231h5ckysl3c0rcnh2afznijwq6y78j4hywyjpy";
};
patches = [
# Fix build without mapnik and sqlite https://github.com/viking-gps/viking/pull/79
(fetchpatch {
url = "https://github.com/viking-gps/viking/commit/995feefcb97bdb1590ed018224cf47ce197fe0c1.patch";
sha256 = "1xb0b76kg690fag9mw3yfj5k766jmqp1sm8q4f29n1h3nz5g8izd";
})
];
nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook yelp-tools ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2
] ++ lib.optional withMapnik mapnik
buildInputs = [ curl gdk-pixbuf gtk3 json-glib libxml2 ]
++ lib.optional withGeoClue geoclue2
++ lib.optional withGeoTag gexiv2
++ lib.optional withMagic file
++ lib.optional withMapnik mapnik
++ lib.optional withMBTiles sqlite
++ lib.optional withMd5Hash nettle
++ lib.optional withOAuth liboauth
++ lib.optional withMBTiles sqlite;
++ lib.optional withOAuth liboauth
++ lib.optional withRealtimeGPSTracking gpsd;
configureFlags = [
"--disable-scrollkeeper"
(lib.enableFeature withMapnik "mapnik")
(lib.enableFeature withGeoClue "geoclue")
(lib.enableFeature withMd5Hash "nettle")
(lib.enableFeature withOAuth "oauth")
(lib.enableFeature withGeoTag "geotag")
(lib.enableFeature withMagic "magic")
(lib.enableFeature withMapnik "mapnik")
(lib.enableFeature withMBTiles "mbtiles")
(lib.enableFeature withMd5Hash "nettle")
(lib.enableFeature withOAuth "oauth")
(lib.enableFeature withRealtimeGPSTracking "realtime-gps-tracking")
];
preBuild = ''
sed -i help/Makefile \
-e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g'
sed -i help/Makefile -e 's|--postvalid||g'
'';
hardeningDisable = [ "format" ];
doCheck = true;
postInstall = ''
wrapProgram $out/bin/viking \
--prefix PATH : "${gpsbabel}/bin" \
--prefix PATH : "${expect}/bin"
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : ${lib.makeBinPath [ gpsbabel ]}
)
'';
meta = with lib; {

2
pkgs/applications/networking/cluster/kube3d/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.4-k3s1" }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.5-k3s1" }:
buildGoModule rec {
pname = "kube3d";

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

@ -157,8 +157,8 @@ in rec {
});
terraform_0_14 = pluggable (generic {
version = "0.14.9";
sha256 = "0r9d28mbj7h9prr39gm5kd49l7sm8l1ab9rwrkpyhwgr119zf35b";
version = "0.14.10";
sha256 = "05vfb8hzma3qxq4w1h25mmgv96g90if214zlar0sm9fq8zsvb1yw";
vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };

4
pkgs/applications/science/robotics/qgroundcontrol/default.nix
View File

@ -6,7 +6,7 @@
mkDerivation rec {
pname = "qgroundcontrol";
version = "4.1.1";
version = "4.1.2";
qtInputs = [
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
@ -63,7 +63,7 @@ mkDerivation rec {
owner = "mavlink";
repo = pname;
rev = "v${version}";
sha256 = "1dji7jmwsrgcgzhra94wrgz67ydsdra7p10fw8gbw54gf6ncjfjm";
sha256 = "16q0g9b1kyan3qhhp5mmfnrx9h8q7qn83baplbiprqjgpvkxfll4";
fetchSubmodules = true;
};

4
pkgs/applications/version-management/gitkraken/default.nix
View File

@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
version = "7.5.3";
version = "7.5.4";
src = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
sha256 = "0vxvfq0dh6l1plqbq67gfydr8bh5w3q6d5y3bn3rdia10wa1dac6";
sha256 = "1laqki01zcmsl9s18dnwg3x3jbbs0xcipiyj2qlsb1sx9y4x05wm";
};
dontBuild = true;

12
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,13 +1,13 @@
{
"version": "13.9.4",
"repo_hash": "0gwxjmph3ac5v0h5zz8664412yq09cka5p4amdbxk7hna24igksz",
"version": "13.10.2",
"repo_hash": "1q3qnfzhikbbsmzzbldwn6xvsyxr1jgv5lj7mgcji11j8qv1a625",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v13.9.4-ee",
"rev": "v13.10.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "13.9.4",
"GITLAB_PAGES_VERSION": "1.35.0",
"GITALY_SERVER_VERSION": "13.10.2",
"GITLAB_PAGES_VERSION": "1.36.0",
"GITLAB_SHELL_VERSION": "13.17.0",
"GITLAB_WORKHORSE_VERSION": "8.63.2"
"GITLAB_WORKHORSE_VERSION": "13.10.2"
}
}

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

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
, ruby, tzdata, git, nettools, nixosTests, nodejs, openssl
, gitlabEnterprise ? false, callPackage, yarn
, fixup_yarn_lock, replace
, fixup_yarn_lock, replace, file
}:
let
@ -32,6 +32,10 @@ let
openssl = x.openssl // {
buildInputs = [ openssl ];
};
ruby-magic-static = x.ruby-magic-static // {
buildInputs = [ file ];
buildFlags = [ "--enable-system-libraries" ];
};
};
groups = [
"default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos"

2
pkgs/applications/version-management/gitlab/gitaly/Gemfile
View File

@ -1,6 +1,6 @@
source 'https://rubygems.org'
gem 'rugged', '~> 1.0.1'
gem 'rugged', '~> 1.1'
gem 'github-linguist', '~> 7.12', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.1'
gem 'activesupport', '~> 6.0.3.4'

4
pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
View File

@ -183,7 +183,7 @@ GEM
rubocop-ast (0.2.0)
parser (>= 2.7.0.1)
ruby-progressbar (1.10.1)
rugged (1.0.1)
rugged (1.1.0)
sanitize (4.6.6)
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
@ -233,7 +233,7 @@ DEPENDENCIES
rspec
rspec-parameterized
rubocop (~> 0.69)
rugged (~> 1.0.1)
rugged (~> 1.1)
sentry-raven (~> 3.0)
timecop

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

@ -4,18 +4,6 @@
, libgit2, openssl, zlib, pcre, http-parser }:
let
# libgit2 was updated to 1.1.0 in nixpkgs, but gitlab doesn't support that yet.
# See https://github.com/NixOS/nixpkgs/pull/106909
libgit = libgit2.overrideAttrs (attrs: rec {
version = "1.0.0";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "06cwrw93ycpfb5kisnsa5nsy95pm11dbh0vvdjg1jn25h9q5d3vc";
};
});
rubyEnv = bundlerEnv rec {
name = "gitaly-env";
inherit ruby;
@ -33,17 +21,17 @@ let
};
};
in buildGoModule rec {
version = "13.9.4";
version = "13.10.2";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-6ocP4SMafvLI2jfvcB8jk1AemAI/TiBQ1iaVxK7I54A=";
sha256 = "sha256-5CjZs5tpEEsgQGBFa8BeZ7SDhIeGKqAHWwbR8hSoCPs=";
};
vendorSha256 = "10ssx0dvbzg70vr2sgnhzijnjxfw6533wdjxwakj62rpfayklp51";
vendorSha256 = "sha256-8AopoiLmg6kfvYbZDOfFWBy1o5tbnxsKxSBX20OasIE=";
passthru = {
inherit rubyEnv;
@ -51,7 +39,7 @@ in buildGoModule rec {
buildFlags = [ "-tags=static,system_libgit2" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ];
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
doCheck = false;
postInstall = ''

6
pkgs/applications/version-management/gitlab/gitaly/gemset.nix
View File

@ -829,10 +829,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "056bwiwxvnbkbgsr2wqcsknnc73nqasqdnjcpgj2r61wkm8mzmbn";
sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy";
type = "gem";
};
version = "1.0.1";
version = "1.1.0";
};
sanitize = {
dependencies = ["crass" "nokogiri" "nokogumbo"];
@ -953,4 +953,4 @@
};
version = "2.4.2";
};
}
}

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

@ -1,18 +1,22 @@
{ lib, fetchFromGitLab, git, buildGoModule }:
let
data = (builtins.fromJSON (builtins.readFile ../data.json));
in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "8.63.2";
version = "13.10.2";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
sha256 = "1vjk7r7228p2gblx9nmqiz70ckbllg1p3bwkyfd4m49jhp13hryi";
owner = data.owner;
repo = data.repo;
rev = data.rev;
sha256 = data.repo_hash;
};
vendorSha256 = "0hc02nxw5jp1mhpjcx1f2a2dfaq7ji4qkf5g7lbpd1rzhqwp6zsz";
sourceRoot = "source/workhorse";
vendorSha256 = "sha256-UCkUSv1ZjDHmTFnETU8dz4moYRDCvy6AYTTfjHBGKeE=";
buildInputs = [ git ];
buildFlagsArray = "-ldflags=-X main.Version=${version}";
doCheck = false;

48
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View File

@ -17,7 +17,7 @@ gem 'default_value_for', '~> 3.4.0'
# Supported DBs
gem 'pg', '~> 1.1'
gem 'rugged', '~> 1.0.1'
gem 'rugged', '~> 1.1'
gem 'grape-path-helpers', '~> 1.6.1'
gem 'faraday', '~> 1.0'
@ -25,13 +25,13 @@ gem 'marginalia', '~> 1.10.0'
# Authentication libraries
gem 'devise', '~> 4.7.2'
# TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828)
gem 'bcrypt', '3.1.12'
gem 'bcrypt', '~> 3.1', '>= 3.1.14'
gem 'doorkeeper', '~> 5.5.0.rc2'
gem 'doorkeeper-openid_connect', '~> 1.7.5'
gem 'omniauth', '~> 1.8'
gem 'omniauth-auth0', '~> 2.0.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9'
gem 'omniauth-azure-activedirectory-v2', '~> 0.1'
gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version
gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '~> 1.4'
@ -73,6 +73,9 @@ gem 'acme-client', '~> 2.0', '>= 2.0.6'
# Browser detection
gem 'browser', '~> 4.2'
# OS detection for usage ping
gem 'ohai', '~> 16.10'
# GPG
gem 'gpgme', '~> 2.0.19'
@ -88,7 +91,7 @@ gem 'grape-entity', '~> 0.7.1'
gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
# GraphQL API
gem 'graphql', '~> 1.11.4'
gem 'graphql', '~> 1.11.8'
# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771
# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
# https://gitlab.com/gitlab-org/gitlab/issues/31747
@ -112,16 +115,16 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick', '~> 4.10.1'
# for backups
gem 'fog-aws', '~> 3.8'
gem 'fog-aws', '~> 3.9'
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb.
gem 'fog-core', '= 2.1.0'
gem 'fog-google', '~> 1.12'
gem 'gitlab-fog-google', '~> 1.13', require: 'fog/google'
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.3'
gem 'gitlab-fog-azure-rm', '~> 1.0', require: false
gem 'gitlab-fog-azure-rm', '~> 1.0.1', require: false
# for Google storage
gem 'google-api-client', '~> 0.33'
@ -195,7 +198,7 @@ gem 'acts-as-taggable-on', '~> 7.0'
gem 'sidekiq', '~> 5.2.7'
gem 'sidekiq-cron', '~> 1.0'
gem 'redis-namespace', '~> 1.7.0'
gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch'
gem 'gitlab-sidekiq-fetcher', '0.5.5', require: 'sidekiq-reliable-fetch'
# Cron Parser
gem 'fugit', '~> 1.2.1'
@ -233,10 +236,7 @@ gem 'connection_pool', '~> 2.0'
gem 'redis-rails', '~> 5.0.2'
# Discord integration
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration
gem 'hipchat', '~> 1.5.0'
gem 'discordrb-webhooks', '~> 3.4', require: false
# Jira integration
gem 'jira-ruby', '~> 2.1.4'
@ -274,7 +274,10 @@ gem 'licensee', '~> 9.14.1'
gem 'charlock_holmes', '~> 0.7.7'
# Detect mime content type from content
gem 'mimemagic', '~> 0.3.2'
gem 'ruby-magic-static', '~> 0.3.4'
# Fake version of the gem to trick bundler
gem 'mimemagic', '~> 0.3.10'
# Faster blank
gem 'fast_blank'
@ -309,7 +312,7 @@ gem 'pg_query', '~> 1.3.0'
gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '0.14.0'
gem 'gitlab-labkit', '~> 0.16.1'
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
gem 'thrift', '>= 0.14.0'
@ -321,7 +324,7 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
gem 'gettext_i18n_rails_js', '~> 1.3'
gem 'gettext', '~> 3.3', require: false, group: :development
gem 'batch-loader', '~> 1.4.0'
gem 'batch-loader', '~> 2.0.1'
# Perf bar
gem 'peek', '~> 1.1'
@ -341,7 +344,6 @@ end
group :development do
gem 'brakeman', '~> 4.2', require: false
gem 'danger', '~> 8.0.6', require: false
gem 'lefthook', '~> 0.7', require: false
gem 'letter_opener_web', '~> 1.3.4'
@ -375,9 +377,8 @@ group :development, :test do
gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'gitlab-styles', '~> 6.0.0', require: false
gem 'gitlab-styles', '~> 6.1.0', require: false
gem 'scss_lint', '~> 0.59.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false
@ -397,6 +398,11 @@ group :development, :test do
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
end
group :development, :test, :danger do
gem 'danger-gitlab', '~> 8.0', require: false
gem 'gitlab-dangerfiles', '~> 0.8.0', require: false
end
group :development, :test, :coverage do
gem 'simplecov', '~> 0.18.5', require: false
gem 'simplecov-cobertura', '~> 1.3.1', require: false
@ -433,7 +439,7 @@ end
gem 'octokit', '~> 4.15'
# https://gitlab.com/gitlab-org/gitlab/issues/207207
gem 'gitlab-mail_room', '~> 0.0.8', require: 'mail_room'
gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room'
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
@ -482,7 +488,7 @@ gem 'flipper', '~> 0.17.1'
gem 'flipper-active_record', '~> 0.17.1'
gem 'flipper-active_support_cache_store', '~> 0.17.1'
gem 'unleash', '~> 0.1.5'
gem 'gitlab-experiment', '~> 0.4.9'
gem 'gitlab-experiment', '~> 0.5.0'
# Structured logging
gem 'lograge', '~> 0.5'

172
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View File

@ -88,7 +88,7 @@ GEM
asciidoctor (~> 2.0)
asciidoctor-plantuml (0.0.12)
asciidoctor (>= 1.5.6, < 3.0.0)
ast (2.4.1)
ast (2.4.2)
atlassian-jwt (0.2.0)
jwt (~> 2.1.0)
attr_encrypted (3.1.0)
@ -127,8 +127,8 @@ GEM
nokogiri (~> 1.11.0.rc2)
babosa (1.0.2)
base32 (0.3.2)
batch-loader (1.4.0)
bcrypt (3.1.12)
batch-loader (2.0.1)
bcrypt (3.1.16)
bcrypt_pbkdf (1.0.0)
benchmark-ips (2.3.0)
benchmark-memory (0.1.2)
@ -172,6 +172,14 @@ GEM
cbor (0.5.9.6)
character_set (1.4.0)
charlock_holmes (0.7.7)
chef-config (16.10.17)
addressable
chef-utils (= 16.10.17)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-utils (16.10.17)
childprocess (3.0.0)
chunky_png (1.3.5)
citrus (3.0.2)
@ -187,7 +195,7 @@ GEM
concord (0.1.5)
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
concurrent-ruby (1.1.7)
concurrent-ruby (1.1.8)
connection_pool (2.2.2)
contracts (0.11.0)
cork (0.3.0)
@ -208,7 +216,7 @@ GEM
css_parser (1.7.0)
addressable
daemons (1.3.1)
danger (8.0.6)
danger (8.2.3)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
@ -220,7 +228,10 @@ GEM
kramdown-parser-gfm (~> 1.0)
no_proxy_fix
octokit (~> 4.7)
terminal-table (~> 1)
terminal-table (>= 1, < 4)
danger-gitlab (8.0.0)
danger
gitlab (~> 4.2, >= 4.2.0)
database_cleaner (1.7.0)
debugger-ruby_core_source (1.3.8)
deckar01-task_list (2.3.1)
@ -257,8 +268,8 @@ GEM
diff-lcs (1.4.4)
diff_match_patch (0.1.0)
diffy (3.3.0)
discordrb-webhooks-blackst0ne (3.3.0)
rest-client (~> 2.0)
discordrb-webhooks (3.4.2)
rest-client (>= 2.0.0)
docile (1.3.2)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
@ -348,6 +359,8 @@ GEM
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
ffi-yajl (2.3.4)
libyajl2 (~> 1.2)
flipper (0.17.1)
flipper-active_record (0.17.1)
activerecord (>= 4.2, < 7)
@ -363,7 +376,7 @@ GEM
fog-json
ipaddress (~> 0.8)
xml-simple (~> 1.1)
fog-aws (3.8.0)
fog-aws (3.9.0)
fog-core (~> 2.1)
fog-json (~> 1.1)
fog-xml (~> 0.1)
@ -373,12 +386,6 @@ GEM
excon (~> 0.58)
formatador (~> 0.2)
mime-types
fog-google (1.12.0)
fog-core (<= 2.1.0)
fog-json (~> 1.2)
fog-xml (~> 0.1.0)
google-api-client (>= 0.44.2, < 0.51)
google-cloud-env (~> 1.2)
fog-json (1.2.0)
fog-core
multi_json (~> 1.10)
@ -403,6 +410,7 @@ GEM
fuubar (2.2.0)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
fuzzyurl (0.9.0)
gemoji (3.0.1)
gemojione (3.3.0)
json
@ -423,38 +431,49 @@ GEM
gitaly (13.9.0.pre.rc1)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab (4.16.1)
httparty (~> 0.14, >= 0.14.0)
terminal-table (~> 1.5, >= 1.5.1)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
gitlab-experiment (0.4.9)
gitlab-dangerfiles (0.8.0)
danger
gitlab-experiment (0.5.0)
activesupport (>= 3.0)
scientist (~> 1.5, >= 1.5.0)
gitlab-fog-azure-rm (1.0.0)
gitlab-fog-azure-rm (1.0.1)
azure-storage-blob (~> 2.0)
azure-storage-common (~> 2.0)
fog-core (= 2.1.0)
fog-json (~> 1.2.0)
mime-types
ms_rest_azure (~> 0.12.0)
gitlab-labkit (0.14.0)
gitlab-fog-google (1.13.0)
addressable (>= 2.7.0)
fog-core (<= 2.1.0)
fog-json (~> 1.2)
fog-xml (~> 0.1.0)
google-api-client (>= 0.44.2, < 0.51)
google-cloud-env (~> 1.2)
gitlab-labkit (0.16.1)
actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0)
gitlab-pg_query (~> 1.3)
grpc (~> 1.19)
jaeger-client (~> 1.1)
opentracing (~> 0.4)
pg_query (~> 1.3)
redis (> 3.0.0, < 5.0.0)
gitlab-license (1.3.0)
gitlab-mail_room (0.0.8)
gitlab-license (1.3.1)
gitlab-mail_room (0.0.9)
gitlab-markup (1.7.1)
gitlab-net-dns (0.9.1)
gitlab-pg_query (1.3.1)
gitlab-pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
gitlab-sidekiq-fetcher (0.5.2)
gitlab-sidekiq-fetcher (0.5.5)
sidekiq (~> 5)
gitlab-styles (6.0.0)
rubocop (~> 0.91.1)
gitlab-styles (6.1.0)
rubocop (~> 0.91, >= 0.91.1)
rubocop-gitlab-security (~> 0.1.1)
rubocop-performance (~> 1.9.2)
rubocop-rails (~> 2.9)
@ -520,7 +539,7 @@ GEM
faraday (>= 1.0)
faraday_middleware
graphql-client
graphql (1.11.4)
graphql (1.11.8)
graphql-client (0.16.0)
activesupport (>= 3.0)
graphql (~> 1.8)
@ -574,9 +593,6 @@ GEM
railties (>= 5.0)
heapy (0.2.0)
thor
hipchat (1.5.2)
httparty
mimemagic
html-pipeline (2.13.2)
activesupport (>= 2)
nokogiri (>= 1.4)
@ -598,7 +614,7 @@ GEM
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (1.8.7)
i18n (1.8.9)
concurrent-ruby (~> 1.0)
i18n_data (0.8.0)
icalendar (2.4.1)
@ -668,6 +684,7 @@ GEM
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
libyajl2 (1.2.0)
license_finder (6.0.0)
bundler
rubyzip (>= 1, < 3)
@ -711,12 +728,20 @@ GEM
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2020.0512)
mimemagic (0.3.5)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_histogram (0.3.1)
mini_magick (4.10.1)
mini_mime (1.0.2)
mini_portile2 (2.5.0)
minitest (5.11.3)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
tomlrb
mixlib-log (3.0.9)
mixlib-shellout (3.2.5)
chef-utils
ms_rest (0.7.6)
concurrent-ruby (~> 1.0)
faraday (>= 0.9, < 2.0.0)
@ -737,10 +762,12 @@ GEM
mustermann (>= 1.0.0)
nap (1.1.0)
nenv (0.3.0)
net-http-persistent (4.0.0)
net-http-persistent (4.0.1)
connection_pool (~> 2.2)
net-ldap (0.16.3)
net-ntp (2.1.3)
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.0.0)
netrc (0.11.0)
nio4r (2.5.4)
@ -764,6 +791,19 @@ GEM
octokit (4.20.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (16.10.6)
chef-config (>= 12.8, < 17)
chef-utils (>= 16.0, < 17)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
ipaddress
mixlib-cli (>= 1.7.0)
mixlib-config (>= 2.0, < 4.0)
mixlib-log (>= 2.0.1, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
plist (~> 3.1)
train-core
wmi-lite (~> 1.0)
oj (3.10.6)
omniauth (1.9.0)
hashie (>= 3.4.6, < 3.7.0)
@ -776,6 +816,8 @@ GEM
omniauth-authentiq (0.3.3)
jwt (>= 1.5)
omniauth-oauth2 (>= 1.5)
omniauth-azure-activedirectory-v2 (0.1.1)
omniauth-oauth2
omniauth-azure-oauth2 (0.0.10)
jwt (>= 1.0, < 3.0)
omniauth (~> 1.0)
@ -855,6 +897,7 @@ GEM
railties (>= 4.0.0)
pg (1.2.3)
pg_query (1.3.0)
plist (3.6.0)
png_quantizator (0.2.1)
po_to_json (1.0.1)
json (>= 1.6.0)
@ -1041,16 +1084,16 @@ GEM
pg
rails
sqlite3
rubocop (0.91.1)
rubocop (0.93.1)
parallel (~> 1.10)
parser (>= 2.7.1.1)
parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
regexp_parser (>= 1.8)
rexml
rubocop-ast (>= 0.4.0, < 1.0)
rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.8.0)
rubocop-ast (1.4.1)
parser (>= 2.7.1.5)
rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51)
@ -1068,6 +1111,8 @@ GEM
i18n
ruby-fogbugz (0.2.1)
crack (~> 0.4)
ruby-magic-static (0.3.5)
mini_portile2 (~> 2.5.0)
ruby-prof (1.3.1)
ruby-progressbar (1.11.0)
ruby-saml (1.7.2)
@ -1079,7 +1124,7 @@ GEM
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (2.0.0)
rugged (1.0.1)
rugged (1.1.0)
safe_yaml (1.0.4)
safety_net_attestation (0.4.0)
jwt (~> 2.0)
@ -1104,9 +1149,7 @@ GEM
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
scientist (1.5.0)
scss_lint (0.59.0)
sass (~> 3.5, >= 3.5.5)
scientist (1.6.0)
securecompare (1.0.0)
seed-fu (2.3.7)
activerecord (>= 3.1)
@ -1196,9 +1239,17 @@ GEM
parslet (~> 1.8.0)
toml-rb (1.0.0)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
tpm-key_attestation (0.9.0)
bindata (~> 2.4)
openssl-signature_algorithm (~> 0.4.0)
train-core (3.4.9)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 4.0)
net-ssh (>= 2.9, < 7.0)
truncato (0.7.11)
htmlentities (~> 4.3.1)
nokogiri (>= 1.7.0, <= 2.0)
@ -1235,7 +1286,7 @@ GEM
validate_email (0.1.6)
activemodel (>= 3.0)
mail (>= 2.2.5)
validate_url (1.0.8)
validate_url (1.0.13)
activemodel (>= 3.0.0)
public_suffix
validates_hostname (1.0.11)
@ -1271,6 +1322,7 @@ GEM
expression_parser
rinku
with_env (1.1.0)
wmi-lite (1.0.5)
xml-simple (1.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
@ -1302,8 +1354,8 @@ DEPENDENCIES
aws-sdk-s3 (~> 1)
babosa (~> 1.0.2)
base32 (~> 0.3.0)
batch-loader (~> 1.4.0)
bcrypt (= 3.1.12)
batch-loader (~> 2.0.1)
bcrypt (~> 3.1, >= 3.1.14)
bcrypt_pbkdf (~> 1.0)
benchmark-ips (~> 2.3.0)
benchmark-memory (~> 0.1)
@ -1324,7 +1376,7 @@ DEPENDENCIES
countries (~> 3.0)
creole (~> 0.5.0)
crystalball (~> 0.7.0)
danger (~> 8.0.6)
danger-gitlab (~> 8.0)
database_cleaner (~> 1.7.0)
deckar01-task_list (= 2.3.1)
default_value_for (~> 3.4.0)
@ -1335,7 +1387,7 @@ DEPENDENCIES
devise-two-factor (~> 3.1.0)
diff_match_patch (~> 0.1.0)
diffy (~> 3.3)
discordrb-webhooks-blackst0ne (~> 3.3)
discordrb-webhooks (~> 3.4)
doorkeeper (~> 5.5.0.rc2)
doorkeeper-openid_connect (~> 1.7.5)
ed25519 (~> 1.2)
@ -1356,9 +1408,8 @@ DEPENDENCIES
flipper-active_support_cache_store (~> 0.17.1)
flowdock (~> 0.7)
fog-aliyun (~> 0.3)
fog-aws (~> 3.8)
fog-aws (~> 3.9)
fog-core (= 2.1.0)
fog-google (~> 1.12)
fog-local (~> 0.6)
fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1)
@ -1371,16 +1422,18 @@ DEPENDENCIES
gitaly (~> 13.9.0.pre.rc1)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
gitlab-experiment (~> 0.4.9)
gitlab-fog-azure-rm (~> 1.0)
gitlab-labkit (= 0.14.0)
gitlab-dangerfiles (~> 0.8.0)
gitlab-experiment (~> 0.5.0)
gitlab-fog-azure-rm (~> 1.0.1)
gitlab-fog-google (~> 1.13)
gitlab-labkit (~> 0.16.1)
gitlab-license (~> 1.3)
gitlab-mail_room (~> 0.0.8)
gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1)
gitlab-pry-byebug
gitlab-sidekiq-fetcher (= 0.5.2)
gitlab-styles (~> 6.0.0)
gitlab-sidekiq-fetcher (= 0.5.5)
gitlab-styles (~> 6.1.0)
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
@ -1393,7 +1446,7 @@ DEPENDENCIES
grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10)
graphlient (~> 0.4.0)
graphql (~> 1.11.4)
graphql (~> 1.11.8)
graphql-docs (~> 1.6.0)
grpc (~> 1.30.2)
gssapi
@ -1404,7 +1457,6 @@ DEPENDENCIES
hashie
hashie-forbidden_attributes
health_check (~> 3.0)
hipchat (~> 1.5.0)
html-pipeline (~> 2.13.2)
html2text
httparty (~> 0.16.4)
@ -1433,7 +1485,7 @@ DEPENDENCIES
marginalia (~> 1.10.0)
memory_profiler (~> 0.9)
method_source (~> 1.0)
mimemagic (~> 0.3.2)
mimemagic (~> 0.3.10)
mini_magick (~> 4.10.1)
minitest (~> 5.11.0)
multi_json (~> 1.14.1)
@ -1443,11 +1495,13 @@ DEPENDENCIES
nokogiri (~> 1.11.1)
oauth2 (~> 1.4)
octokit (~> 4.15)
ohai (~> 16.10)
oj (~> 3.10.6)
omniauth (~> 1.8)
omniauth-atlassian-oauth2 (~> 0.2.0)
omniauth-auth0 (~> 2.0.0)
omniauth-authentiq (~> 0.3.3)
omniauth-azure-activedirectory-v2 (~> 0.1)
omniauth-azure-oauth2 (~> 0.0.9)
omniauth-cas3 (~> 1.1.4)
omniauth-facebook (~> 4.0.0)
@ -1505,14 +1559,14 @@ DEPENDENCIES
rspec_junit_formatter
rspec_profiling (~> 0.0.6)
ruby-fogbugz (~> 0.2.1)
ruby-magic-static (~> 0.3.4)
ruby-prof (~> 1.3.0)
ruby-progressbar (~> 1.10)
ruby_parser (~> 3.15)
rubyzip (~> 2.0.0)
rugged (~> 1.0.1)
rugged (~> 1.1)
sanitize (~> 5.2.1)
sassc-rails (~> 2.1.0)
scss_lint (~> 0.59.0)
seed-fu (~> 2.3.7)
selenium-webdriver (~> 3.142)
sentry-raven (~> 3.0)

369
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View File

@ -285,10 +285,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a";
sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
type = "gem";
};
version = "2.4.1";
version = "2.4.2";
};
atlassian-jwt = {
dependencies = ["jwt"];
@ -475,20 +475,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09jaxxddqpgq8ynwd2gpjq5rkhw00zdjnqisk9qbpjgxzk6f8gwi";
sha256 = "17d8wwj880zar5h8zxdmw878shgmljmmv957802fw5nkg3gi3xwk";
type = "gem";
};
version = "1.4.0";
version = "2.0.1";
};
bcrypt = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy";
sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb";
type = "gem";
};
version = "3.1.12";
version = "3.1.16";
};
bcrypt_pbkdf = {
groups = ["ed25519"];
@ -703,6 +703,27 @@
};
version = "0.7.7";
};
chef-config = {
dependencies = ["addressable" "chef-utils" "fuzzyurl" "mixlib-config" "mixlib-shellout" "tomlrb"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z3lashvhqy9v5b3xn8vzzf07gnjw4mgdiiryxsg6kdasvj62j8z";
type = "gem";
};
version = "16.10.17";
};
chef-utils = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cypir7fza7jfqaj1j1jh37d3i6bvrmm6jamjlngk3xbdbd56hm7";
type = "gem";
};
version = "16.10.17";
};
childprocess = {
groups = ["default" "test"];
platforms = [];
@ -805,10 +826,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
type = "gem";
};
version = "1.1.7";
version = "1.1.8";
};
connection_pool = {
groups = ["default"];
@ -928,14 +949,25 @@
};
danger = {
dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"];
groups = ["development"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lrifb0kbjk9033pzjnp8qqqkg2z212h8dgj71k15c6wb6rycqa7";
sha256 = "1nv02gq90nngnfa6hgiyyk60a31xfayk67va98k41gy9arhdkz5g";
type = "gem";
};
version = "8.0.6";
version = "8.2.3";
};
danger-gitlab = {
dependencies = ["danger" "gitlab"];
groups = ["danger" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a530kx5s5rbx5yx3jqay56lkksqh0yj468hcpg16faiyv8dfza9";
type = "gem";
};
version = "8.0.0";
};
database_cleaner = {
groups = ["development" "test"];
@ -1087,16 +1119,16 @@
};
version = "3.3.0";
};
discordrb-webhooks-blackst0ne = {
discordrb-webhooks = {
dependencies = ["rest-client"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f0dw6ci5cbrxrvvqw2kqabpzyjisd4hflbi370rpb4cakkzgw39";
sha256 = "0viw73jd9vs9f92a9q2vxcd29755h7w8jwz36jmvcdl2najainyg";
type = "gem";
};
version = "3.3.0";
version = "3.4.2";
};
docile = {
groups = ["default" "development" "test"];
@ -1563,6 +1595,17 @@
};
version = "1.0.1";
};
ffi-yajl = {
dependencies = ["libyajl2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pfmn0gprc3c15baxa9rx64pqllk64m60f5vg4gp0icpafkp0jx5";
type = "gem";
};
version = "2.3.4";
};
flipper = {
groups = ["default"];
platforms = [];
@ -1623,10 +1666,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q7n8r03akjbdz3r2bgsl6wcjvdlf0k508z8bsd9zgs43qg14vc9";
sha256 = "10y32rm3vcfh82p2fdr2zq8ibknx1jslmai5m0r261bdr3brkssm";
type = "gem";
};
version = "3.8.0";
version = "3.9.0";
};
fog-core = {
dependencies = ["builder" "excon" "formatador" "mime-types"];
@ -1639,17 +1682,6 @@
};
version = "2.1.0";
};
fog-google = {
dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cl6rprichdn1i40c2ndri1c53cfb0x2xk58l9arwip9ivkasln4";
type = "gem";
};
version = "1.12.0";
};
fog-json = {
dependencies = ["fog-core" "multi_json"];
groups = ["default"];
@ -1737,6 +1769,16 @@
};
version = "2.2.0";
};
fuzzyurl = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03qchs33vfwbsv5awxg3acfmlcrf5xbhnbrc83fdpamwya0glbjl";
type = "gem";
};
version = "0.9.0";
};
gemoji = {
groups = ["default" "development" "test"];
platforms = [];
@ -1834,6 +1876,17 @@
};
version = "1.7.0";
};
gitlab = {
dependencies = ["httparty" "terminal-table"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kq77304vn733xc8iipq4wpdk5qb0zwjryhm3fia3mfsrdcp1z8k";
type = "gem";
};
version = "4.16.1";
};
gitlab-chronic = {
dependencies = ["numerizer"];
groups = ["default"];
@ -1845,16 +1898,27 @@
};
version = "0.10.5";
};
gitlab-dangerfiles = {
dependencies = ["danger"];
groups = ["danger" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09ggs890b5gfphnz7ayavs55l6xhw323spfd22dg246g0rw9vliy";
type = "gem";
};
version = "0.8.0";
};
gitlab-experiment = {
dependencies = ["activesupport" "scientist"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0skqg90i6qdpm7dhy8bv99gk8siwgm6mpr675790ngri1ns4f5xk";
sha256 = "0x4hyva7ypi2mx5jcyxac8w7ffai1pkkjc49fk3avqh4aimlibfr";
type = "gem";
};
version = "0.4.9";
version = "0.5.0";
};
gitlab-fog-azure-rm = {
dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"];
@ -1862,41 +1926,52 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04l7ps0vvrqq8i25q7ic2zy2n8f8f1l7sn1shf5wccy1cbyj9pig";
sha256 = "05yc5fp45v7y6h838zrj4666ar1ddhn8i5bbdxm8j73yrn2kjnal";
type = "gem";
};
version = "1.0.0";
version = "1.0.1";
};
gitlab-labkit = {
dependencies = ["actionpack" "activesupport" "gitlab-pg_query" "grpc" "jaeger-client" "opentracing" "redis"];
gitlab-fog-google = {
dependencies = ["addressable" "fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l4sbvlk6qc0x8372rp1gc2ihmx3vp0afrm5cy55xhflq16y7sl1";
sha256 = "0ybmiclsdpkp1l91z6d4qkhha6cik6kgf4kzs3a2c26mhnnj6gxy";
type = "gem";
};
version = "0.14.0";
version = "1.13.0";
};
gitlab-labkit = {
dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03i8fc1yzm5yzqxb8bxhjkhqpj17fy71vg2z02bcj4mzbj0piflx";
type = "gem";
};
version = "0.16.1";
};
gitlab-license = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04846kr8pw0fkw4mavakai978raq5d2kjna4rawxpc3dqlr897g4";
sha256 = "01z5pb6fg1j83p73vys2fhj7qh60zkqbgiyp4nvw013a6hjlv3qk";
type = "gem";
};
version = "1.3.0";
version = "1.3.1";
};
gitlab-mail_room = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05j8rpsbl2l5q4xnfh2cnws9axy1a19asg8nlw6jngba94raw5ir";
sha256 = "0745kls2bazgk6kbmlq1dmd42z8bgxkyn6ki9snxka8abi5kf037";
type = "gem";
};
version = "0.0.8";
version = "0.0.9";
};
gitlab-markup = {
groups = ["default"];
@ -1918,16 +1993,6 @@
};
version = "0.9.1";
};
gitlab-pg_query = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rybirjyclavp641qdx27483xx0zpmc577wdzfgdnjd7753bya7g";
type = "gem";
};
version = "1.3.1";
};
gitlab-pry-byebug = {
dependencies = ["byebug" "pry"];
groups = ["development" "test"];
@ -1949,10 +2014,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dvx2klf1a1xyf15q34fn59291v6jwx3z315rxb2dmkvcr9873m1";
sha256 = "055v0cxvxgy12iwhqa2xbsxa9j6ww7p1f5jqwncwsnr7l6f1f4c9";
type = "gem";
};
version = "0.5.2";
version = "0.5.5";
};
gitlab-styles = {
dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rails" "rubocop-rspec"];
@ -1960,10 +2025,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17d238cy031gnjmrk6wl3qyk5kqhqjxrb68813n4y9ia817xmwyp";
sha256 = "0y3livdpkdzp4cy47ycpwqa7nhrf6fb1ff2lwhh4l5n4dpqympwn";
type = "gem";
};
version = "6.0.0";
version = "6.1.0";
};
gitlab_chronic_duration = {
dependencies = ["numerizer"];
@ -2145,10 +2210,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01ldxhn59lfg5ivxc9m11v1qhw29ql95qcvwwcap49n0z7d1i3k5";
sha256 = "0rm59b6klp97287h01aj8hr12mhsya585as2z1sk8hq2lp51imfn";
type = "gem";
};
version = "1.11.4";
version = "1.11.8";
};
graphql-client = {
dependencies = ["activesupport" "graphql"];
@ -2332,17 +2397,6 @@
};
version = "0.2.0";
};
hipchat = {
dependencies = ["httparty" "mimemagic"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
type = "gem";
};
version = "1.5.2";
};
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
groups = ["default" "development" "test"];
@ -2455,10 +2509,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv";
sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
type = "gem";
};
version = "1.8.7";
version = "1.8.9";
};
i18n_data = {
groups = ["default"];
@ -2758,6 +2812,16 @@
};
version = "1.3.4";
};
libyajl2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n5j0p8dxf9xzb9n4bkdr8w0a8gg3jzrn9indri3n0fv90gcs5qi";
type = "gem";
};
version = "1.2.0";
};
license_finder = {
dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"];
groups = ["development" "omnibus" "test"];
@ -2953,14 +3017,15 @@
version = "3.2020.0512";
};
mimemagic = {
dependencies = ["nokogiri" "rake"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qfqb9w76kmpb48frbzbyvjc0dfxh5qiw1kxdbv2y2kp6fxpa1kf";
sha256 = "0cqm9n9122qpksn9v6mp0gn3lrzxhh72lwl7yb6j75gykdan6h41";
type = "gem";
};
version = "0.3.5";
version = "0.3.10";
};
mini_histogram = {
groups = ["default" "test"];
@ -3012,6 +3077,48 @@
};
version = "5.11.3";
};
mixlib-cli = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6";
type = "gem";
};
version = "2.1.8";
};
mixlib-config = {
dependencies = ["tomlrb"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq";
type = "gem";
};
version = "3.0.9";
};
mixlib-log = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0n5dm5iz90ijvjn59jfm8gb8hgsvbj0f1kpzbl38b02z0z4a4v7x";
type = "gem";
};
version = "3.0.9";
};
mixlib-shellout = {
dependencies = ["chef-utils"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g99c3s5zvrwvlv3gjw5fvpdimybpfazqyszjim5kdjjbq0586hj";
type = "gem";
};
version = "3.2.5";
};
ms_rest = {
dependencies = ["concurrent-ruby" "faraday" "timeliness"];
groups = ["default"];
@ -3132,10 +3239,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sbdvkn7mzl883iykz74hgp14qj041gldf2vdk9g3gyqc843l2vr";
sha256 = "1yfypmfg1maf20yfd22zzng8k955iylz7iip0mgc9lazw36g8li7";
type = "gem";
};
version = "4.0.0";
version = "4.0.1";
};
net-ldap = {
groups = ["default"];
@ -3157,6 +3264,17 @@
};
version = "2.1.3";
};
net-scp = {
dependencies = ["net-ssh"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b4h3ip8d1gkrc0znnw54hbxillk73mdnaf5pz330lmrcl1wiilg";
type = "gem";
};
version = "3.0.0";
};
net-ssh = {
groups = ["default"];
platforms = [];
@ -3272,6 +3390,17 @@
};
version = "4.20.0";
};
ohai = {
dependencies = ["chef-config" "chef-utils" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "train-core" "wmi-lite"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08pc5l9p741g08x7xzbkkyi2kz5m5xr8rdj6hfna9bjzb1p80ddq";
type = "gem";
};
version = "16.10.6";
};
oj = {
groups = ["default"];
platforms = [];
@ -3326,6 +3455,17 @@
};
version = "0.3.3";
};
omniauth-azure-activedirectory-v2 = {
dependencies = ["omniauth-oauth2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bgdyzjh7x9knkzaa6bl9f5fvh05nd0gqxrqassww0vqh5qgyfpy";
type = "gem";
};
version = "0.1.1";
};
omniauth-azure-oauth2 = {
dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
groups = ["default"];
@ -3667,6 +3807,16 @@
};
version = "1.3.0";
};
plist = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l";
type = "gem";
};
version = "3.6.0";
};
png_quantizator = {
groups = ["development" "test"];
platforms = [];
@ -4479,10 +4629,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19nmdwz6mc5ah0xqlj1j58ylcp9zsckb1xm7p1z51abnqhcq5c06";
sha256 = "0phrig25dykgi42z6mf1abllh3ws6sv7awa82hzvvvbjx2xlzd3k";
type = "gem";
};
version = "0.91.1";
version = "0.93.1";
};
rubocop-ast = {
dependencies = ["parser"];
@ -4490,10 +4640,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "165ws2vwnw33nlqgzvzzjjp1zhkc712a92lbpbjx8j83g44dmdy4";
sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78";
type = "gem";
};
version = "0.8.0";
version = "1.4.1";
};
rubocop-gitlab-security = {
dependencies = ["rubocop"];
@ -4561,6 +4711,17 @@
};
version = "0.2.1";
};
ruby-magic-static = {
dependencies = ["mini_portile2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0whs2i868g1bgglrxl6aba47h8n9zqglsipskk6l83rfkm85ik3g";
type = "gem";
};
version = "0.3.5";
};
ruby-prof = {
groups = ["default"];
platforms = [];
@ -4658,10 +4819,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "056bwiwxvnbkbgsr2wqcsknnc73nqasqdnjcpgj2r61wkm8mzmbn";
sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy";
type = "gem";
};
version = "1.0.1";
version = "1.1.0";
};
safe_yaml = {
groups = ["default" "test"];
@ -4755,21 +4916,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09565ppvd851zxpspn5d5q28wqkfjyfxhvda9w80i16p3y937155";
sha256 = "0jklwk9aldvlmdv17m77g2f82j383alqd4jjnwn4c564q9wvz3fp";
type = "gem";
};
version = "1.5.0";
};
scss_lint = {
dependencies = ["sass"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1s6dzk4n9pnmqciliggwpiny43vc3cx3n2d5gqa9aqng77ff7yv7";
type = "gem";
};
version = "0.59.0";
version = "1.6.0";
};
securecompare = {
groups = ["default"];
@ -5273,6 +5423,16 @@
};
version = "1.0.0";
};
tomlrb = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00x5y9h4fbvrv4xrjk4cqlkm4vq8gv73ax4alj3ac2x77zsnnrk8";
type = "gem";
};
version = "1.3.0";
};
tpm-key_attestation = {
dependencies = ["bindata" "openssl-signature_algorithm"];
groups = ["default"];
@ -5284,6 +5444,17 @@
};
version = "0.9.0";
};
train-core = {
dependencies = ["addressable" "ffi" "json" "mixlib-shellout" "net-scp" "net-ssh"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pbfbmi9l5hxr1zly1bc72fk8a6by4d19wdap8q3mi3rlflqzbfp";
type = "gem";
};
version = "3.4.9";
};
truncato = {
dependencies = ["htmlentities" "nokogiri"];
groups = ["default"];
@ -5459,10 +5630,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1k0bfxzvdcf1nrqhvnyhijc4mwab9wn4qvqb0ynq6p8dj0f866zi";
sha256 = "1bwj34rz7961rrl545f006m2jdz1nrc0m72gfqmnb41xwsvpagbk";
type = "gem";
};
version = "1.0.8";
version = "1.0.13";
};
validates_hostname = {
dependencies = ["activerecord" "activesupport"];
@ -5591,6 +5762,16 @@
};
version = "1.1.0";
};
wmi-lite = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "110dv4arvwyky6f2pq19f20f1xcjpiz3zfbals0y49ijpq8agvql";
type = "gem";
};
version = "1.0.5";
};
xml-simple = {
groups = ["default" "development" "test"];
platforms = [];
@ -5632,4 +5813,4 @@
};
version = "2.4.2";
};
}
}

10
pkgs/applications/version-management/gitlab/update.py
View File

@ -68,7 +68,10 @@ class GitLabRepo:
version = self.rev2version(rev)
passthru = {v: self.get_file(v, rev).strip() for v in ['GITALY_SERVER_VERSION', 'GITLAB_PAGES_VERSION',
'GITLAB_SHELL_VERSION', 'GITLAB_WORKHORSE_VERSION']}
'GITLAB_SHELL_VERSION']}
passthru["GITLAB_WORKHORSE_VERSION"] = version
return dict(version=self.rev2version(rev),
repo_hash=self.get_git_hash(rev),
owner=self.owner,
@ -181,9 +184,6 @@ def update_gitlab_shell():
gitlab_shell_version = data['passthru']['GITLAB_SHELL_VERSION']
_call_nix_update('gitlab-shell', gitlab_shell_version)
repo = GitLabRepo(repo='gitlab-shell')
gitlab_shell_dir = pathlib.Path(__file__).parent / 'gitlab-shell'
@cli.command('update-gitlab-workhorse')
def update_gitlab_workhorse():
@ -192,8 +192,6 @@ def update_gitlab_workhorse():
gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION']
_call_nix_update('gitlab-workhorse', gitlab_workhorse_version)
repo = GitLabRepo('gitlab-org', 'gitlab-workhorse')
gitlab_workhorse_dir = pathlib.Path(__file__).parent / 'gitlab-workhorse'
@cli.command('update-all')
@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'')

1776
pkgs/applications/version-management/gitlab/yarnPkgs.nix
View File

File diff suppressed because it is too large Load Diff

11
pkgs/build-support/fetchzip/default.nix
View File

@ -5,16 +5,19 @@
# (e.g. due to minor changes in the compression algorithm, or changes
# in timestamps).
{ fetchurl, unzip }:
{ lib, fetchurl, unzip }:
{ # Optionally move the contents of the unpacked tree up one level.
stripRoot ? true
, url
, url ? ""
, urls ? []
, extraPostFetch ? ""
, name ? "source"
, ... } @ args:
(fetchurl ({
(fetchurl (let
basename = baseNameOf (if url != "" then url else builtins.head urls);
in {
inherit name;
recursiveHash = true;
@ -27,7 +30,7 @@
mkdir "$unpackDir"
cd "$unpackDir"
renamed="$TMPDIR/${baseNameOf url}"
renamed="$TMPDIR/${basename}"
mv "$downloadedFile" "$renamed"
unpackFile "$renamed"
''

14
pkgs/build-support/rust/build-rust-crate/build-crate.nix
View File

@ -9,12 +9,14 @@
let
baseRustcOpts =
[(if release then "-C opt-level=3" else "-C debuginfo=2")]
++ ["-C codegen-units=$NIX_BUILD_CORES"]
++ ["--remap-path-prefix=$NIX_BUILD_TOP=/" ]
++ [(mkRustcDepArgs dependencies crateRenames)]
++ [(mkRustcFeatureArgs crateFeatures)]
++ extraRustcOpts
[
(if release then "-C opt-level=3" else "-C debuginfo=2")
"-C codegen-units=$NIX_BUILD_CORES"
"-C incremental=no"
"--remap-path-prefix=$NIX_BUILD_TOP=/"
(mkRustcDepArgs dependencies crateRenames)
(mkRustcFeatureArgs crateFeatures)
] ++ extraRustcOpts
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--target ${rust.toRustTargetSpec stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc"
# since rustc 1.42 the "proc_macro" crate is part of the default crate prelude
# https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022

2
pkgs/build-support/rust/build-rust-crate/configure-crate.nix
View File

@ -24,7 +24,7 @@ let version_ = lib.splitString "-" crateVersion;
version = lib.splitVersion (lib.head version_);
rustcOpts = lib.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2")
(["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts);
(["-C codegen-units=$NIX_BUILD_CORES -C incremental=no"] ++ extraRustcOpts);
buildDeps = mkRustcDepArgs buildDependencies crateRenames;
authors = lib.concatStringsSep ":" crateAuthors;
optLevel = if release then 3 else 0;

2
pkgs/data/fonts/paratype-pt/mono.nix
View File

@ -3,7 +3,7 @@
fetchzip {
name = "paratype-pt-mono";
url = [
urls = [
"https://company.paratype.com/system/attachments/631/original/ptmono.zip"
"http://rus.paratype.ru/system/attachments/631/original/ptmono.zip"
];

2
pkgs/data/fonts/paratype-pt/sans.nix
View File

@ -3,7 +3,7 @@
fetchzip {
name = "paratype-pt-sans";
url = [
urls = [
"https://company.paratype.com/system/attachments/629/original/ptsans.zip"
"http://rus.paratype.ru/system/attachments/629/original/ptsans.zip"
];

2
pkgs/data/fonts/paratype-pt/serif.nix
View File

@ -3,7 +3,7 @@
fetchzip {
name = "paratype-pt-serif";
url = [
urls = [
"https://company.paratype.com/system/attachments/634/original/ptserif.zip"
"http://rus.paratype.ru/system/attachments/634/original/ptserif.zip"
];

4
pkgs/data/themes/yaru/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "yaru";
version = "20.10.6.1";
version = "21.04.1";
src = fetchFromGitHub {
owner = "ubuntu";
repo = "yaru";
rev = version;
sha256 = "0kcmxfz2rfav7aj5v1vv335vqzyj0n53lbhwx0g6gxxfi0x3vv6v";
sha256 = "0z6k8q9b5xjx6xwirqbsqq5jjxw79ar2d61r7cgipqmbjdsjfgjz";
};
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];

4
pkgs/development/compilers/go/1.15.nix
View File

@ -11,7 +11,7 @@ let
inherit (lib) optionals optionalString;
version = "1.15.10";
version = "1.15.11";
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "0rfx20y13cflv68nn8jci1fx34vfdn7qgyavm5hivd0h15pcmny1";
sha256 = "1rb1s130yqy80kcl140k5a53xhvw4fmrpmclvqygcv67si0j8nzj";
};
# perl is used for testing go vet

8
pkgs/development/compilers/reason/default.nix
View File

@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-reason-${version}";
version = "3.6.2";
pname = "ocaml${ocaml.version}-reason";
version = "3.7.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "reason";
rev = "6017d6dd930f4989177c3f7c3c20cffbaabaa49a";
sha256 = "17wkcl3r0ckhlki9fk0mcwbnd7kpkqm1h0xjw2j2x1097n470df0";
rev = "daa11255cb4716ce1c370925251021bd6e3bd974";
sha256 = "0m6ldrci1a4j0qv1cbwh770zni3al8qxsphl353rv19f6rblplhs";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/development/interpreters/erlang/R23.nix
View File

@ -3,6 +3,6 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
version = "23.2.6";
sha256 = "sha256-G930sNbr8h5ryI/IE+J6OKhR5ij68ZhGo1YIEjSOwGU=";
version = "23.3.1";
sha256 = "1nx9yv3l8hf37js7pqs536ywy786mxhkqba1jsmy1b3yc6xki1mq";
}

6
pkgs/development/interpreters/ruby/default.nix
View File

@ -265,10 +265,10 @@ in {
};
ruby_3_0 = generic {
version = rubyVersion "3" "0" "0" "";
version = rubyVersion "3" "0" "1" "";
sha256 = {
src = "0a4fmxafxvkg1m738g2lmkhipwnmd96kzqy1m9kvk3n1l50x2gm1";
git = "0fvnxv97m94nridlc5nvvrlg53pr5g042dkfc5ysd327s7xj4cjp";
src = "09vpnxxcxc46qv40xbxr9xkdpbgb0imdy25l2vpsxxlr47djb61n";
git = "0vricyhnnczcbsgvz65pdhi9yx1i34zarbjlc5y5mcmj01y9r7ar";
};
};
}

2
pkgs/development/interpreters/ruby/patchsets.nix
View File

@ -11,7 +11,7 @@
"${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch"
];
"3.0.0" = ops useRailsExpress [
"3.0.1" = ops useRailsExpress [
"${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch"
"${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch"
];

10
pkgs/development/libraries/pipewire/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitLab
, fetchpatch
, removeReferencesTo
, meson
, ninja
@ -43,7 +42,7 @@ let
self = stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.24";
version = "0.3.25";
outputs = [
"out"
@ -61,7 +60,7 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
hash = "sha256:PcY20FTtUtJYAwCscEs+HfkdwDksYPFZIVTVORP1ooI=";
hash = "sha256:EbXWcf6QLtbvm6/eXBI+PF2sTw2opYfmc+H/SMDEH1U=";
};
patches = [
@ -75,11 +74,6 @@ let
./0070-installed-tests-path.patch
# Add flag to specify configuration directory (different from the installation directory).
./0080-pipewire-config-dir.patch
# Fix JSON parser.
(fetchpatch {
url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/34800dc0191a4ee7a329eeb361a6f2ccf4a75176.diff";
sha256 = "0dzxzr408qqzf0252nwg14709p1lb2k826i3kdzg6djq8w98d5aj";
})
];
nativeBuildInputs = [

172
pkgs/development/libraries/science/math/mkl/default.nix
View File

@ -17,40 +17,57 @@
let
# Release notes and download URLs are here:
# https://registrationcenter.intel.com/en/products/
version = "${year}.${spot}.${rel}";
version = "${mklVersion}.${rel}";
# Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details:
# https://github.com/matthewbauer/undmg/issues/4
year = if stdenvNoCC.isDarwin then "2019" else "2020";
spot = if stdenvNoCC.isDarwin then "3" else "4";
rel = if stdenvNoCC.isDarwin then "199" else "304";
mklVersion = if stdenvNoCC.isDarwin then "2019.3" else "2021.1.1";
rel = if stdenvNoCC.isDarwin then "199" else "52";
# Replace `openmpSpot` by `spot` after 2020.
openmpSpot = if stdenvNoCC.isDarwin then spot else "3";
# Intel openmp uses its own versioning.
openmpVersion = if stdenvNoCC.isDarwin then "19.0.3" else "19.1.3";
openmpRel = "189";
rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}";
# Intel openmp uses its own versioning, but shares the spot release patch.
openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1";
openmp-ver = "${openmp}.${openmpSpot}-${rel}-${openmp}.${openmpSpot}-${rel}";
# Thread Building Blocks release.
tbbRel = "119";
shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary;
in stdenvNoCC.mkDerivation {
oneapi-mkl = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm";
hash = "sha256-G2Y7iX3UN2YUJhxcMM2KmhONf0ls9owpGlOo8hHOfqA=";
};
oneapi-mkl-common = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-${mklVersion}-${mklVersion}-${rel}.noarch.rpm";
hash = "sha256-HrMt2OcPIRxM8EL8SPjYTyuHJnC7RhPFUrvLhRH+7vc=";
};
oneapi-mkl-common-devel = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-devel-${mklVersion}-${mklVersion}-${rel}.noarch.rpm";
hash = "sha256-XDE2WFJzEcpujFmO2AvqQdipZMvKB6/G+ksBe2sE438=";
};
oneapi-mkl-devel = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-devel-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm";
hash = "sha256-GhUJZ0Vr/ZXp10maie29/5ryU7zzX3F++wRCuuFcE0s=";
};
oneapi-openmp = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-openmp-${mklVersion}-${mklVersion}-${openmpRel}.x86_64.rpm";
hash = "sha256-yP2c4aQAFNRffjLoIZgWXLcNXbiez8smsgu2wXitefU=";
};
oneapi-tbb = fetchurl {
url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${mklVersion}-${mklVersion}-${tbbRel}.x86_64.rpm";
hash = "sha256-K1BvhGoGVU2Zwy5vg2ZvJWBrSdh5uQwo0znt5039X0A=";
};
in stdenvNoCC.mkDerivation ({
pname = "mkl";
inherit version;
src = if stdenvNoCC.isDarwin
then
(fetchurl {
url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15235/m_mkl_${version}.dmg";
sha256 = "14b3ciz7995sqcd6jz7hc8g2x4zwvqxmgxgni46vrlb7n523l62f";
})
else
(fetchurl {
url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/l_mkl_${version}.tgz";
hash = "sha256-IxTUZTaXTb0I8qTk+emhVdx+eeJ5jHTn3fqtAKWRfqU=";
});
dontUnpack = stdenvNoCC.isLinux;
nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin
then
@ -63,30 +80,15 @@ in stdenvNoCC.mkDerivation {
tar xzvf $f
done
'' else ''
# Common stuff
rpmextract rpm/intel-mkl-core-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-mkl-common-c-${rpm-ver}.noarch.rpm
rpmextract rpm/intel-mkl-common-f-${rpm-ver}.noarch.rpm
rpmextract ${oneapi-mkl}
rpmextract ${oneapi-mkl-common}
rpmextract ${oneapi-mkl-common-devel}
rpmextract ${oneapi-mkl-devel}
rpmextract ${oneapi-openmp}
rpmextract ${oneapi-tbb}
'';
# Dynamic libraries
rpmextract rpm/intel-mkl-cluster-rt-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-mkl-core-rt-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-mkl-gnu-f-rt-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-mkl-gnu-rt-${rpm-ver}.x86_64.rpm
# Intel OpenMP runtime
rpmextract rpm/intel-openmp-${openmp-ver}.x86_64.rpm
'' + (if enableStatic then ''
# Static libraries
rpmextract rpm/intel-mkl-cluster-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-mkl-gnu-${rpm-ver}.x86_64.rpm
rpmextract rpm/intel-mkl-gnu-f-${rpm-ver}.x86_64.rpm
'' else ''
# Take care of installing dynamic-only PkgConfig files during the installPhase
''
);
installPhase = ''
installPhase = if stdenvNoCC.isDarwin then ''
for f in $(find . -name 'mkl*.pc') ; do
bn=$(basename $f)
substituteInPlace $f \
@ -95,42 +97,54 @@ in stdenvNoCC.mkDerivation {
--replace "lib/intel64_lin" "lib" \
--replace "lib/intel64" "lib"
done
for f in $(find opt/intel -name 'mkl*iomp.pc') ; do
substituteInPlace $f \
--replace "../compiler/lib" "lib"
done
'' +
(if stdenvNoCC.isDarwin then ''
mkdir -p $out/lib
cp -r compilers_and_libraries_${version}/mac/mkl/include $out/
mkdir -p $out/lib
cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/
cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/
cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/
cp -r compilers_and_libraries_${version}/mac/tbb/lib/* $out/lib/
cp -r compilers_and_libraries_${version}/mac/mkl/include $out/
mkdir -p $out/lib/pkgconfig
cp -r compilers_and_libraries_${version}/mac/mkl/bin/pkgconfig/* $out/lib/pkgconfig
cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/
cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/
cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/
cp -r compilers_and_libraries_${version}/mac/tbb/lib/* $out/lib/
mkdir -p $out/lib/pkgconfig
cp -r compilers_and_libraries_${version}/mac/mkl/bin/pkgconfig/* $out/lib/pkgconfig
'' else ''
mkdir -p $out/lib
cp license.txt $out/lib/
for f in $(find . -name 'mkl*.pc') ; do
bn=$(basename $f)
substituteInPlace $f \
--replace $\{MKLROOT} "$out" \
--replace "lib/intel64" "lib"
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/
sed -r -i "s|^prefix=.*|prefix=$out|g" $f
done
mkdir -p $out/lib/pkgconfig
'') +
for f in $(find opt/intel -name 'mkl*iomp.pc') ; do
substituteInPlace $f --replace "../compiler/lib" "lib"
done
# License
install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/2021.1.1/licensing/en/license.txt
# Dynamic libraries
install -Dm0755 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so*
install -Dm0755 -t $out/lib opt/intel/oneapi/compiler/2021.1.1/linux/compiler/lib/intel64_lin/*.so*
install -Dm0755 -t $out/lib opt/intel/oneapi/tbb/2021.1.1/lib/intel64/gcc4.8/*.so*
# Headers
cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/
'' +
(if enableStatic then ''
cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/* $out/lib/
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/* $out/lib/pkgconfig
install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.a
install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*.pc
'' else ''
cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/*.so* $out/lib/
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/*.so* $out/lib/
cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/*dynamic*.pc $out/lib/pkgconfig
cp opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib
install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*dynamic*.pc
'') + ''
# Setup symlinks for blas / lapack
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}
ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}
@ -159,13 +173,18 @@ in stdenvNoCC.mkDerivation {
dontStrip = true;
dontPatchELF = true;
passthru.tests.pkg-config = callPackage ./test { };
passthru.tests = {
pkg-config-dynamic-iomp = callPackage ./test { enableStatic = false; execution = "iomp"; };
pkg-config-static-iomp = callPackage ./test { enableStatic = true; execution = "iomp"; };
pkg-config-dynamic-seq = callPackage ./test { enableStatic = false; execution = "seq"; };
pkg-config-static-seq = callPackage ./test { enableStatic = true; execution = "seq"; };
};
meta = with lib; {
description = "Intel Math Kernel Library";
description = "Intel OneAPI Math Kernel Library";
longDescription = ''
Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort
for future generations of Intel processors. It is compatible with your
Intel OneAPI Math Kernel Library (Intel oneMKL) optimizes code with minimal
effort for future generations of Intel processors. It is compatible with your
choice of compilers, languages, operating systems, and linking and
threading models.
'';
@ -174,4 +193,9 @@ in stdenvNoCC.mkDerivation {
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ bhipple ];
};
}
} // lib.optionalAttrs stdenvNoCC.isDarwin {
src = fetchurl {
url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15235/m_mkl_${version}.dmg";
sha256 = "14b3ciz7995sqcd6jz7hc8g2x4zwvqxmgxgni46vrlb7n523l62f";
};
})

18
pkgs/development/libraries/science/math/mkl/test/default.nix
View File

@ -1,6 +1,14 @@
{ stdenv, pkg-config, mkl }:
{ stdenv
, pkg-config
, mkl
stdenv.mkDerivation {
, enableStatic ? false
, execution ? "seq"
}:
let
linkType = if enableStatic then "static" else "dynamic";
in stdenv.mkDerivation {
pname = "mkl-test";
version = mkl.version;
@ -8,19 +16,19 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ mkl ];
buildInputs = [ (mkl.override { inherit enableStatic; }) ];
doCheck = true;
buildPhase = ''
# Check regular Nix build.
gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test
gcc test.c -o test $(pkg-config --cflags --libs mkl-${linkType}-ilp64-${execution})
# Clear flags to ensure that we are purely relying on options
# provided by pkg-config.
NIX_CFLAGS_COMPILE="" \
NIX_LDFLAGS="" \
gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test
gcc test.c -o test $(pkg-config --cflags --libs mkl-${linkType}-ilp64-${execution})
'';
installPhase = ''

6
pkgs/development/libraries/x264/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, lib, fetchurl, nasm }:
{ stdenv, lib, fetchurl, nasm
, enableShared ? !stdenv.hostPlatform.isStatic
}:
stdenv.mkDerivation rec {
pname = "x264";
@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
export AS=$CC
'';
configureFlags = [ "--enable-shared" ]
configureFlags = lib.optional enableShared "--enable-shared"
++ lib.optional (!stdenv.isi686) "--enable-pic"
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}";

2
pkgs/development/ocaml-modules/merlin-extend/default.nix
View File

@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "merlin-extend";
version = "0.6";
useDune2 = true;
src = fetchurl {
url = "https://github.com/let-def/merlin-extend/releases/download/v${version}/merlin-extend-v${version}.tbz";
sha256 = "0hvc4mz92x3rl2dxwrhvhzwl4gilnyvvwcqgr45vmdpyjyp3dwn2";

8
pkgs/development/ocaml-modules/ocamlnet/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkg-config, ncurses, ocaml, findlib, ocaml_pcre, camlzip
{ stdenv, lib, fetchurl, pkg-config, which, ncurses, ocaml, findlib, ocaml_pcre, camlzip
, gnutls, nettle
}:
@ -8,14 +8,14 @@ else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ocamlnet-${version}";
version = "4.1.8";
version = "4.1.9";
src = fetchurl {
url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
sha256 = "1x703mjqsv9nvffnkj5i36ij2s5zfvxxll2z1qj6a7p428b2yfnm";
sha256 = "1vlwxjxr946gdl61a1d7yk859cijq45f60dhn54ik3w4g6cx33pr";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config which ];
buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ];
createFindlibDestdir = true;

5
pkgs/development/ocaml-modules/sqlite3/default.nix
View File

@ -1,8 +1,9 @@
{ lib, fetchurl, sqlite, pkg-config, buildDunePackage }:
{ lib, fetchurl, sqlite, pkg-config, buildDunePackage, dune-configurator }:
buildDunePackage rec {
pname = "sqlite3";
version = "5.0.2";
useDune2 = true;
minimumOCamlVersion = "4.05";
src = fetchurl {
@ -11,7 +12,7 @@ buildDunePackage rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ sqlite ];
buildInputs = [ dune-configurator sqlite ];
meta = with lib; {
homepage = "http://mmottl.github.io/sqlite3-ocaml/";

51
pkgs/development/python-modules/aiodiscover/default.nix Normal file
View File

@ -0,0 +1,51 @@
{ lib
, async-dns
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, ifaddr
, pyroute2
, pythonOlder
}:
buildPythonPackage rec {
pname = "aiodiscover";
version = "1.3.2";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = "v${version}";
sha256 = "0qg2wm6ddsfai788chylr5ynrvakwg91q3dszz7dxzbkfdcxixj3";
};
patches = [
(fetchpatch {
name = "remove-entry_point.patch";
url = "https://github.com/bdraco/aiodiscover/commit/4c497fb7d4c8685a78209c710e92e0bd17f46bb2.patch";
sha256 = "0py9alhg6qdncbn6a04mrnjhs4j19kg759dv69knpqzryikcfa63";
})
];
propagatedBuildInputs = [
async-dns
pyroute2
ifaddr
];
postPatch = ''
substituteInPlace setup.py --replace '"pytest-runner>=5.2",' ""
'';
# Tests require access to /etc/resolv.conf
# pythonImportsCheck doesn't work as async-dns wants to create its CONFIG_DIR
doCheck = false;
meta = with lib; {
description = "Python module to discover hosts via ARP and PTR lookup";
homepage = "https://github.com/bdraco/aiodiscover";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

52
pkgs/development/python-modules/async-dns/default.nix Normal file
View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, poetry-core
, python
, pythonOlder
}:
buildPythonPackage rec {
pname = "async-dns";
version = "1.1.9";
disabled = pythonOlder "3.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "gera2ld";
repo = "async_dns";
rev = "v${version}";
sha256 = "1z8j0s3dwcyavarhx41q75k1cmfzmwiqdh4svv3v15np26cywyag";
};
nativeBuildInputs = [
poetry-core
];
patches = [
# Switch to poetry-core, https://github.com/gera2ld/async_dns/pull/22
# Can be remove for async-dns>1.1.9
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/gera2ld/async_dns/commit/25fee497aae3bde0ddf9f8804d249a27edbe607e.patch";
sha256 = "0w4zlppnp1a2q1wasc95ymqx3djswl32y5nw6fvz3nn8jg4gc743";
})
];
checkPhase = ''
export HOME=$TMPDIR
# Test needs network access
rm tests/test_resolver.py
${python.interpreter} -m unittest
'';
pythonImportsCheck = [ "async_dns" ];
meta = with lib; {
description = "Python DNS library";
homepage = "https://github.com/gera2ld/async_dns";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/aws-adfs/default.nix
View File

@ -44,7 +44,9 @@ buildPythonPackage rec {
# Relax version constraint
postPatch = ''
sed -i 's/coverage < 4/coverage/' setup.py
substituteInPlace setup.py \
--replace 'coverage < 4' 'coverage' \
--replace 'fido2>=0.8.1,<0.9.0' 'fido2>=0.8.1,<1.0.0'
'';
# Test suite writes files to $HOME/.aws/, or /homeless-shelter if unset

35
pkgs/development/python-modules/awslambdaric/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pytestCheckHook, autoconf
, automake, cmake, gcc, libtool, perl, simplejson }:
buildPythonPackage rec {
pname = "awslambdaric";
version = "1.0.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "aws";
repo = "aws-lambda-python-runtime-interface-client";
rev = "v${version}";
sha256 = "13v1lsp3lxbqknvlb3gvljjf3wyrx5jg8sf9yfiaj1sm8pb8pmrf";
};
propagatedBuildInputs = [ simplejson ];
nativeBuildInputs = [ autoconf automake cmake libtool perl ];
buildInputs = [ gcc ];
dontUseCmakeConfigure = true;
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "awslambdaric" "runtime_client" ];
meta = with lib; {
description = "AWS Lambda Runtime Interface Client for Python";
homepage = "https://github.com/aws/aws-lambda-python-runtime-interface-client";
license = licenses.asl20;
maintainers = with maintainers; [ austinbutler ];
platforms = platforms.linux;
};
}

4
pkgs/development/python-modules/boto3/default.nix
View File

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.17.45"; # N.B: if you change this, change botocore and awscli to a matching version
version = "1.17.46"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-7dMELrpeIZFKfQmcuKJfAJwMQqlSnJrE9bhSrVs6ys8=";
sha256 = "sha256-Xe4Vv5YepYTWgfrkLFADTIOXF+dFTD2pDLV6bFLpdTI=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

4
pkgs/development/python-modules/botocore/default.nix
View File

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.20.45"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.20.46"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-s6WbIcb0BNLF3LGiFphISlrBu+Y5ypey4PDhnFLC6+E=";
sha256 = "sha256-ULvD6TQcfaqCGduYw48mASoVHKiPomAUjlvzrcvLlUE=";
};
propagatedBuildInputs = [

10
pkgs/development/python-modules/fido2/default.nix
View File

@ -20,6 +20,16 @@ buildPythonPackage rec {
checkInputs = [ mock pyfakefs ];
# Testing with `python setup.py test` doesn't work:
# https://github.com/Yubico/python-fido2/issues/108#issuecomment-763513576
checkPhase = ''
runHook preCheck
python -m unittest discover -v
runHook postCheck
'';
pythonImportsCheck = [ "fido2" ];
meta = with lib; {

3
pkgs/development/python-modules/gdown/default.nix
View File

@ -5,6 +5,7 @@
, requests
, tqdm
, setuptools
, six
}:
buildPythonApplication rec {
@ -16,7 +17,7 @@ buildPythonApplication rec {
sha256 = "4b3a1301e57bfd8dce939bf25ef8fbb4b23967fd0f878eede328bdcc41386bac";
};
propagatedBuildInputs = [ filelock requests tqdm setuptools ];
propagatedBuildInputs = [ filelock requests tqdm setuptools six ];
checkPhase = ''
$out/bin/gdown --help > /dev/null

43
pkgs/development/python-modules/homepluscontrol/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib
, aiohttp
, aioresponses
, buildPythonPackage
, fetchFromGitHub
, pyjwt
, pytestCheckHook
, pythonOlder
, yarl
}:
buildPythonPackage rec {
pname = "homepluscontrol";
version = "0.0.5";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "chemaaa";
repo = pname;
rev = version;
sha256 = "1nd3a7nhh1xb70cdh2h2bimwbffvpc3457smyzr9fqkjwfbcrr93";
};
propagatedBuildInputs = [
aiohttp
pyjwt
yarl
];
checkInputs = [
aioresponses
pytestCheckHook
];
pythonImportsCheck = [ "homepluscontrol" ];
meta = with lib; {
description = "Python API to interact with the Legrand Eliot Home and Control";
homepage = "https://github.com/chemaaa/homepluscontrol";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -19,11 +19,11 @@
buildPythonPackage rec {
pname = "internetarchive";
version = "1.9.9";
version = "2.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "a1614cbf35499d833e07699ddfd344764f86959fd5535aa9ce1203f57a77f970";
sha256 = "515e6646a2b917c15f2241670d21f14a014b9c67dc509aef4d4aca5a59cdda65";
};
propagatedBuildInputs = [
@ -52,7 +52,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "A Python and Command-Line Interface to Archive.org";
homepage = "https://github.com/jjjake/internetarchive";
license = licenses.agpl3;
changelog = "https://github.com/jjjake/internetarchive/raw/v${version}/HISTORY.rst";
license = licenses.agpl3Plus;
maintainers = [ maintainers.marsam ];
};
}

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

@ -0,0 +1,23 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "localimport";
version = "1.7.3";
src = fetchPypi {
inherit pname version;
hash = "sha256-p7ACOzJRwH9hICMcxtVt/r+twEoFsDxPKGuarFnFIbo=";
};
pythonImportsCheck = [ "localimport" ];
meta = with lib; {
homepage = "https://github.com/NiklasRosenstein/py-localimport";
description = "Isolated import of Python modules";
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
};
}

32
pkgs/development/python-modules/makefun/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, fetchPypi
, buildPythonPackage
, setuptools_scm
}:
buildPythonPackage rec {
pname = "makefun";
version = "1.11.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-2qNQpILtWLVyREPGUUMhkem5ewyDdDh50JExccaigIU=";
};
nativeBuildInputs = [ setuptools_scm ];
# Disabling tests for now due to various (transitive) dependencies on modules
# from @smarie which are, as of yet, not part of nixpkgs. Also introduces
# a tricky dependency: makefun tests depend on pytest-cases, installing
# pytest-cases depends on makefun.
doCheck = false;
pythonImportsCheck = [ "makefun" ];
meta = with lib; {
homepage = "https://github.com/smarie/python-makefun";
description = "Small library to dynamically create python functions";
license = licenses.bsd2;
maintainers = with maintainers; [ veehaitch ];
};
}

47
pkgs/development/python-modules/nodepy-runtime/default.nix Normal file
View File

@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, fetchPypi
, localimport
, pathlib2
, six
}:
buildPythonPackage rec {
pname = "nodepy-runtime";
version = "2.1.5";
src = fetchPypi {
inherit pname version;
hash = "sha256-6tSsD76EpCZxkdulv1BcUZtIXGWLG6PuII25J8STygE=";
};
propagatedBuildInputs = [
localimport
pathlib2
six
];
pythonImportsCheck = [
"nodepy"
];
meta = with lib; {
homepage = "https://github.com/nodepy/nodepy";
description = "Runtime for Python inspired by Node.JS";
longDescription = ''
Node.py is a Python runtime and package manager compatible with CPython
2.7 and 3.3 – 3.6. It provides a separate import mechanism for modules
inspired by Node.js, bringing dependency management and ease of deployment
for Python applications up to par with other languages without virtual
environments.
Node.py comes with a built-in package manager that builds on Pip for
standard Python dependencies but also adds the capability to install
packages that are specifically developed for Node.py. To install the
dependencies of the package manager you must specify the [pm] install
extra.
'';
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
};
}

17
pkgs/development/python-modules/pubnub/default.nix
View File

@ -13,16 +13,17 @@
buildPythonPackage rec {
pname = "pubnub";
version = "5.1.0";
version = "5.1.1";
src = fetchFromGitHub {
owner = pname;
repo = "python";
rev = "v${version}";
sha256 = "0f6r439bfz58ddikqj5cx56vv7gxrpja9rcdg0j1mlng8ry581f3";
sha256 = "sha256-ir8f8A6XuN1ZQIYQbArChLzTlYu4ZKpkoOXQtSLOvKg=";
};
propagatedBuildInputs = [
aiohttp
cbor2
pycryptodomex
requests
@ -30,19 +31,15 @@ buildPythonPackage rec {
];
checkInputs = [
aiohttp
pycryptodomex
pytest-asyncio
pytestCheckHook
pytest-vcr
];
# Some tests don't pass with recent releases of tornado/twisted
pytestFlagsArray = [
"--ignore tests/integrational"
"--ignore tests/manual/asyncio"
"--ignore tests/manual/tornado/test_reconnections.py"
# Some tests don't pass with recent releases of twisted
disabledTestPaths = [
"tests/integrational"
"tests/manual/asyncio"
];
pythonImportsCheck = [ "pubnub" ];

4
pkgs/development/python-modules/pysmappee/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pysmappee";
version = "0.2.18";
version = "0.2.23";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "smappee";
repo = pname;
rev = version;
sha256 = "sha256-DnRtKr8aGZ6rcN/wTpcFNaI+EJm07nObfWyBpLkQF38=";
sha256 = "sha256-vxCZzkngYnc+hD3gT1x7qAQTFjpmmgRU5F6cusNDNgk=";
};
propagatedBuildInputs = [

30
pkgs/development/python-modules/pytest-raises/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pytest-raises";
version = "0.11";
src = fetchFromGitHub {
owner = "Lemmons";
repo = pname;
rev = version;
sha256 = "0gbb4kml2qv7flp66i73mgb4qihdaybb6c96b5dw3mhydhymcsy2";
};
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "pytest_raises" ];
meta = with lib; {
description = "An implementation of pytest.raises as a pytest.mark fixture";
homepage = "https://github.com/Lemmons/pytest-raises";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

40
pkgs/development/python-modules/pywebview/default.nix
View File

@ -1,25 +1,53 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, importlib-resources, pytest, xvfb_run }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, importlib-resources
, pyqtwebengine
, pytest
, pythonOlder
, qt5
, xvfb_run
}:
buildPythonPackage rec {
pname = "pywebview";
version = "3.3.1";
version = "3.4";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "r0x0r";
repo = "pywebview";
rev = version;
sha256 = "015z7n0hdgkzn0p7aw1xsv6lwc260p8q67jx0zyd1zghnwyj8k79";
sha256 = "sha256-3JHwtw8oReolEl4k8cdt7GCVGNkfWWJN6EnZYHxzDO8=";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ importlib-resources ];
nativeBuildInputs = [
qt5.wrapQtAppsHook
];
checkInputs = [ pytest xvfb_run ];
propagatedBuildInputs = [
pyqtwebengine
] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ];
checkInputs = [
pytest
xvfb_run
];
checkPhase = ''
# Cannot create directory /homeless-shelter/.... Error: FILE_ERROR_ACCESS_DENIED
export HOME=$TMPDIR
# QStandardPaths: XDG_RUNTIME_DIR not set
export XDG_RUNTIME_DIR=$HOME/xdg-runtime-dir
pushd tests
substituteInPlace run.sh \
--replace "PYTHONPATH=.." "PYTHONPATH=$PYTHONPATH" \
--replace "pywebviewtest test_js_api.py::test_concurrent ''${PYTEST_OPTIONS}" "# skip flaky test_js_api.py::test_concurrent"
patchShebangs run.sh
wrapQtApp run.sh
xvfb-run -s '-screen 0 800x600x24' ./run.sh
popd
'';

5
pkgs/development/python-modules/requests-aws4auth/default.nix
View File

@ -1,4 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, python, requests }:
{ lib, buildPythonPackage, fetchPypi, python, requests, six }:
with lib;
buildPythonPackage rec {
pname = "requests-aws4auth";
@ -9,7 +10,7 @@ buildPythonPackage rec {
sha256 = "9a4a5f4a61c49f098f5f669410308ac5b0ea2682fd511ee3a4f9ff73b5bb275a";
};
propagatedBuildInputs = [ requests ];
propagatedBuildInputs = [ requests six ];
# pypi package no longer contains tests
doCheck = false;

34
pkgs/development/python-modules/ronin/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, blessings
, colorama
, glob2
}:
buildPythonPackage rec {
pname = "ronin";
version = "1.1.1";
src = fetchPypi {
inherit version pname;
hash = "sha256-5gZ8S0NR4JzKBIdi/xYtVmFg9ObbCSkT7sz+OKWnK/U=";
};
propagatedBuildInputs = [
blessings
colorama
glob2
];
pythonImportsCheck = [
"ronin"
];
meta = with lib; {
homepage = "https://github.com/tliron/ronin/";
description = "A straightforward but powerful build system based on Ninja and Python";
license = licenses.asl20;
maintainers = with maintainers; [ AndersonTorres ];
};
}

28
pkgs/development/python-modules/screenlogicpy/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "screenlogicpy";
version = "0.3.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0gn2mf2n2g1ffdbijrydgb7dgd60lkvckblx6s86kxlkrp1wqgrq";
};
# Project doesn't publish tests
# https://github.com/dieselrabbit/screenlogicpy/issues/8
doCheck = false;
pythonImportsCheck = [ "screenlogicpy" ];
meta = with lib; {
description = "Python interface for Pentair Screenlogic devices";
homepage = "https://github.com/dieselrabbit/screenlogicpy";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
};
}

3
pkgs/development/python-modules/solo-python/default.nix
View File

@ -60,5 +60,8 @@
homepage = "https://github.com/solokeys/solo-python";
maintainers = with maintainers; [ wucke13 ];
license = with licenses; [ asl20 mit ];
# solo-python v0.0.27 does not support fido2 >= v0.9
# https://github.com/solokeys/solo-python/issues/110
broken = true;
};
}

47
pkgs/development/python-modules/wakeonlan/default.nix
View File

@ -1,26 +1,45 @@
{ lib, fetchPypi, buildPythonPackage, setuptools_scm, pytest, mock }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, poetry-core
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "wakeonlan";
version = "1.1.6";
version = "2.0.0";
disabled = pythonOlder "3.6";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "5e6013a17004809e676c150689abd94bcc0f12a37ad3fbce1f6270968f95ffa9";
src = fetchFromGitHub {
owner = "remcohaszing";
repo = "pywakeonlan";
rev = version;
sha256 = "0p9jyiv0adcymbnmbay72g9phlbhsr4kmrwxscbdjq81gcmxsi0y";
};
postPatch = ''
substituteInPlace setup.py \
--replace "setuptools-scm ~= 1.15.7" "setuptools-scm"
'';
nativeBuildInputs = [
poetry-core
];
checkInputs = [ pytest mock ];
checkInputs = [
pytestCheckHook
];
nativeBuildInputs = [ setuptools_scm ];
patches = [
# Switch to poetry-core, https://github.com/remcohaszing/pywakeonlan/pull/19
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/remcohaszing/pywakeonlan/commit/6aa5050ed94ef718dfcd0b946546b6a738f47ee3.patch";
sha256 = "1xzj2464ziwm7bp05bzbjwjp9whmgp1py3isr41d92qvnil86vm6";
})
];
checkPhase = ''
py.test
'';
pytestFlagsArray = [ "test_wakeonlan.py" ];
pythonImportsCheck = [ "wakeonlan" ];
meta = with lib; {
description = "A small python module for wake on lan";

4
pkgs/development/python-modules/xknx/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "xknx";
version = "0.17.5";
version = "0.18.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "XKNX";
repo = pname;
rev = version;
sha256 = "sha256-oLm1Bh58mKwbQf9FloqEnypzANikxgdFpAB99h/Mb9U=";
sha256 = "sha256-8g8DrFvhecdPsfiw+uKnfJOrLQeuFUziK2Jl3xKmrf4=";
};
propagatedBuildInputs = [

58
pkgs/development/python-modules/yalexs/default.nix Normal file
View File

@ -0,0 +1,58 @@
{ lib
, aiofiles
, aiohttp
, aioresponses
, aiounittest
, asynctest
, buildPythonPackage
, fetchFromGitHub
, pubnub
, pytestCheckHook
, python-dateutil
, pythonOlder
, requests
, requests-mock
}:
buildPythonPackage rec {
pname = "yalexs";
version = "1.1.10";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = "v${version}";
sha256 = "1qmxiafqmh51i3l30pajaqj5h0kziq4d37fn6hl58429bb85dpp9";
};
propagatedBuildInputs = [
aiofiles
aiohttp
pubnub
python-dateutil
requests
];
checkInputs = [
aioresponses
aiounittest
asynctest
pytestCheckHook
requests-mock
];
postPatch = ''
# Not used requirement
substituteInPlace setup.py --replace '"vol",' ""
'';
pythonImportsCheck = [ "yalexs" ];
meta = with lib; {
description = "Python API for Yale Access (formerly August) Smart Lock and Doorbell";
homepage = "https://github.com/bdraco/yalexs";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

6
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -25,7 +25,7 @@
, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
, bundler, libsass, libselinux ? null, libsepol ? null
, bundler, libsass, libselinux ? null, libsepol ? null, shared-mime-info
}@args:
let
@ -164,6 +164,10 @@ in
'';
};
mimemagic = attrs: {
FREEDESKTOP_MIME_TYPES_PATH = "${shared-mime-info}/share/mime/packages/freedesktop.org.xml";
};
mini_magick = attrs: {
postInstall = ''
installPath=$(cat $out/nix-support/gem-meta/install-path)

63
pkgs/development/tools/analysis/radare2/cutter.nix
View File

@ -1,63 +0,0 @@
{ fetchFromGitHub, lib, mkDerivation
# nativeBuildInputs
, qmake, pkg-config
# Qt
, qtbase, qtsvg, qtwebengine
# buildInputs
, r2-for-cutter
, python3
, wrapQtAppsHook }:
mkDerivation rec {
pname = "radare2-cutter";
version = "1.12.0";
src = fetchFromGitHub {
owner = "radareorg";
repo = "cutter";
rev = "v${version}";
sha256 = "0ljj3j3apbbw628n2nyrxpbnclixx20bqjxm0xwggqzz9vywsar0";
};
postUnpack = "export sourceRoot=$sourceRoot/src";
# Remove this "very helpful" helper file intended for discovering r2,
# as it's a doozy of harddcoded paths and unexpected behavior.
# Happily Nix has everything all set so we don't need it,
# other than as basis for the qmakeFlags set below.
postPatch = ''
substituteInPlace Cutter.pro \
--replace "include(lib_radare2.pri)" ""
'';
nativeBuildInputs = [ qmake pkg-config python3 wrapQtAppsHook ];
propagatedBuildInputs = [ python3.pkgs.pyside2 ];
buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ];
qmakeFlags = with python3.pkgs; [
"CONFIG+=link_pkg-config"
"PKGCONFIG+=r_core"
# Leaving this enabled doesn't break build but generates errors
# at runtime (to console) about being unable to load needed bits.
# Disable until can be looked at.
"CUTTER_ENABLE_JUPYTER=false"
# Enable support for Python plugins
"CUTTER_ENABLE_PYTHON=true"
"CUTTER_ENABLE_PYTHON_BINDINGS=true"
"SHIBOKEN_EXTRA_OPTIONS+=-I${r2-for-cutter}/include/libr"
];
preBuild = ''
export NIX_LDFLAGS="$NIX_LDFLAGS $(pkg-config --libs python3-embed)"
qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
'';
enableParallelBuilding = true;
meta = with lib; {
description = "A Qt and C++ GUI for radare2 reverse engineering framework";
homepage = src.meta.homepage;
license = licenses.gpl3;
maintainers = with maintainers; [ mic92 dtzWill ];
};
}

198
pkgs/development/tools/analysis/radare2/default.nix
View File

@ -1,9 +1,21 @@
{lib, stdenv, fetchFromGitHub
{ lib
, stdenv
, fetchFromGitHub
, buildPackages
, pkg-config
, libusb-compat-0_1, readline, libewf, perl, zlib, openssl
, libuv, file, libzip, xxHash
, gtk2 ? null, vte ? null, gtkdialog ? null
, libusb-compat-0_1
, readline
, libewf
, perl
, zlib
, openssl
, libuv
, file
, libzip
, xxHash
, gtk2 ? null
, vte ? null
, gtkdialog ? null
, python3 ? null
, ruby ? null
, lua ? null
@ -21,108 +33,84 @@ assert pythonBindings -> python3 != null;
let
inherit (lib) optional;
generic = {
version_commit, # unused
gittap,
gittip,
rev,
version,
sha256,
cs_ver,
cs_sha256
}:
stdenv.mkDerivation {
pname = "radare2";
inherit version;
src = fetchFromGitHub {
owner = "radare";
repo = "radare2";
inherit rev sha256;
};
postPatch = let
capstone = fetchFromGitHub {
owner = "aquynh";
repo = "capstone";
# version from $sourceRoot/shlr/Makefile
rev = cs_ver;
sha256 = cs_sha256;
};
in ''
mkdir -p build/shlr
cp -r ${capstone} capstone-${cs_ver}
chmod -R +w capstone-${cs_ver}
# radare 3.3 compat for radare2-cutter
(cd shlr && ln -s ../capstone-${cs_ver} capstone)
tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver}
'';
postInstall = ''
install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm
'';
WITHOUT_PULL="1";
makeFlags = [
"GITTAP=${gittap}"
"GITTIP=${gittip}"
"RANLIB=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ranlib"
];
configureFlags = [
"--with-sysmagic"
"--with-syszip"
"--with-sysxxhash"
"--with-openssl"
];
enableParallelBuilding = true;
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ]
++ optional useX11 [ gtkdialog vte gtk2 ]
++ optional rubyBindings [ ruby ]
++ optional pythonBindings [ python3 ]
++ optional luaBindings [ lua ];
propagatedBuildInputs = [
# radare2 exposes r_lib which depends on these libraries
file # for its list of magic numbers (`libmagic`)
libzip
xxHash
];
meta = {
description = "unix-like reverse engineering framework and commandline tools";
homepage = "http://radare.org/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ raskin makefu mic92 ];
platforms = with lib.platforms; linux;
inherit version;
};
};
in {
#<generated>
# DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic {
version_commit = "25741";
gittap = "5.1.1";
gittip = "a86f8077fc148abd6443384362a3717cd4310e64";
rev = "5.1.1";
version = "5.1.1";
sha256 = "0hv9x31iabasj12g8f04incr1rbcdkxi3xnqn3ggp8gl4h6pf2f3";
cs_ver = "4.0.2";
cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w";
};
r2-for-cutter = generic {
version_commit = "24959";
gittap = "4.5.1";
gittip = "293cf5ae65ba4e28828095dcae212955593ba255";
rev = "4.5.1";
version = "4.5.1";
sha256 = "0qigy1px0jy74c5ig73dc2fqjcy6vcy76i25dx9r3as6zfpkkaxj";
cs_ver = "4.0.2";
cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w";
};
gittap = "5.1.1";
gittip = "a86f8077fc148abd6443384362a3717cd4310e64";
rev = "5.1.1";
version = "5.1.1";
sha256 = "0hv9x31iabasj12g8f04incr1rbcdkxi3xnqn3ggp8gl4h6pf2f3";
cs_ver = "4.0.2";
cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w";
#</generated>
in
stdenv.mkDerivation {
pname = "radare2";
inherit version;
src = fetchFromGitHub {
owner = "radare";
repo = "radare2";
inherit rev sha256;
};
postPatch =
let
capstone = fetchFromGitHub {
owner = "aquynh";
repo = "capstone";
# version from $sourceRoot/shlr/Makefile
rev = cs_ver;
sha256 = cs_sha256;
};
in
''
mkdir -p build/shlr
cp -r ${capstone} capstone-${cs_ver}
chmod -R +w capstone-${cs_ver}
tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver}
'';
postInstall = ''
install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm
'';
WITHOUT_PULL = "1";
makeFlags = [
"GITTAP=${gittap}"
"GITTIP=${gittip}"
"RANLIB=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ranlib"
];
configureFlags = [
"--with-sysmagic"
"--with-syszip"
"--with-sysxxhash"
"--with-openssl"
];
enableParallelBuilding = true;
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ]
++ optional useX11 [ gtkdialog vte gtk2 ]
++ optional rubyBindings [ ruby ]
++ optional pythonBindings [ python3 ]
++ optional luaBindings [ lua ];
propagatedBuildInputs = [
# radare2 exposes r_lib which depends on these libraries
file # for its list of magic numbers (`libmagic`)
libzip
xxHash
];
meta = {
description = "unix-like reverse engineering framework and commandline tools";
homepage = "http://radare.org/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ raskin makefu mic92 ];
platforms = with lib.platforms; linux;
inherit version;
};
}

53
pkgs/development/tools/analysis/radare2/update.py
View File

@ -48,24 +48,6 @@ def get_radare2_rev() -> str:
raise RuntimeError(f"No release found at {feed_url}")
def get_cutter_version() -> str:
version_expr = """
(with import <nixpkgs> {}; lib.getVersion (qt5.callPackage <radare2/cutter.nix> {}))
"""
return sh("nix", "eval", "--raw", version_expr.strip(), "-I", "radare2={0}".format(SCRIPT_DIR))
def get_r2_cutter_rev() -> str:
version = get_cutter_version()
url = f"https://api.github.com/repos/radareorg/cutter/contents?ref=v{version}"
with urllib.request.urlopen(url) as response:
data = json.load(response) # type: ignore
for entry in data:
if entry["name"] == "radare2":
return entry["sha"]
raise Exception("no radare2 submodule found in github.com/radareorg/cutter")
def git(dirname: str, *args: str) -> str:
return sh("git", "-C", dirname, *args)
@ -94,43 +76,23 @@ def get_repo_info(dirname: str, rev: str) -> Dict[str, str]:
)
def write_package_expr(version: str, info: Dict[str, str]) -> str:
return f"""generic {{
version_commit = "{info["version_commit"]}";
gittap = "{info["gittap"]}";
gittip = "{info["gittip"]}";
rev = "{info["rev"]}";
version = "{version}";
sha256 = "{info["sha256"]}";
cs_ver = "{info["cs_ver"]}";
cs_sha256 = "{info["cs_sha256"]}";
}}"""
def main() -> None:
radare2_rev = get_radare2_rev()
r2_cutter_rev = get_r2_cutter_rev()
version = get_radare2_rev()
with tempfile.TemporaryDirectory() as dirname:
git(
dirname,
"clone",
"--branch",
radare2_rev,
version,
"https://github.com/radare/radare2",
".",
)
nix_file = str(SCRIPT_DIR.joinpath("default.nix"))
radare2_info = get_repo_info(dirname, radare2_rev)
git(dirname, "fetch", r2_cutter_rev)
git(dirname, "checkout", r2_cutter_rev)
info = get_repo_info(dirname, version)
timestamp = git(dirname, "log", "-n1", "--format=%at")
r2_cutter_version = datetime.fromtimestamp(int(timestamp)).strftime("%Y-%m-%d")
r2_cutter_info = get_repo_info(dirname, r2_cutter_rev)
in_block = False
with fileinput.FileInput(nix_file, inplace=True) as f:
@ -140,8 +102,13 @@ def main() -> None:
print(
f""" #<generated>
# DO NOT EDIT! Automatically generated by ./update.py
radare2 = {write_package_expr(radare2_rev, radare2_info)};
r2-for-cutter = {write_package_expr(r2_cutter_version, r2_cutter_info)};
gittap = "{info["gittap"]}";
gittip = "{info["gittip"]}";
rev = "{info["rev"]}";
version = "{version}";
sha256 = "{info["sha256"]}";
cs_ver = "{info["cs_ver"]}";
cs_sha256 = "{info["cs_sha256"]}";
#</generated>"""
)
elif "#</generated>" in l:

46
pkgs/development/tools/analysis/rizin/cutter.nix Normal file
View File

@ -0,0 +1,46 @@
{ fetchFromGitHub, lib, mkDerivation
# nativeBuildInputs
, qmake, pkg-config, cmake
# Qt
, qtbase, qtsvg, qtwebengine, qttools
# buildInputs
, rizin
, python3
, wrapQtAppsHook
}:
mkDerivation rec {
pname = "cutter";
version = "2.0.0";
src = fetchFromGitHub {
owner = "rizinorg";
repo = "cutter";
rev = "v${version}";
sha256 = "sha256-uIN/NR+swu9Ie0wP2aBhw5WBvTe9NDmzSs+lQMCeavc=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake qmake pkg-config python3 wrapQtAppsHook ];
propagatedBuildInputs = [ python3.pkgs.pyside2 ];
buildInputs = [ qtbase qttools qtsvg qtwebengine rizin python3 ];
cmakeFlags = [
"-DCUTTER_USE_BUNDLED_RIZIN=OFF"
"-DCUTTER_ENABLE_PYTHON=ON"
"-DCUTTER_ENABLE_PYTHON_BINDINGS=ON"
];
preBuild = ''
qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Free and Open Source Reverse Engineering Platform powered by rizin";
homepage = src.meta.homepage;
license = licenses.gpl3;
maintainers = with maintainers; [ mic92 dtzWill ];
};
}

71
pkgs/development/tools/analysis/rizin/default.nix Normal file
View File

@ -0,0 +1,71 @@
{ lib
, stdenv
, fetchurl
, pkg-config
, libusb-compat-0_1
, readline
, libewf
, perl
, zlib
, openssl
, libuv
, file
, libzip
, lz4
, xxHash
, meson
, cmake
, ninja
, capstone
, tree-sitter
}:
stdenv.mkDerivation rec {
pname = "rizin";
version = "0.1.2";
src = fetchurl {
url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-${version}.tar.xz";
sha256 = "sha256-npUp8wJiKAaQKSigXtndhJLTJ4+pyFqa0FwDLBqR/sE=";
};
mesonFlags = [
"-Duse_sys_capstone=true"
"-Duse_sys_magic=true"
"-Duse_sys_libzip=true"
"-Duse_sys_zlib=true"
"-Duse_sys_xxhash=true"
"-Duse_sys_lz4=true"
"-Duse_sys_openssl=true"
"-Duse_sys_tree_sitter=true"
];
enableParallelBuilding = true;
nativeBuildInputs = [ pkg-config meson ninja cmake ];
buildInputs = [
file
libzip
capstone
readline
libusb-compat-0_1
libewf
perl
zlib
lz4
openssl
libuv
tree-sitter
xxHash
];
meta = {
description = "UNIX-like reverse engineering framework and command-line toolset.";
homepage = "https://rizin.re/";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ raskin makefu mic92 ];
platforms = with lib.platforms; linux;
inherit version;
};
}

54
pkgs/development/tools/build-managers/gradle/default.nix
View File

@ -1,6 +1,15 @@
{ lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }:
rec {
let
gradleSpec = { version, nativeVersion, sha256 }: rec {
inherit nativeVersion;
name = "gradle-${version}";
src = fetchurl {
inherit sha256;
url = "https://services.gradle.org/distributions/${name}-bin.zip";
};
};
in rec {
gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation {
inherit name src nativeVersion;
@ -52,35 +61,30 @@ rec {
};
};
# NOTE: Gradle 7 is a release candidate, so point to 6.8.
gradle_latest = gradle_6_8;
gradle_6_8 = gradleGen rec {
name = "gradle-6.8.3";
gradle_7 = gradleGen (gradleSpec {
version = "7.0-rc-2";
nativeVersion = "0.22-milestone-11";
sha256 = "0gzvigyvwwizx90vnzhdnbm5rdaki11inxna11s4y67xkn8hrnx5";
});
gradle_6_8 = gradleGen (gradleSpec {
version = "6.8.3";
nativeVersion = "0.22-milestone-9";
sha256 = "01fjrk5nfdp6mldyblfmnkq2gv1rz1818kzgr0k2i1wzfsc73akz";
});
src = fetchurl {
url = "https://services.gradle.org/distributions/${name}-bin.zip";
sha256 = "01fjrk5nfdp6mldyblfmnkq2gv1rz1818kzgr0k2i1wzfsc73akz";
};
};
gradle_5_6 = gradleGen rec {
name = "gradle-5.6.4";
gradle_5_6 = gradleGen (gradleSpec {
version = "5.6.4";
nativeVersion = "0.18";
sha256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d";
});
src = fetchurl {
url = "https://services.gradle.org/distributions/${name}-bin.zip";
sha256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d";
};
};
gradle_4_10 = gradleGen rec {
name = "gradle-4.10.3";
gradle_4_10 = gradleGen (gradleSpec {
version = "4.10.3";
nativeVersion = "0.14";
src = fetchurl {
url = "https://services.gradle.org/distributions/${name}-bin.zip";
sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
};
};
sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
});
}

43
pkgs/development/tools/build-managers/rebar3/default.nix
View File

@ -3,7 +3,7 @@
tree }:
let
version = "3.14.2";
version = "3.14.4";
# Dependencies should match the ones in:
# https://github.com/erlang/rebar3/blob/${version}/rebar.lock
@ -12,27 +12,27 @@ let
bbmustache = fetchHex {
pkg = "bbmustache";
version = "1.10.0";
sha256 = "43effa3fd4bb9523157af5a9e2276c493495b8459fc8737144aa186cb13ce2ee";
sha256 = "1vp27jqnq65a8iqp7j4z8nw9ad29dhky5agmg8aj75dvshzzmvs3";
};
certifi = fetchHex {
pkg = "certifi";
version = "2.5.2";
sha256 = "3b3b5f36493004ac3455966991eaf6e768ce9884693d9968055aeeeb1e575040";
version = "2.5.3";
sha256 = "040w1scglvqhcvc1ifdnlcyrbwr0smi00w4xi8h03c99775nllgd";
};
cf = fetchHex {
pkg = "cf";
version = "0.3.1";
sha256 = "315e8d447d3a4b02bcdbfa397ad03bbb988a6e0aa6f44d3add0f4e3c3bf97672";
sha256 = "0wknz4xkqkhgvlx4vx5619p8m65v7g87lfgsvfy04jrsgm28spii";
};
cth_readable = fetchHex {
pkg = "cth_readable";
version = "1.4.9";
sha256 = "b4c6ababdb046c5f2fbb3c22f030b4c5a679083956dcdd29c1df0cb30b18da24";
version = "1.5.0";
sha256 = "0z58b6frqdnhyzrmbdf6x78l3izbbh5z5i3am8hqc253r7xwv0dx";
};
erlware_commons = fetchHex {
pkg = "erlware_commons";
version = "1.3.1";
sha256 = "7aada93f368d0a0430122e39931b7fb4ac9e94dbf043cdc980ad4330fd9cd166";
version = "1.4.0";
sha256 = "1rp2vkgzqm6sax7fc13rh9x6qzxsgg718dnv7l0kmarvyifcyphq";
};
eunit_formatters = fetchHex {
pkg = "eunit_formatters";
@ -46,29 +46,26 @@ let
};
parse_trans = fetchHex {
pkg = "parse_trans";
version = "3.3.0";
sha256 = "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960";
version = "3.3.1";
sha256 = "12w8ai6b5s6b4hnvkav7hwxd846zdd74r32f84nkcmjzi1vrbk87";
};
providers = fetchHex {
pkg = "providers";
version = "1.8.1";
sha256 = "e45745ade9c476a9a469ea0840e418ab19360dc44f01a233304e118a44486ba0";
sha256 = "183b9128l4af60rs40agqh6kc6db33j4027ad6jajxn4x6nlamz4";
};
relx = fetchHex {
pkg = "relx";
version = "4.1.0";
sha256 = "b94a3f96697a479ee5217a853345e0f4977bdf40d3c040af0d3d80fadad82af4";
version = "4.3.0";
sha256 = "0h044arh41sr92r1nlg176shavlv7pvw17alwklhszgwlr4hk3kk";
};
ssl_verify_fun = fetchHex {
pkg = "ssl_verify_fun";
version = "1.1.6";
sha256 = "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680";
};
hex_core = fetchHex {
pkg = "hex_core";
version = "0.7.1";
sha256 = "05c60411511b6dc79affcd99a93e67d71e1b9d6abcb28ba75cd4ebc8585b8d02";
sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x";
};
in
stdenv.mkDerivation rec {
@ -81,7 +78,7 @@ stdenv.mkDerivation rec {
owner = "erlang";
repo = pname;
rev = version;
sha256 = "02gz6xs8j5rm14r6dndcpdm8q3rl4mcj363gnnx4y5xvvfnv9bfa";
sha256 = "09bnqwli93sq1pcz4h88ks7qg7k8yrjy9fd46yyp8xdl7i4irwy2";
};
bootstrapper = ./rebar3-nix-bootstrap;
@ -104,8 +101,6 @@ stdenv.mkDerivation rec {
cp --no-preserve=mode -R ${relx} _checkouts/relx
cp --no-preserve=mode -R ${ssl_verify_fun} _checkouts/ssl_verify_fun
cp --no-preserve=mode -R ${hex_core} _checkouts/hex_core
# Bootstrap script expects the dependencies in _build/default/lib
# TODO: Make it accept checkouts?
for i in _checkouts/* ; do

6
pkgs/development/tools/build-managers/sbt-extras/default.nix
View File

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
rev = "b430596eb8566a59793ea0b8ddd2c693505e801f";
version = "2021-03-29";
rev = "a76f1f15e6ec39d886f8bf07d5bdfaf70cdc62d8";
version = "2021-04-06";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
sha256 = "0r0ysv7dzrlmj3c82fv60i2490ky7q70jlv40q7zdmm5q2wp7y63";
sha256 = "0zmhn8nvzrbw047g5z4q2slp0wdg6pvfh2pqnpwcq1hscf7dvz8f";
};
dontBuild = true;

4
pkgs/development/tools/continuous-integration/jenkins/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.277.1";
version = "2.277.2";
src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "0lficvngxzl7q088n3ssnnhjicd0xxr0k3n0inz7pvjj27dl35rr";
sha256 = "08lv5v5kxp9ln798gjmh8j9a8r8xc471fbhiz2l7gxncpxn50ga2";
};
buildCommand = ''

2
pkgs/development/tools/continuous-integration/laminar/default.nix
View File

@ -28,7 +28,7 @@ let
sha256 = "1jh4h12qchsba03dx03mrvs4r8g9qfjn56xm56jqzgqf7r209xq9";
};
in stdenv.mkDerivation rec {
name = "laminar";
pname = "laminar";
version = "1.0";
src = fetchurl {
url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz";

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

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "cue";
version = "0.2.2";
version = "0.3.0";
src = fetchgit {
url = "https://cue.googlesource.com/cue";
rev = "v${version}";
sha256 = "1crl5fldczc3jkwf7gvwvghckr6gfinfslzca4ps1098lbq83zcq";
sha256 = "1h3809xgmn7dr57i3cnifr7r555i3zh3kfsv0gxa9nd7068w19xm";
};
vendorSha256 = "0l6slaji9nh16jqp1nvib95h2db1xyjh6knk5hj2zaa1rks4b092";
vendorSha256 = "10kvss23a8a6q26a7h1bqc3i0nskm2halsvc9wdv9zf9qsz7zjkp";
doCheck = false;

24
pkgs/development/tools/rust/cargo-feature/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "cargo-feature";
version = "0.5.2";
src = fetchFromGitHub {
owner = "Riey";
repo = pname;
rev = "v${version}";
sha256 = "0n5kzh756ghfs3cydlcn9mfvpgwy1cjg41h0nd9dbi5cr1fp9x1n";
};
cargoSha256 = "0nvl5smibl81b826xcsrjx8p89lcfpj7wqdsvywnj7jd3p5ag03n";
meta = with lib; {
description = "Allows conveniently modify features of crate";
homepage = "https://github.com/Riey/cargo-feature";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ riey ];
};
}

29
pkgs/games/antsimulator/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib, stdenv, fetchFromGitHub, cmake, sfml }:
stdenv.mkDerivation rec {
pname = "antsimulator";
version = "1.2";
src = fetchFromGitHub {
owner = "johnBuffer";
repo = "AntSimulator";
rev = "v${version}";
sha256 = "0wz80971rf86kb7mcnxwrq75vriwhmyir5s5n3wzml12rzfnj5f1";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ sfml ];
installPhase = ''
mkdir -p $out/bin
install -Dm755 ./AntSimulator $out/bin/antsimulator
'';
meta = with lib; {
homepage = "https://github.com/johnBuffer/AntSimulator";
description = "Simple Ants simulator";
license = licenses.free;
maintainers = with maintainers; [ ivar ];
platforms = platforms.unix;
};
}

4
pkgs/games/devilutionx/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }:
stdenv.mkDerivation rec {
pname = "devilutionx";
version = "unstable-2020-10-20";
version = "1.2.0";
src = fetchFromGitHub {
owner = "diasurgical";
repo = "devilutionX";
rev = "432fbc8ef7b98e567b08e44ce91b198374a5ff01";
rev = version;
sha256 = "03w3bgmzwsbycx3fzvn47fsmabl069gw77yn2fqg89wlgaw1yrr9";
};

4
pkgs/games/wesnoth/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "wesnoth";
version = "1.14.15";
version = "1.14.16";
src = fetchFromGitHub {
rev = version;
owner = "wesnoth";
repo = "wesnoth";
sha256 = "sha256-HbQy5yhNe6HFydipqh2wWcyLfIjbdRjcBQaqAOtBJsY=";
sha256 = "sha256-QMz7atxol18r//UNb6+H6xAAEQdR4hAN8UW0KeGSH1g=";
};
nativeBuildInputs = [ cmake pkg-config ];

4
pkgs/os-specific/linux/kernel/linux-xanmod.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
version = "5.11.10";
version = "5.11.12";
suffix = "xanmod1-cacule";
in
buildLinux (args // rec {
@ -12,7 +12,7 @@ in
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
sha256 = "sha256-Pn1rX61mA8FEt5G1GppK/YyzXnB+hdm5pWh/4swQ4VE=";
sha256 = "sha256-omRZ9oAmW3mauUolPf/lgMFMwUCYU4YaZ+OS75Ag+lM=";
extraPostFetch = ''
rm $out/.config
'';

4
pkgs/os-specific/linux/libcap/default.nix
View File

@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-TelZDuCah8KC1Vhzf/tbYXXMv9JtWArdEN9E0PBH9sI=";
};
patches = lib.optional isStatic ./no-shared-lib.patch;
outputs = [ "out" "dev" "lib" "man" "doc" ]
++ lib.optional usePam "pam";
@ -31,7 +29,7 @@ stdenv.mkDerivation rec {
"PAM_CAP=${if usePam then "yes" else "no"}"
"BUILD_CC=$(CC_FOR_BUILD)"
"CC:=$(CC)"
];
] ++ lib.optional isStatic "SHARED=no";
prePatch = ''
# use full path to bash

22
pkgs/os-specific/linux/libcap/no-shared-lib.patch
View File

@ -1,22 +0,0 @@
diff --git a/libcap/Makefile b/libcap/Makefile
index de6a28d..7e4d8ac 100644
--- a/libcap/Makefile
+++ b/libcap/Makefile
@@ -22,7 +22,7 @@ MAJLIBNAME=$(LIBNAME).$(VERSION)
MINLIBNAME=$(MAJLIBNAME).$(MINOR)
GPERF_OUTPUT = _caps_output.gperf
-all: $(MINLIBNAME) $(STACAPLIBNAME) pcs $(STAPSXLIBNAME)
+all: $(STACAPLIBNAME) pcs $(STAPSXLIBNAME)
pcs: libcap.pc libpsx.pc
@@ -93,7 +93,7 @@ cap_test: cap_test.c libcap.h
test: cap_test
./cap_test
-install: install-static install-shared
+install: install-static
install-static: install-static-cap install-static-psx

35
pkgs/os-specific/linux/vendor-reset/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv, fetchFromGitHub, kernel, lib }:
stdenv.mkDerivation rec {
name = "vendor-reset-${version}-${kernel.version}";
version = "unstable-2021-02-16";
src = fetchFromGitHub {
owner = "gnif";
repo = "vendor-reset";
rev = "225a49a40941e350899e456366265cf82b87ad25";
sha256 = "sha256-xa7P7+mRk4FVgi+YYCcsFLfyNqPmXvy3xhGoTDVqPxw=";
};
nativeBuildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ];
makeFlags = [
"KVER=${kernel.modDirVersion}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
installPhase = ''
install -D vendor-reset.ko -t "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/misc/"
'';
meta = with lib; {
description = "Linux kernel vendor specific hardware reset module";
homepage = "https://github.com/gnif/vendor-reset";
license = licenses.gpl2Only;
maintainers = with maintainers; [ wedens ];
platforms = [ "x86_64-linux" ];
broken = kernel.kernelOlder "4.19";
};
}

2
pkgs/servers/home-assistant/appdaemon.nix
View File

@ -82,6 +82,6 @@ in python.pkgs.buildPythonApplication rec {
description = "Sandboxed Python execution environment for writing automation apps for Home Assistant";
homepage = "https://github.com/AppDaemon/appdaemon";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
maintainers = teams.home-assistant.members;
};
}

2
pkgs/servers/home-assistant/cli.nix
View File

@ -36,6 +36,6 @@ python3.pkgs.buildPythonApplication rec {
description = "Command-line tool for Home Assistant";
homepage = "https://github.com/home-assistant/home-assistant-cli";
license = licenses.asl20;
maintainers = with maintainers; [ ];
maintainers = teams.home-assistant.members;
};
}

10
pkgs/servers/home-assistant/default.nix
View File

@ -392,6 +392,14 @@ in with py.pkgs; buildPythonApplication rec {
preCheck = ''
# the tests require the existance of a media dir
mkdir /build/media
# error out when component test directory is missing, otherwise hidden by xdist execution :(
for component in ${lib.concatStringsSep " " (map lib.escapeShellArg componentTests)}; do
test -d "tests/components/$component" || {
>2& echo "ERROR: Tests for component '$component' were enabled, but they do not exist!"
exit 1
}
done
'';
passthru = {
@ -405,7 +413,7 @@ in with py.pkgs; buildPythonApplication rec {
homepage = "https://home-assistant.io/";
description = "Open source home automation that puts local control and privacy first";
license = licenses.asl20;
maintainers = with maintainers; [ globin mic92 hexa ];
maintainers = teams.home-assistant.members;
platforms = platforms.linux;
};
}

2
pkgs/servers/home-assistant/frontend.nix
View File

@ -21,6 +21,6 @@ buildPythonPackage rec {
description = "Polymer frontend for Home Assistant";
homepage = "https://github.com/home-assistant/home-assistant-polymer";
license = licenses.asl20;
maintainers = with maintainers; [ globin ];
maintainers = teams.home-assistant.members;
};
}

2
pkgs/servers/monitoring/zabbix/agent2.nix
View File

@ -12,7 +12,7 @@ import ./versions.nix ({ version, sha256 }:
modRoot = "src/go";
vendorSha256 = "1ral3xg58x0lf5vl839nlabf443yzqnbrlzm0q127mvv412f5ajc";
vendorSha256 = "07caz0jfy0r1vb1h9mhb169wyn949z9xj0pmvyamr2d8y3k3hbyd";
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libiconv openssl pcre zlib ];

13
pkgs/servers/monitoring/zabbix/versions.nix
View File

@ -1,16 +1,11 @@
generic: {
v50 = generic {
version = "5.0.9";
sha256 = "16vwh01hlxmh9qg3d7q1vsmz3bwydk7v7da58d3764ldmh8ag199";
version = "5.0.10";
sha256 = "15kbbj1vclsys1z3ghcz9j5faz67k3z8yl81bn7bhmqaflavgicb";
};
v40 = generic {
version = "4.0.29";
sha256 = "0qghx7r7rbyya79mfsvr5fqws2d8ffn86zfdkzdrnmyl0x25fr9y";
};
v30 = generic {
version = "3.0.32";
sha256 = "1n9l0llmifmg5zzh2jzqax8y23ch7250v36bcfkpizvr8wji7xi7";
version = "4.0.30";
sha256 = "17h831a1rw245kz37pw5haxq09k9m76bf0bz0jgg9s0q1j7hvywh";
};
}

6
pkgs/servers/plex/raw.nix
View File

@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.22.1.4275-48e10484b";
version = "1.22.2.4282-a97b03fad";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "08x5ay0nvsdc2n584bw0vdqxh33wn0mlwyqciwgvwq873jn39j3z";
sha256 = "01krx6vhk24wm2hikxkfv8m53y8b4yqnkii4j9zf48f1a9hlj2zp";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "1h5pkd7fzqlbvqv25cdppglw651yc3026hnyim5vy1s1s182paws";
sha256 = "04wzv15pnd4sn6cy62m8prvsxpxj4sg3q9ahwsrn2cj31vgayg0i";
};
outputs = [ "out" "basedb" ];

13
pkgs/servers/teleport/default.nix
View File

@ -1,31 +1,31 @@
# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
{ lib, buildGoPackage, zip, fetchFromGitHub }:
{ lib, buildGoPackage, zip, fetchFromGitHub, makeWrapper, xdg-utils }:
let
webassets = fetchFromGitHub {
owner = "gravitational";
repo = "webassets";
rev = "2d79788dbcd005bdcfe5b5120007d0faf8f1fc82";
sha256 = "001a3bx8yyx1hq8y5yiy1jzp122q8gcl369lj0609gaxp6dk5bdw";
rev = "8ace0cfcc6867651bed3fd5b5f35aaa2a80e1106";
sha256 = "sha256-mzvYysCFMvWHo8Y4cmhAju62jjpe92j564gc12BSdZA=";
};
in
buildGoPackage rec {
pname = "teleport";
version = "5.1.2";
version = "5.2.1";
# This repo has a private submodule "e" which fetchgit cannot handle without failing.
src = fetchFromGitHub {
owner = "gravitational";
repo = "teleport";
rev = "v${version}";
sha256 = "0h1hn2dpdsmhxac06gn6787z2mnfcwb3wn0c2l7l2qhw6iqpgmvh";
sha256 = "sha256-8WEVH+04y1/s9KpBlK/LrgHG7qTpu2LqtanKKdi9N08=";
};
goPackagePath = "github.com/gravitational/teleport";
subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ];
nativeBuildInputs = [ zip ];
nativeBuildInputs = [ zip makeWrapper ];
postBuild = ''
pushd .
@ -48,6 +48,7 @@ buildGoPackage rec {
postInstall = ''
install -Dm755 -t $client/bin $out/bin/tsh
wrapProgram $out/bin/tsh --prefix PATH : ${xdg-utils}/bin
'';
doInstallCheck = true;

6
pkgs/shells/fish/default.nix
View File

@ -131,7 +131,7 @@ let
fish = stdenv.mkDerivation rec {
pname = "fish";
version = "3.2.1";
version = "3.2.2";
src = fetchurl {
# There are differences between the release tarball and the tarball GitHub
@ -141,14 +141,14 @@ let
# --version`), as well as the local documentation for all builtins (and
# maybe other things).
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "2OSfQJDTd43xfdgl5KKoAZIBVoJCPNndArZnXWXDr1s=";
sha256 = "WUTaGoiT0RsIKKT9kTbuF0VJ2v+z0K392JF4Vv5rQAk=";
};
# Fix FHS paths in tests
postPatch = ''
# src/fish_tests.cpp
sed -i 's|/bin/ls|${coreutils}/bin/ls|' src/fish_tests.cpp
sed -i 's|L"/usr"|L"/nix"|' src/fish_tests.cpp
sed -i 's|is_potential_path(L"/usr"|is_potential_path(L"/nix"|' src/fish_tests.cpp
sed -i 's|L"/bin/echo"|L"${coreutils}/bin/echo"|' src/fish_tests.cpp
sed -i 's|L"/bin/c"|L"${coreutils}/bin/c"|' src/fish_tests.cpp
sed -i 's|L"/bin/ca"|L"${coreutils}/bin/ca"|' src/fish_tests.cpp

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