Merge staging-next into staging
This commit is contained in:
commit
2ea430e624
|
@ -13,11 +13,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SunVox";
|
||||
version = "1.9.6c";
|
||||
version = "2.0c";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip";
|
||||
sha256 = "10lqbm1grw0sqasx7i6528cishv5ksdf9zbb3ygxd8c1iwaxzhb9";
|
||||
sha256 = "949e5348da9faa92ce17aac943b58027bdb797b65c7f5f365ef0610bb6dd8a3d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "index-fm";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "maui";
|
||||
repo = "index-fm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Os/5igKGYBeY/FxO6I+7mpFohuk3yHGLd7vE2GewFpU=";
|
||||
hash = "sha256-F4qgewkPxkbAbeR+MaeRDiw9KIsd/Xx4C0cYEYDkPOE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chatty";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "source.puri.sm";
|
||||
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
repo = "chatty";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-8haVzRfAZwdTlYu7oKeu8E3uEH87yrHS4j+BWFQ/Nj0=";
|
||||
hash = "sha256-AufxwuOibTx5OvLBVbJqay/mYLmcDpE2BgwVv6Y5IlY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -61,24 +61,24 @@ let
|
|||
++ lib.optionals (branch == "ptb") [ "aarch64-darwin" ];
|
||||
};
|
||||
package = if stdenv.isLinux then ./linux.nix else ./darwin.nix;
|
||||
packages = {
|
||||
stable = callPackage package rec {
|
||||
inherit src version meta;
|
||||
pname = "discord";
|
||||
binaryName = "Discord";
|
||||
desktopName = "Discord";
|
||||
};
|
||||
ptb = callPackage package rec {
|
||||
inherit src version meta;
|
||||
pname = "discord-ptb";
|
||||
binaryName = "DiscordPTB";
|
||||
desktopName = "Discord PTB";
|
||||
};
|
||||
canary = callPackage package rec {
|
||||
inherit src version meta;
|
||||
pname = "discord-canary";
|
||||
binaryName = "DiscordCanary";
|
||||
desktopName = "Discord Canary";
|
||||
};
|
||||
};
|
||||
packages = (builtins.mapAttrs
|
||||
(_: value: callPackage package (value // { inherit src version; meta = meta // { mainProgram = value.binaryName; }; }))
|
||||
{
|
||||
stable = rec {
|
||||
pname = "discord";
|
||||
binaryName = "Discord";
|
||||
desktopName = "Discord";
|
||||
};
|
||||
ptb = rec {
|
||||
pname = "discord-ptb";
|
||||
binaryName = "DiscordPTB";
|
||||
desktopName = "Discord PTB";
|
||||
};
|
||||
canary = rec {
|
||||
pname = "discord-canary";
|
||||
binaryName = "DiscordCanary";
|
||||
desktopName = "Discord Canary";
|
||||
};
|
||||
}
|
||||
);
|
||||
in packages.${branch}
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, fetchurl, libarchive }:
|
||||
|
||||
let
|
||||
version = "0.35.5";
|
||||
version = "0.35.8";
|
||||
in fetchurl {
|
||||
name = "sarasa-gothic-${version}";
|
||||
|
||||
# Use the 'ttc' files here for a smaller closure size.
|
||||
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
|
||||
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
|
||||
sha256 = "sha256-t9BYV9a/rmEr8nLqcdxg4Z5pWsCefvwI47eSwub41u0=";
|
||||
sha256 = "sha256-22q+FdTh9Dex+tEo/HCBK14ZlJFtFM7SrE6K1/iVBY0=";
|
||||
|
||||
recursiveHash = true;
|
||||
downloadToTemp = true;
|
||||
|
|
|
@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freetds";
|
||||
version = "1.3.3";
|
||||
version = "1.3.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-26AufwZh/0LcKJ/EHXzefgMIn9Mm8I7ijIcqyf9KHIQ=";
|
||||
sha256 = "sha256-18p+ZaJgwCvjUchel4aaOjIr5jeVPKRNNhW1WljSezM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "mauikit-filebrowsing";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "maui";
|
||||
repo = "mauikit-filebrowsing";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-j6VoNtMkDB5BSET/RUiQlWdL0D1dAHlW929WNCDC+PE=";
|
||||
hash = "sha256-2LzGvjh2t4RVZS9Js7ky3hM51L7bx0SHmDlKKPjl3LM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "mauikit";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "maui";
|
||||
repo = "mauikit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dpJQSCog/AZ4ip8NTQMt4g1ntAnL1cjjMzxJz/uCxZA=";
|
||||
hash = "sha256-INvh+J484xkAsNGtYdf8NGGpFGp2AG7s9UYESoem3QY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -226,6 +226,15 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
near-cli = super.near-cli.override {
|
||||
nativeBuildInputs = with pkgs; [
|
||||
libusb
|
||||
nodePackages.prebuild-install
|
||||
nodePackages.node-gyp-build
|
||||
pkg-config
|
||||
];
|
||||
};
|
||||
|
||||
node-inspector = super.node-inspector.override {
|
||||
buildInputs = [ self.node-pre-gyp ];
|
||||
meta.broken = since "10";
|
||||
|
|
|
@ -201,6 +201,7 @@
|
|||
, "mocha"
|
||||
, "multi-file-swagger"
|
||||
, "musescore-downloader"
|
||||
, "near-cli"
|
||||
, "neovim"
|
||||
, "nijs"
|
||||
, "node-gyp"
|
||||
|
@ -228,6 +229,7 @@
|
|||
, "poor-mans-t-sql-formatter-cli"
|
||||
, "postcss"
|
||||
, "postcss-cli"
|
||||
, "prebuild-install"
|
||||
, "prettier"
|
||||
, "prettier-plugin-toml"
|
||||
, "prisma"
|
||||
|
|
3059
pkgs/development/node-packages/node-packages.nix
generated
3059
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, attrs
|
||||
, beautifulsoup4
|
||||
, requests
|
||||
, future
|
||||
|
@ -18,6 +19,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
beautifulsoup4
|
||||
requests
|
||||
future
|
||||
|
|
|
@ -9,12 +9,14 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "furo";
|
||||
version = "2022.1.2";
|
||||
format = "flit";
|
||||
format = "wheel";
|
||||
disable = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b217f218cbcd423ffbfe69baa79389d4ecebf2d86f0d593c44ef31da7b5aed30";
|
||||
inherit pname version format;
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
sha256 = "sha256-lYAWv+E4fB6N31udcWlracTqpc2K/JSSq/sAirotMAw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -22,6 +24,17 @@ buildPythonPackage rec {
|
|||
beautifulsoup4
|
||||
];
|
||||
|
||||
installCheckPhase = ''
|
||||
# furo was built incorrectly if this directory is empty
|
||||
# Ignore the hidden file .gitignore
|
||||
cd "$out/lib/python"*
|
||||
if [ "$(ls 'site-packages/furo/theme/furo/static/' | wc -l)" -le 0 ]; then
|
||||
echo 'static directory must not be empty'
|
||||
exit 1
|
||||
fi
|
||||
cd -
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "furo" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonenumbers";
|
||||
version = "8.12.42";
|
||||
version = "8.12.43";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-i1SHHtZOz85JSgeOnVazY8I+JMWRbf2J6EuYWhiVW+4=";
|
||||
sha256 = "sha256-HIJwouJX1sZUWKQig/gtPsp/e52SVFSmlm4vBN914c8=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -13,12 +13,12 @@
|
|||
}: buildPythonPackage rec
|
||||
{
|
||||
pname = "psygnal";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlambert03";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SiG2ywNEw3aNrRXyEMFTnvHKtKowO8yqoCaNI8PT4/Y=";
|
||||
sha256 = "sha256-vrGym/V0cSGIjBWMWpDrPBijEOFayK1vdR02gsWzRvo=";
|
||||
};
|
||||
buildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ typing-extensions ];
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jpexs";
|
||||
version = "11.3.0";
|
||||
version = "15.0.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "${meta.homepage}/releases/download/version${version}/ffdec_${version}.zip";
|
||||
sha256 = "0d1xmq21vdpn0glwfzr00s62ic8jynmgmgxl0m1834xqf3ma0ihv";
|
||||
sha256 = "1w8sh0dzln6mxcbibyw6r9f9c8g0cbwxq4qbm5kawq00yydvwfza";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fceux";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TASEmulators";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-LlGM6sOjcpyHApUvSr5etKIqwDoheuiW53DSHs19W6Q=";
|
||||
sha256 = "sha256-yQX58m/sMW/8Jr5cm2SrVXTiF7qyZOgOZg1v0qEyiLw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fortune-mod";
|
||||
version = "3.10.0";
|
||||
version = "3.12.0";
|
||||
|
||||
# We use fetchurl instead of fetchFromGitHub because the release pack has some
|
||||
# special files.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-DR73JXpOkpaOsymP9nxAklCxdoxAnjL1GeNF6D/tDTc=";
|
||||
sha256 = "sha256-fVrtfLmZiVDTSeuoOltX/vunGSizSw+ZhQhBn9t0C3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
|
|
26
pkgs/tools/misc/scrub/default.nix
Normal file
26
pkgs/tools/misc/scrub/default.nix
Normal file
|
@ -0,0 +1,26 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "scrub";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chaos";
|
||||
repo = "scrub";
|
||||
rev = version;
|
||||
sha256 = "0ndcri2ddzqlsxvy1b607ajyd4dxpiagzx331yyi7hf3ijph129f";
|
||||
};
|
||||
|
||||
buildInputs = [ autoconf automake libtool ];
|
||||
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Disk overwrite utility";
|
||||
homepage = "https://github.com/chaos/scrub";
|
||||
changelog = "https://raw.githubusercontent.com/chaos/scrub/master/NEWS";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ j0hax ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
|
@ -9575,6 +9575,8 @@ with pkgs;
|
|||
|
||||
screenkey = callPackage ../applications/video/screenkey { };
|
||||
|
||||
scrub = callPackage ../tools/misc/scrub { };
|
||||
|
||||
scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { };
|
||||
|
||||
scriptaculous = callPackage ../development/libraries/scriptaculous { };
|
||||
|
|
Loading…
Reference in a new issue