Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
f08d8f2263
@ -160,7 +160,10 @@ rec {
|
||||
type = types.lazyAttrsOf types.raw;
|
||||
# Only render documentation once at the root of the option tree,
|
||||
# not for all individual submodules.
|
||||
internal = prefix != [];
|
||||
# Allow merging option decls to make this internal regardless.
|
||||
${if prefix == []
|
||||
then null # unset => visible
|
||||
else "internal"} = true;
|
||||
# TODO: Change the type of this option to a submodule with a
|
||||
# freeformType, so that individual arguments can be documented
|
||||
# separately
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, ffmpeg
|
||||
, gnutls
|
||||
, lame
|
||||
, libev
|
||||
, libmicrohttpd
|
||||
@ -20,17 +21,17 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "musikcube";
|
||||
version = "0.96.10";
|
||||
version = "0.97.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clangen";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Aa52pRGq99Pt++aEVZdmVNhhQuBajgfZp39L1AfKvho=";
|
||||
sha256 = "sha256-W9Ng1kqai5qhaDs5KWg/1sOTIAalBXLng1MG8sl/ZOg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix pending upstream inclusion for ncuurses-6.3 support:
|
||||
# Fix pending upstream inclusion for ncurses-6.3 support:
|
||||
# https://github.com/clangen/musikcube/pull/474
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
|
||||
boost
|
||||
curl
|
||||
ffmpeg
|
||||
gnutls
|
||||
lame
|
||||
libev
|
||||
libmicrohttpd
|
||||
|
||||
@ -45,13 +45,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mame";
|
||||
version = "0.242";
|
||||
version = "0.243";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mamedev";
|
||||
repo = "mame";
|
||||
rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}";
|
||||
sha256 = "sha256-06iKM9cpjXuNvChQTPjhb9oQptC4KTZEoxzZk8+x3/k=";
|
||||
sha256 = "sha256-dUgYLNvgvolz9M0ySkGJIZjVMBQwejkxsZ6npg8rIqk=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery_dl";
|
||||
version = "1.21.1";
|
||||
version = "1.21.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-oLVrYM7F9JFDYgQL/XgJS9LeUexqcSlvmkwyAk1bpoY=";
|
||||
sha256 = "sha256-xn+Y8WOIH6zkExO3ZNya3ZBwh90oSjSk00xfO0c23To=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests yt-dlp ];
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
"packageVersion": "99.0.1-3",
|
||||
"packageVersion": "99.0.1-4",
|
||||
"source": {
|
||||
"rev": "99.0.1-3",
|
||||
"sha256": "0ag4n86hvyp6kx3hp60yn7q45rgjbx7054frj6226ni2ribjx4ln"
|
||||
"rev": "99.0.1-4",
|
||||
"sha256": "0s0r9smyfr8yhbgp67569ki3lkc2dyv1dw9735njja2gy0nahgni"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "99.0.1",
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "0.29.4";
|
||||
sha256 = "110wbz5dyzrzndr937in663cs9hwfs3glgm63f0md9gjj67mz0kk";
|
||||
manifestsSha256 = "14vrkadv2gsz360s0naqr002sw8n5kvgskc13yx936mcz2vs465y";
|
||||
version = "0.29.5";
|
||||
sha256 = "1nqi7yk5d66fcjf6kyjivm3cbaqkj36ajgfvjm995q7cla2xyawm";
|
||||
manifestsSha256 = "09rq7wiv3ixdp0p8isfp26vikyx523arzdyizi6yb90q6dl6hgc0";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
@ -23,7 +23,7 @@ in buildGoModule rec {
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/8gRyaXTCWe+F4X3z5iT8QhE3LdiNEYKHjtoYKJB/HU=";
|
||||
vendorSha256 = "sha256-dQV/8NF+sMiEoFr2wtR/oGqqn72JwH/JGbMREHIr/Tw=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
let
|
||||
# look for GO_LDFLAGS getting set in the Makefile
|
||||
version = "1.0.3";
|
||||
sha256 = "sha256-unGr+T2uYg7/4pAXf8vp9Hpi6IrCsLCqGbyBC7QXGX8=";
|
||||
vendorSha256 = "sha256-9NYr5Ok9oQ1ajYFiTeU9ztmX/55UROBjNawLGjm4HYU=";
|
||||
pkgsVersion = "v1.0.0-8-g76f8c5b";
|
||||
version = "1.0.4";
|
||||
sha256 = "sha256-kO48MRQDQGDUvFfsxAt+CAHn2EGU44NMpSKDWnNwAdk=";
|
||||
vendorSha256 = "sha256-QcD5MKQO51ZZ/NvVIiAmDsN6wLI2N8YkhA387KB77W8=";
|
||||
pkgsVersion = "v1.0.0-10-gbf81bd2";
|
||||
extrasVersion = "v1.0.0-2-gc5d3ab0";
|
||||
in
|
||||
buildGoModule rec {
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
"name": "element-desktop",
|
||||
"productName": "Element",
|
||||
"main": "lib/electron-main.js",
|
||||
"version": "1.10.10",
|
||||
"version": "1.10.11",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "Element",
|
||||
"repository": {
|
||||
@ -89,6 +89,7 @@
|
||||
},
|
||||
"build": {
|
||||
"appId": "im.riot.app",
|
||||
"asarUnpack": "**/*.node",
|
||||
"files": [
|
||||
"package.json",
|
||||
{
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"version": "1.10.10",
|
||||
"desktopSrcHash": "Atgcu+K28pScYokS/lTu+/mMeEC+1yTcn3Akq+KZJNY=",
|
||||
"version": "1.10.11",
|
||||
"desktopSrcHash": "n74KFmHI6ZQWBEJCR55VZHS//myh2RePcJRVOmZ6XHo=",
|
||||
"desktopYarnHash": "0jm0i1yyfkg1ll11pb3qif1vdxx6rp0yl9kd8jg9nhsg2jzw66pr",
|
||||
"webHash": "1xp0rhw3k2znwvqqikhd771l2n6xyx8npcz87m9d4cisl82lpnr0"
|
||||
"webHash": "02m64bhg1ls4a5igmizkkxnqfmbfhs0xy24ycr75vxmn0zmwa3yd"
|
||||
}
|
||||
|
||||
@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null);
|
||||
with lib;
|
||||
mkDerivation rec {
|
||||
pname = "qbittorrent";
|
||||
version = "4.4.1";
|
||||
version = "4.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qbittorrent";
|
||||
repo = "qBittorrent";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-HNgegPL7M0zwkn7+lcNcsgWgrCbY9/d0nuIlIC5hkAM=";
|
||||
sha256 = "sha256-xBNN9YYKMDcoL1wvERjlAjV8vb2GVgwwlHtb5y0+f+8=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -3,7 +3,7 @@ source 'https://rubygems.org'
|
||||
ruby '>= 2.4.0', '< 2.8.0'
|
||||
gem 'bundler', '>= 1.12.0'
|
||||
|
||||
gem 'rails', '5.2.6.2'
|
||||
gem 'rails', '5.2.6.3'
|
||||
gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
|
||||
gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0')
|
||||
gem 'rouge', '~> 3.26.0'
|
||||
@ -24,7 +24,7 @@ gem 'rubyzip', '~> 2.3.0'
|
||||
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
|
||||
|
||||
# TOTP-based 2-factor authentication
|
||||
gem 'rotp'
|
||||
gem 'rotp', '>= 5.0.0'
|
||||
gem 'rqrcode'
|
||||
|
||||
# Optional gem for LDAP authentication
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actioncable (5.2.6.2)
|
||||
actionpack (= 5.2.6.2)
|
||||
actioncable (5.2.6.3)
|
||||
actionpack (= 5.2.6.3)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
actionmailer (5.2.6.2)
|
||||
actionpack (= 5.2.6.2)
|
||||
actionview (= 5.2.6.2)
|
||||
activejob (= 5.2.6.2)
|
||||
actionmailer (5.2.6.3)
|
||||
actionpack (= 5.2.6.3)
|
||||
actionview (= 5.2.6.3)
|
||||
activejob (= 5.2.6.3)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
actionpack (5.2.6.2)
|
||||
actionview (= 5.2.6.2)
|
||||
activesupport (= 5.2.6.2)
|
||||
actionpack (5.2.6.3)
|
||||
actionview (= 5.2.6.3)
|
||||
activesupport (= 5.2.6.3)
|
||||
rack (~> 2.0, >= 2.0.8)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
@ -21,26 +21,26 @@ GEM
|
||||
actionpack-xml_parser (2.0.1)
|
||||
actionpack (>= 5.0)
|
||||
railties (>= 5.0)
|
||||
actionview (5.2.6.2)
|
||||
activesupport (= 5.2.6.2)
|
||||
actionview (5.2.6.3)
|
||||
activesupport (= 5.2.6.3)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
activejob (5.2.6.2)
|
||||
activesupport (= 5.2.6.2)
|
||||
activejob (5.2.6.3)
|
||||
activesupport (= 5.2.6.3)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (5.2.6.2)
|
||||
activesupport (= 5.2.6.2)
|
||||
activerecord (5.2.6.2)
|
||||
activemodel (= 5.2.6.2)
|
||||
activesupport (= 5.2.6.2)
|
||||
activemodel (5.2.6.3)
|
||||
activesupport (= 5.2.6.3)
|
||||
activerecord (5.2.6.3)
|
||||
activemodel (= 5.2.6.3)
|
||||
activesupport (= 5.2.6.3)
|
||||
arel (>= 9.0)
|
||||
activestorage (5.2.6.2)
|
||||
actionpack (= 5.2.6.2)
|
||||
activerecord (= 5.2.6.2)
|
||||
activestorage (5.2.6.3)
|
||||
actionpack (= 5.2.6.3)
|
||||
activerecord (= 5.2.6.3)
|
||||
marcel (~> 1.0.0)
|
||||
activesupport (5.2.6.2)
|
||||
activesupport (5.2.6.3)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
@ -60,7 +60,7 @@ GEM
|
||||
xpath (~> 3.2)
|
||||
childprocess (4.1.0)
|
||||
chunky_png (1.4.0)
|
||||
concurrent-ruby (1.1.9)
|
||||
concurrent-ruby (1.1.10)
|
||||
crass (1.0.6)
|
||||
css_parser (1.11.0)
|
||||
addressable
|
||||
@ -72,7 +72,7 @@ GEM
|
||||
htmlentities (4.3.4)
|
||||
i18n (1.8.11)
|
||||
concurrent-ruby (~> 1.0)
|
||||
loofah (2.14.0)
|
||||
loofah (2.16.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.7.1)
|
||||
@ -81,21 +81,19 @@ GEM
|
||||
method_source (1.0.0)
|
||||
mini_magick (4.11.0)
|
||||
mini_mime (1.0.3)
|
||||
mini_portile2 (2.5.3)
|
||||
minitest (5.15.0)
|
||||
mocha (1.13.0)
|
||||
mysql2 (0.5.3)
|
||||
net-ldap (0.17.0)
|
||||
nio4r (2.5.8)
|
||||
nokogiri (1.11.7)
|
||||
mini_portile2 (~> 2.5.0)
|
||||
racc (~> 1.4)
|
||||
parallel (1.21.0)
|
||||
parser (3.1.1.0)
|
||||
parallel (1.22.1)
|
||||
parser (3.1.2.0)
|
||||
ast (~> 2.4.1)
|
||||
pg (1.2.3)
|
||||
public_suffix (4.0.6)
|
||||
puma (5.6.2)
|
||||
public_suffix (4.0.7)
|
||||
puma (5.6.4)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.6.0)
|
||||
rack (2.2.3)
|
||||
@ -104,27 +102,27 @@ GEM
|
||||
ruby-openid (>= 2.1.8)
|
||||
rack-test (1.1.0)
|
||||
rack (>= 1.0, < 3)
|
||||
rails (5.2.6.2)
|
||||
actioncable (= 5.2.6.2)
|
||||
actionmailer (= 5.2.6.2)
|
||||
actionpack (= 5.2.6.2)
|
||||
actionview (= 5.2.6.2)
|
||||
activejob (= 5.2.6.2)
|
||||
activemodel (= 5.2.6.2)
|
||||
activerecord (= 5.2.6.2)
|
||||
activestorage (= 5.2.6.2)
|
||||
activesupport (= 5.2.6.2)
|
||||
rails (5.2.6.3)
|
||||
actioncable (= 5.2.6.3)
|
||||
actionmailer (= 5.2.6.3)
|
||||
actionpack (= 5.2.6.3)
|
||||
actionview (= 5.2.6.3)
|
||||
activejob (= 5.2.6.3)
|
||||
activemodel (= 5.2.6.3)
|
||||
activerecord (= 5.2.6.3)
|
||||
activestorage (= 5.2.6.3)
|
||||
activesupport (= 5.2.6.3)
|
||||
bundler (>= 1.3.0)
|
||||
railties (= 5.2.6.2)
|
||||
railties (= 5.2.6.3)
|
||||
sprockets-rails (>= 2.0.0)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.4.2)
|
||||
loofah (~> 2.3)
|
||||
railties (5.2.6.2)
|
||||
actionpack (= 5.2.6.2)
|
||||
activesupport (= 5.2.6.2)
|
||||
railties (5.2.6.3)
|
||||
actionpack (= 5.2.6.3)
|
||||
activesupport (= 5.2.6.3)
|
||||
method_source
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.19.0, < 2.0)
|
||||
@ -160,7 +158,7 @@ GEM
|
||||
rubocop-ast (>= 1.2.0, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 1.4.0, < 3.0)
|
||||
rubocop-ast (1.16.0)
|
||||
rubocop-ast (1.17.0)
|
||||
parser (>= 3.1.1.0)
|
||||
rubocop-performance (1.10.2)
|
||||
rubocop (>= 0.90.0, < 2.0)
|
||||
@ -180,7 +178,7 @@ GEM
|
||||
docile (~> 1.1)
|
||||
simplecov-html (~> 0.11)
|
||||
simplecov-html (0.12.3)
|
||||
sprockets (4.0.2)
|
||||
sprockets (4.0.3)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-rails (3.4.2)
|
||||
@ -227,13 +225,13 @@ DEPENDENCIES
|
||||
pg (~> 1.2.2)
|
||||
puma
|
||||
rack-openid
|
||||
rails (= 5.2.6.2)
|
||||
rails (= 5.2.6.3)
|
||||
rails-dom-testing
|
||||
rbpdf (~> 1.20.0)
|
||||
redcarpet (~> 3.5.1)
|
||||
request_store (~> 1.5.0)
|
||||
roadie-rails (~> 2.2.0)
|
||||
rotp
|
||||
rotp (>= 5.0.0)
|
||||
rouge (~> 3.26.0)
|
||||
rqrcode
|
||||
rubocop (~> 1.12.0)
|
||||
@ -248,7 +246,7 @@ DEPENDENCIES
|
||||
yard
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.7.4p191
|
||||
ruby 2.7.6p219
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
2.2.33
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }:
|
||||
|
||||
let
|
||||
version = "4.2.4";
|
||||
version = "4.2.5";
|
||||
rubyEnv = bundlerEnv {
|
||||
name = "redmine-env-${version}";
|
||||
|
||||
@ -15,10 +15,8 @@ in
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
# https://www.redmine.org/news/134
|
||||
# > "These releases are not available yet on the releases page from a technical reason, we are sorry for this and we expected to have them uploaded next week. I'll post here an update after we have them uploaded."
|
||||
url = "https://www.redmine.org/attachments/download/28862/${pname}-${version}.tar.gz";
|
||||
sha256 = "7f50fd4a6cf1c1e48091a87696b813ba264e11f04dec67fb006858a1b49a5c7d";
|
||||
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "112rc2sjx6x7046fjz7np0ilszvkqapc180ld02ncwmdxaq88w6r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0il9l30jz1gfjccrahfk2gl57b31dqgjlzjc8cfifm76ggywmz67";
|
||||
sha256 = "1gmwailk92znzrdpi4116ih6bq609a38rpnszzh5piq7b507ikpn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.6.2";
|
||||
version = "5.2.6.3";
|
||||
};
|
||||
actionmailer = {
|
||||
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
|
||||
@ -16,10 +16,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1cci24da56d467ldq40n3l176h9qdw691w1b703c251izh6c4n5d";
|
||||
sha256 = "103a1nixkazzdk21bg42vs722m6gm0vf17ag2fdad5dycwk3ycpp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.6.2";
|
||||
version = "5.2.6.3";
|
||||
};
|
||||
actionpack = {
|
||||
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
@ -27,10 +27,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xis55xvs4hja6fnmj4785rzafk553k5f0xb7jprqf38c6dzmiak";
|
||||
sha256 = "15fz3rjk85svpx9lsqfdwlvyd972zf0g5jasnsllcbf6d300gdj6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.6.2";
|
||||
version = "5.2.6.3";
|
||||
};
|
||||
actionpack-xml_parser = {
|
||||
dependencies = ["actionpack" "railties"];
|
||||
@ -49,10 +49,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00a9g63xwfimnzsrcrnr4vmdwhg7jaic49jas70r695nznwkxr9x";
|
||||
sha256 = "00cfpmbk8gw9c589xnqazsbd860p2368gyh8nyzixcsa6k28wfwv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.6.2";
|
||||
version = "5.2.6.3";
|
||||
};
|
||||
activejob = {
|
||||
dependencies = ["activesupport" "globalid"];
|
||||
@ -60,10 +60,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fm5qxrv8pxhl7m88p17xxpizddasm9kknaldkax8im3b9vrgnr9";
|
||||
sha256 = "1gczbnk7qy4rjhv0q82nd70xawc9lb1vinvwr4ngpim5rqwzm6d6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.6.2";
|
||||
version = "5.2.6.3";
|
||||
};
|
||||
activemodel = {
|
||||
dependencies = ["activesupport"];
|
||||
@ -71,10 +71,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0k0xizwbcadmslc8rkg2vnsbrsqivm6yj2yjrzb6rhqwphcr9zjf";
|
||||
sha256 = "0ib8qlbwr9hp5284c6bmx08lrfy45zzd4inzmawz08alkgdcrzca";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.6.2";
|
||||
version = "5.2.6.3";
|
||||
};
|
||||
activerecord = {
|
||||
dependencies = ["activemodel" "activesupport" "arel"];
|
||||
@ -82,10 +82,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1m00zh62rfn2h15vfn89jg39wxmghc88v2vjb5r4m0c7g24vrb14";
|
||||
sha256 = "0ky3zc8i5rjg2dpdb95icsgb443siim9sv71xwcmryjxp5rhkqyx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.6.2";
|
||||
version = "5.2.6.3";
|
||||
};
|
||||
activestorage = {
|
||||
dependencies = ["actionpack" "activerecord" "marcel"];
|
||||
@ -93,10 +93,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0h3z331xli0j5didh0g9cv4zrlx32b5csp1566fpy0fr2kgqmpi9";
|
||||
sha256 = "1risg5jklxrm7j5i4rzaqpb94822ivbjaasblppwmx5f33vhfpca";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.6.2";
|
||||
version = "5.2.6.3";
|
||||
};
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
|
||||
@ -104,10 +104,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "164lmi9w96wdwd00dnly8f9dcak3blv49ymyqz30q2fdjn45c775";
|
||||
sha256 = "09vif5aajkvrsdcl51kvk8crz8hl38awprh7d5wj93nscpxmqgns";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.6.2";
|
||||
version = "5.2.6.3";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
@ -186,10 +186,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
|
||||
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.9";
|
||||
version = "1.1.10";
|
||||
};
|
||||
crass = {
|
||||
groups = ["default"];
|
||||
@ -280,10 +280,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w";
|
||||
sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.14.0";
|
||||
version = "2.16.0";
|
||||
};
|
||||
mail = {
|
||||
dependencies = ["mini_mime"];
|
||||
@ -336,16 +336,6 @@
|
||||
};
|
||||
version = "1.0.3";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.3";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
@ -405,7 +395,7 @@
|
||||
version = "2.5.8";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = ["mini_portile2" "racc"];
|
||||
dependencies = ["racc"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
@ -420,10 +410,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4";
|
||||
sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.21.0";
|
||||
version = "1.22.1";
|
||||
};
|
||||
parser = {
|
||||
dependencies = ["ast"];
|
||||
@ -431,10 +421,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c";
|
||||
sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.1.0";
|
||||
version = "3.1.2.0";
|
||||
};
|
||||
pg = {
|
||||
groups = ["default"];
|
||||
@ -459,10 +449,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
|
||||
sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.6";
|
||||
version = "4.0.7";
|
||||
};
|
||||
puma = {
|
||||
dependencies = ["nio4r"];
|
||||
@ -470,10 +460,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56";
|
||||
sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.6.2";
|
||||
version = "5.6.4";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default" "test"];
|
||||
@ -523,10 +513,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fgbld733j2j85pf8kpv1mvp8rmlkqs7ccv77q2mwfm7ri4yisy0";
|
||||
sha256 = "19962nkjssr77753a8893yz17kmvb63h9rl3ajq6r8rx9xifq8fn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.6.2";
|
||||
version = "5.2.6.3";
|
||||
};
|
||||
rails-dom-testing = {
|
||||
dependencies = ["activesupport" "nokogiri"];
|
||||
@ -556,10 +546,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fgyw80j2mss3hdhzxa1b12c7j17az55znq0d16md69if8dwfmic";
|
||||
sha256 = "0waa50li6vvckz9mznyz4jhks46ba09fmbdadrrj35mzwahyb6fy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.6.2";
|
||||
version = "5.2.6.3";
|
||||
};
|
||||
rainbow = {
|
||||
groups = ["default" "test"];
|
||||
@ -723,10 +713,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv";
|
||||
sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.16.0";
|
||||
version = "1.17.0";
|
||||
};
|
||||
rubocop-performance = {
|
||||
dependencies = ["rubocop" "rubocop-ast"];
|
||||
@ -818,10 +808,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ikgwbl6jv3frfiy3xhg5yxw9d0064rgzghar1rg391xmrc4gm38";
|
||||
sha256 = "19k5cwg8gyb6lkmz4kab7c5nlplpgj64jy7vw8p5l2i2ysq5hym0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
};
|
||||
sprockets-rails = {
|
||||
dependencies = ["actionpack" "activesupport" "sprockets"];
|
||||
|
||||
17
pkgs/applications/version-management/redmine/update.sh
Executable file
17
pkgs/applications/version-management/redmine/update.sh
Executable file
@ -0,0 +1,17 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell --pure -i bash -p cacert bundix
|
||||
|
||||
# Do these steps before running this script:
|
||||
# 1. Copy Gemfile from new Redmine version to this folder
|
||||
# 2. Manually modify the database lines in Gemfile (diff the two files, it's obvious)
|
||||
|
||||
pkg_dir="$(dirname "$0")"
|
||||
cd ${pkg_dir}
|
||||
|
||||
for file in "gemset.nix" "Gemfile.lock"; do
|
||||
if [ -f ${file} ]; then
|
||||
rm ${file}
|
||||
fi
|
||||
done
|
||||
|
||||
bundix -l
|
||||
@ -11,13 +11,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "podman-tui";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1WbDmnKyFosp4Kz9QINr3lOR/wD0UW2QZf7nAAaoClM=";
|
||||
sha256 = "sha256-Xc6F87evQiv4jRbxxRBzJBeI8653HvlQL+UwcVWY0wk=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -27,14 +27,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-todo";
|
||||
version = "unstable-2022-03-13";
|
||||
version = "unstable-2022-04-07";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "gnome-todo";
|
||||
rev = "68787718eabf164f9087367113689996cd06fefd";
|
||||
sha256 = "srfu22s8nVVJYw8c97T1ubT6nQqbA1Sav5Ckemdcn30=";
|
||||
rev = "ebc683746c705faa7c080aa96eecb83e523a8c15";
|
||||
sha256 = "YMRol1XSQUuwdlpOKNgjUnTZthbMvV/l4dqtBoBnjSU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
|
||||
, stdenv, writeScript, lib }:
|
||||
let
|
||||
version = "0.29.0";
|
||||
version = "0.30.0";
|
||||
owner = "erlang-ls";
|
||||
repo = "erlang_ls";
|
||||
deps = import ./rebar-deps.nix {
|
||||
@ -19,7 +19,7 @@ rebar3Relx {
|
||||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
sha256 = "sha256-BWI7H5HU5ZgXrMWFOZ7WpTfS6syrFpEVRInZW6hC5iE=";
|
||||
sha256 = "sha256-Dqkp0d6U8U5HbyBq6q0WmKODVIQx3DVE8yofD0JhAHM=";
|
||||
rev = version;
|
||||
};
|
||||
releaseType = "escript";
|
||||
|
||||
@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--disable-werror"
|
||||
"--enable-jtag_vpi"
|
||||
"--enable-usb_blaster_libftdi"
|
||||
(lib.enableFeature (! stdenv.isDarwin) "amtjtagaccel")
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ ffmpeg_4, ffmpeg-full, fetchFromGitHub, lib }:
|
||||
|
||||
(ffmpeg-full.override { ffmpeg = ffmpeg_4; }).overrideAttrs (old: rec {
|
||||
name = "jellyfin-ffmpeg";
|
||||
pname = "jellyfin-ffmpeg";
|
||||
version = "4.4.1-4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@ -70,17 +70,17 @@ let
|
||||
projectArch = "x86_64";
|
||||
};
|
||||
};
|
||||
platforms."aarch64-linux".sha256 = "0m12adzcs6xsmgnqsdc5g0xs6xmjbj560x4d9rnv9fpf1p7jv2fa";
|
||||
platforms."i686-linux".sha256 = "00cy5kxx8hpifkwhn9qbfch7ng3crx0zb6ypllzip6qms956mama";
|
||||
platforms."x86_64-linux".sha256 = "1f1hxx4xl0wljyrgj0m3zq47yz2cyqd52qigrkpcvavr1d2sx6m3";
|
||||
platforms."aarch64-linux".sha256 = "0gmnmr0zn2ffn7xbhmfh6rhmwmxy5zzlj0s3lyp99knjn47lg2fg";
|
||||
platforms."i686-linux".sha256 = "1lp2z9db89qk2wh900c2dzlhflwmcbmp4m7xnlj04pq4q2kgfm9p";
|
||||
platforms."x86_64-linux".sha256 = "1ljrp0iky7rrj04sbqicrg1jr938xnid6jlirbf7gwlmzliz3wfs";
|
||||
|
||||
platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cef-binary";
|
||||
version = "98.1.21";
|
||||
gitRevision = "9782362";
|
||||
chromiumVersion = "98.0.4758.102";
|
||||
version = "100.0.24";
|
||||
gitRevision = "0783cf8";
|
||||
chromiumVersion = "100.0.4896.127";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";
|
||||
|
||||
@ -1,40 +1,46 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
|
||||
, alsaSupport ? !stdenv.isDarwin, alsa-lib
|
||||
, dbusSupport ? !stdenv.isDarwin, dbus
|
||||
, pipewireSupport ? !stdenv.isDarwin, pipewire
|
||||
, pulseSupport ? !stdenv.isDarwin, libpulseaudio
|
||||
, CoreServices, AudioUnit, AudioToolbox
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openal-soft";
|
||||
version = "1.21.1";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kcat";
|
||||
repo = "openal-soft";
|
||||
rev = version;
|
||||
sha256 = "sha256-rgc6kjXaZb6sCR+e9Gu7BEEHIiCHMygpLIeSqgWkuAg=";
|
||||
sha256 = "sha256-Y2KhPkwtG6tBzUhSqwV2DVnOjZwxPihidLKahjaIvyU=";
|
||||
};
|
||||
|
||||
# this will make it find its own data files (e.g. HRTF profiles)
|
||||
# without any other configuration
|
||||
patches = [ ./search-out.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace alc/helpers.cpp \
|
||||
substituteInPlace core/helpers.cpp \
|
||||
--replace "@OUT@" $out
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.cc.libc
|
||||
++ lib.optional alsaSupport alsa-lib
|
||||
++ lib.optional dbusSupport dbus
|
||||
++ lib.optional pipewireSupport pipewire
|
||||
++ lib.optional pulseSupport libpulseaudio
|
||||
++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];
|
||||
|
||||
NIX_LDFLAGS = toString (
|
||||
lib.optional alsaSupport "-lasound"
|
||||
++ lib.optional pulseSupport "-lpulse");
|
||||
cmakeFlags = [
|
||||
# Automatically links dependencies without having to rely on dlopen, thus
|
||||
# removes the need for NIX_LDFLAGS.
|
||||
"-DALSOFT_DLOPEN=OFF"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OpenAL alternative";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff --git a/alc/helpers.cpp b/alc/helpers.cpp
|
||||
index 8c1c856..19bbc0f 100644
|
||||
--- a/alc/helpers.cpp
|
||||
+++ b/alc/helpers.cpp
|
||||
--- a/core/helpers.cpp
|
||||
+++ b/core/helpers.cpp
|
||||
@@ -402,6 +402,7 @@ al::vector<std::string> SearchDataFiles(const char *ext, const char *subdir)
|
||||
|
||||
DirectorySearch(path.c_str(), ext, &results);
|
||||
|
||||
@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apprise";
|
||||
version = "0.9.8.2";
|
||||
version = "0.9.8.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EDKa77sU09HOBp4NVsHNwp6S4UbHyqX8T8rFGOnV8kA=";
|
||||
hash = "sha256-24OYAjbnzer0KyTRx7Kty8HVsHdon+l4UazcWMIm428=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.11";
|
||||
version = "1.12";
|
||||
pname = "Flask-Compress";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-9WnzLERtayXKjjR9UAOgUxgR73MmeABbADb8HJ6xwhw=";
|
||||
sha256 = "sha256-4hWUmfOdYYpNVroEhOe1i1eVa5osbTUQ8JX1uxS3r8U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,32 +1,58 @@
|
||||
{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k, flask, blinker, twill }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, blinker
|
||||
, pytestCheckHook
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, flask
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-Testing";
|
||||
pname = "flask-testing";
|
||||
version = "0.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0a734d7b68e63a9410b413cd7b1f96456f9a858bd09a6222d465650cc782eb01";
|
||||
pname = "Flask-Testing";
|
||||
inherit version;
|
||||
hash = "sha256-CnNNe2jmOpQQtBPNex+WRW+ahYvQmmIi1GVlDMeC6wE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "twill==0.9.1" "twill"
|
||||
'';
|
||||
propagatedBuildInputs = [
|
||||
flask
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ flask ];
|
||||
checkInputs = [
|
||||
blinker
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkInputs = [ blinker ] ++ lib.optionals (!isPy3k) [ twill ];
|
||||
# Some of the tests use localhost networking on darwin
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
# twill integration is outdated in Python 2, hence it the tests fails.
|
||||
# Some of the tests use localhost networking on darwin.
|
||||
doCheck = isPy3k && !stdenv.isDarwin;
|
||||
disabledTests = [
|
||||
# RuntimeError and NotImplementedError
|
||||
"test_assert_redirects"
|
||||
"test_server_listening"
|
||||
"test_server_process_is_spawned"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "flask_testing" ];
|
||||
disabledTestPaths = [
|
||||
# twill is only used by Python 2 according setup.py
|
||||
"tests/test_twill.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"flask_testing"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Flask unittest integration.";
|
||||
description = "Extension provides unit testing utilities for Flask";
|
||||
homepage = "https://pythonhosted.org/Flask-Testing/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.mic92 ];
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ buildPythonPackage
|
||||
, lib
|
||||
, isPy27
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, nixosTests
|
||||
, fetchPypi
|
||||
, alembic
|
||||
@ -29,7 +29,6 @@
|
||||
, python-dateutil
|
||||
, pytz
|
||||
, requests
|
||||
, six
|
||||
, sqlalchemy
|
||||
, sqlalchemy-utils
|
||||
, sqlalchemy-continuum
|
||||
@ -37,83 +36,85 @@
|
||||
, werkzeug
|
||||
, wtforms
|
||||
, psycopg2 # optional, for postgresql support
|
||||
, flask_testing
|
||||
, flask-testing
|
||||
, pytestCheckHook
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ihatemoney";
|
||||
version = "5.1.1";
|
||||
version = "5.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0gsqba9qbs1dpmfys8qpiahy4pbn4khcc6mgmdnhssmkjsb94sx6";
|
||||
sha256 = "sha256-uQgZBbpqqbZYHpR+GwHWX0c7di2rVvEz0jPRY6+BkkQ=";
|
||||
};
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aniso8601
|
||||
Babel
|
||||
blinker
|
||||
cachetools
|
||||
click
|
||||
debts
|
||||
dnspython
|
||||
email_validator
|
||||
flask
|
||||
flask-babel
|
||||
flask-cors
|
||||
flask_mail
|
||||
flask_migrate
|
||||
flask_wtf
|
||||
flask-babel
|
||||
flask-cors
|
||||
flask-restful
|
||||
flask-talisman
|
||||
flask_wtf
|
||||
idna
|
||||
itsdangerous
|
||||
jinja2
|
||||
Mako
|
||||
markupsafe
|
||||
psycopg2
|
||||
python-dateutil
|
||||
pytz
|
||||
requests
|
||||
six
|
||||
sqlalchemy
|
||||
sqlalchemy-continuum
|
||||
werkzeug
|
||||
wtforms
|
||||
psycopg2
|
||||
debts
|
||||
];
|
||||
|
||||
patches = [
|
||||
# fix build with wtforms 3. remove with next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/spiral-project/ihatemoney/commit/40ce32d9fa58a60d26a4d0df547b8deb709c330d.patch";
|
||||
sha256 = "sha256-2ewOu21qhq/AOZaE9qrF5J6HH0h6ohFgjDb+BYjJnuQ=";
|
||||
excludes = [ "setup.cfg" ];
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "cachetools>=4.1,<5" "cachetools>=4.1" \
|
||||
--replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2" \
|
||||
--replace "SQLAlchemy>=1.3.0,<1.4" "SQLAlchemy>=1.3.0,<1.5" \
|
||||
--replace "WTForms>=2.3.1,<2.4" "WTForms" \
|
||||
--replace "Flask-Talisman>=0.8,<1" "Flask-Talisman>=0.8,<2" # https://github.com/spiral-project/ihatemoney/pull/1006
|
||||
--replace "WTForms>=2.3.1,<3.1" "WTForms"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
flask_testing
|
||||
flask-testing
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "ihatemoney" ];
|
||||
pythonImportsCheck = [
|
||||
"ihatemoney"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_notifications" # requires running service.
|
||||
"test_invite" # requires running service.
|
||||
"test_invitation_email_failure" # requires dns resolution
|
||||
# Requires running service
|
||||
"test_notifications"
|
||||
"test_invite"
|
||||
"test_access_other_projects"
|
||||
"test_authentication"
|
||||
"test_manage_bills"
|
||||
"test_member_delete_method"
|
||||
"test_membership"
|
||||
"test_bill_add_remove_add"
|
||||
"test_clear_ip_records"
|
||||
"test_disable_clear_no_new_records"
|
||||
"test_logs_for_common_actions"
|
||||
# Requires DNS resolution
|
||||
"test_invitation_email_failure"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
@ -121,9 +122,9 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Shared budget manager web application";
|
||||
homepage = "https://ihatemoney.org";
|
||||
description = "A simple shared budget manager web application";
|
||||
license = licenses.beerware;
|
||||
maintainers = [ maintainers.symphorien ];
|
||||
maintainers = with maintainers; [ symphorien ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "0.0.20";
|
||||
version = "0.0.21";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-h/WQzkDoEuE4grnb0YeuWhHDPWIqVHgjWgMq02XLahs=";
|
||||
hash = "sha256-NTwLo/RtwSf3a43dAv8EK1NWuCsVjL+8+KozjvaPUm4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.82";
|
||||
version = "2.1.84";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-VwbpcKPtPH/43E+lfzUken8JvX8QtTa6o0H0S2RXbYk=";
|
||||
hash = "sha256-tjPjLzNOO/PUU6EItLYyQw+KPekIwboTBn98T8wHpHw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,40 +1,57 @@
|
||||
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests
|
||||
, pytestCheckHook, flask, flask-cors, dbus-python, mock, isPy27
|
||||
, poetry-core }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, dbus-python
|
||||
, fetchFromGitHub
|
||||
, flask
|
||||
, flask-cors
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "SwSpotify";
|
||||
pname = "swspotify";
|
||||
version = "1.2.3";
|
||||
disabled = isPy27;
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SwagLyrics";
|
||||
repo = "SwSpotify";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xGLvc154xnje45Akf7H1qqQRUc03gGVt8AhGlkcP3kY=";
|
||||
hash = "sha256-xGLvc154xnje45Akf7H1qqQRUc03gGVt8AhGlkcP3kY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ requests flask flask-cors ]
|
||||
++ lib.optionals stdenv.isLinux [ dbus-python ];
|
||||
propagatedBuildInputs = [
|
||||
dbus-python
|
||||
flask
|
||||
flask-cors
|
||||
requests
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
checkPhase = ''
|
||||
pytest tests/test_spotify.py::${if stdenv.isDarwin then "DarwinTests" else "LinuxTests"}
|
||||
postPatch = ''
|
||||
# Detection of the platform doesn't always works with 1.2.3
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'dbus-python = {version = "^1.2.16", platform = "linux"}' ""
|
||||
'';
|
||||
|
||||
checkInputs = [ pytestCheckHook mock ];
|
||||
# Tests want to use Dbus
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "SwSpotify" ];
|
||||
pythonImportsCheck = [
|
||||
"SwSpotify"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/SwagLyrics/SwSpotify";
|
||||
description = "Library to get the currently playing song and artist from Spotify";
|
||||
homepage = "https://github.com/SwagLyrics/SwSpotify";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-paramiko";
|
||||
version = "2.8.19";
|
||||
version = "2.8.20";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-UhkthDZk73wfh7n+Bpe7u1qPgS5DAWlEz+q+x93spCM=";
|
||||
sha256 = "sha256-tsK0nbyjv6hlONLinKRAgckjECEIqrGsK0f1OL5h5S4=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-urllib3";
|
||||
version = "1.26.13";
|
||||
version = "1.26.14";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-QPj7XozX1X6K797j/dXpMKoaG7QXnNrdVSJs6liK95A=";
|
||||
hash = "sha256-KiV45LNjQczSQLAPzNqYJpiP8FiaRLpKZku9ae80jSc=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mold";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rui314";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KmFNe22XltSrxlINOH/3w79P1CGHwPkxKVyKMD5OcCc=";
|
||||
sha256 = "sha256-qrIaHDjPiOzQ8Gi7aPT0BM9oIgWr1IdcT7vvYmsea7k=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib openssl ];
|
||||
|
||||
@ -16,15 +16,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.21.0";
|
||||
version = "1.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Sv9Keb+6vc6Lr+H/gAi9/4bmBO18gv9bqAjBIpOrtnk=";
|
||||
sha256 = "sha256-97KWvaxjIxdWjpuJHYzKbYmQZvAcDW/rzj0VkvnQas4=";
|
||||
};
|
||||
cargoSha256 = "sha256-EykIg8rU2VBag+3834SwMYkz9ZR6brOo/0NXXvrGqsU=";
|
||||
cargoSha256 = "sha256-cqKxKHX/xQLvDN5FwyjB/2aHgm3KZsjxHVRiugYIvQE=";
|
||||
|
||||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
{ stdenv, fetchurl, lib, zlib, pcre
|
||||
, memorymappingHook, memstreamHook
|
||||
, tlsSupport ? true, gnutls ? null
|
||||
# ^ set { tlsSupport = false; } to reduce closure size by ~= 18.6 MB
|
||||
}:
|
||||
|
||||
assert tlsSupport -> gnutls != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tintin";
|
||||
version = "2.02.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tintin/tintin-${version}.tar.gz";
|
||||
sha256 = "sha256-tvn9TywefNyM/0Fy16gAFJYbA5Q4DO2RgiCdw014GgA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional tlsSupport gnutls.dev;
|
||||
buildInputs = [ zlib pcre ]
|
||||
++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ]
|
||||
++ lib.optional tlsSupport gnutls;
|
||||
|
||||
preConfigure = ''
|
||||
cd src
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A free MUD client for macOS, Linux and Windows";
|
||||
homepage = "http://tintin.sourceforge.net";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
mainProgram = "tt++";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -10,7 +10,21 @@
|
||||
}:
|
||||
|
||||
let
|
||||
pythonEnv = python3.withPackages(ps: with ps; [
|
||||
|
||||
python = python3.override {
|
||||
packageOverrides = final: prev: {
|
||||
sabyenc3 = prev.sabyenc3.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "4.0.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-PwwQ2jChKIqh7jJ6E2hkqPquTDSN4MklghfJ+MkM0n0=";
|
||||
};
|
||||
});
|
||||
};
|
||||
self = python;
|
||||
};
|
||||
|
||||
pythonEnv = python.withPackages(ps: with ps; [
|
||||
chardet
|
||||
cheetah3
|
||||
cherrypy
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildFishPlugin rec {
|
||||
pname = "fzf.fish";
|
||||
version = "8.2";
|
||||
version = "8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PatrickF1";
|
||||
repo = "fzf.fish";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WRrPd/GuXHJ9uYvhwjwp9AEtvbfMlpV0xdgNyfx43ok=";
|
||||
sha256 = "sha256-eSNUqvKXTxcuvICxo8BmVWL1ESXQuU7VhOl7aONrhwM=";
|
||||
};
|
||||
|
||||
checkInputs = [ fzf fd util-linux ];
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip }:
|
||||
{ lib, buildGo118Module, fetchFromGitHub, fetchzip }:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGo118Module rec {
|
||||
pname = "mutagen";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mutagen-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WFEbiPyE029q9+ZXYioESXLm9fmpwihaNwgLcPYQYFE=";
|
||||
sha256 = "sha256-OoRXf0QboRQkZE4zcwlGFyoToGOy1bbgGSo17BQLqCE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-kMX0E3yCg+wRaVMRWNSkeW+dN8b/EG04C0P77x9TQC0=";
|
||||
vendorSha256 = "sha256-dkPpz0SZEAMPR7mq11kDHGCgeIpnXj2lRnJo1Ws32Cc=";
|
||||
|
||||
agents = fetchzip {
|
||||
name = "mutagen-agents-${version}";
|
||||
@ -21,7 +21,7 @@ buildGoModule rec {
|
||||
extraPostFetch = ''
|
||||
rm $out/mutagen # Keep only mutagen-agents.tar.gz.
|
||||
'';
|
||||
sha256 = "sha256-QwPOt2pK9fRPrfvpc6qqr/uBZ/XK8CMlYNSLb7eWzg4=";
|
||||
sha256 = "sha256-AlAo55/ewTE04WfS0beVonGA97AmpR1pAw/QxKAYjv8=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -1,18 +1,38 @@
|
||||
{ lib, python3, fetchFromGitHub, ncurses }:
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, ncurses
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "swaglyrics";
|
||||
version = "unstable-2021-06-17";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SwagLyrics";
|
||||
repo = "SwagLyrics-For-Spotify";
|
||||
rev = "99fe764a9e45cac6cb9fcdf724c7d2f8cb4524fb";
|
||||
sha256 = "sha256-O48T1WsUIVnNQb8gmzSkFFHTOiFOKVSAEYhF9zUqZz0=";
|
||||
hash = "sha256-O48T1WsUIVnNQb8gmzSkFFHTOiFOKVSAEYhF9zUqZz0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
unidecode colorama beautifulsoup4 flask requests swspotify
|
||||
beautifulsoup4
|
||||
colorama
|
||||
flask
|
||||
requests
|
||||
swspotify
|
||||
unidecode
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
blinker
|
||||
flask
|
||||
flask-testing
|
||||
mock
|
||||
pytestCheckHook
|
||||
] ++ [
|
||||
ncurses
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
@ -22,10 +42,12 @@ python3.pkgs.buildPythonApplication rec {
|
||||
--replace 'flask==2.0.1' 'flask>=2.0.1'
|
||||
'';
|
||||
|
||||
preBuild = "export HOME=$NIX_BUILD_TOP";
|
||||
preBuild = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
# disable tests which touch network
|
||||
disabledTests = [
|
||||
# Disable tests which touch network
|
||||
"test_database_for_unsupported_song"
|
||||
"test_that_lyrics_works_for_unsupported_songs"
|
||||
"test_that_get_lyrics_works"
|
||||
@ -33,9 +55,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
"test_songchanged_can_raise_songplaying"
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs;
|
||||
[ blinker swspotify pytestCheckHook flask mock flask_testing ]
|
||||
++ [ ncurses ];
|
||||
pythonImportsCheck = [
|
||||
"swaglyrics"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lyrics fetcher for currently playing Spotify song";
|
||||
|
||||
@ -6,11 +6,11 @@ with python3.pkgs;
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wlc";
|
||||
version = "1.12";
|
||||
version = "1.13";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256:01c1qxq6dxvpn8rgpbqs4iw5daa0rmlgygb3xhhfj7xpqv1v84ir";
|
||||
sha256 = "sha256-MZ6avuMNT5HIIXW7ezukAJeO70o+SrgJnBnGjNy4tYE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "frp";
|
||||
version = "0.41.0";
|
||||
version = "0.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fatedier";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JutR1yrxbwhfcw6qTh493yVeo7KzLl83himPTX8FJlA=";
|
||||
sha256 = "sha256-Ubc9jRZ+rkJ5TelizP6z9Hef6TkypfGMhZN+H4Awdqc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-HOfcVPrJ6TBrhToqYN2CJ0i3re95awrIxQk2Mm8x3DU=";
|
||||
vendorSha256 = "sha256-5ljUbEvynNo1AxGpJq9B0bTFgzVfgVZbsqXcPBERLMI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -11,6 +11,21 @@ res: pkgs: super:
|
||||
with pkgs;
|
||||
|
||||
{
|
||||
# A module system style type tag
|
||||
#
|
||||
# Allows the nixpkgs fixpoint, usually known as `pkgs`
|
||||
# to be distinguished nominally.
|
||||
#
|
||||
# pkgs._type == "pkgs"
|
||||
# pkgs.pkgsStatic._type == "pkgs"
|
||||
#
|
||||
# Design note:
|
||||
# While earlier stages of nixpkgs fixpoint construction
|
||||
# are supertypes of this stage, they're generally not
|
||||
# usable in places where a `pkgs` is expected.
|
||||
# (earlier stages being the various `super` variables
|
||||
# that precede all-packages.nix)
|
||||
_type = "pkgs";
|
||||
|
||||
# A stdenv capable of building 32-bit binaries. On x86_64-linux,
|
||||
# it uses GCC compiled with multilib support; on i686-linux, it's
|
||||
@ -32191,7 +32206,7 @@ with pkgs;
|
||||
|
||||
tibia = pkgsi686Linux.callPackage ../games/tibia { };
|
||||
|
||||
tintin = callPackage ../games/tintin { };
|
||||
tintin = throw "tintin has been removed due to lack of maintainers";
|
||||
|
||||
tinyfugue = callPackage ../games/tinyfugue { };
|
||||
|
||||
|
||||
@ -64,6 +64,7 @@ mapAliases ({
|
||||
dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20
|
||||
eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03
|
||||
faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
|
||||
flask_testing = flask-testing; # added 2022-04-25
|
||||
garminconnect-ha = garminconnect; # added 2022-02-05
|
||||
gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
|
||||
glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
|
||||
|
||||
@ -3072,7 +3072,7 @@ in {
|
||||
|
||||
flask-talisman = callPackage ../development/python-modules/flask-talisman { };
|
||||
|
||||
flask_testing = callPackage ../development/python-modules/flask-testing { };
|
||||
flask-testing = callPackage ../development/python-modules/flask-testing { };
|
||||
|
||||
flask-versioned = callPackage ../development/python-modules/flask-versioned { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user