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

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-04-12 18:18:53 +00:00 committed by GitHub
parent d54b08fe92 000af0d8bf
commit 60daed5714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
101 changed files with 6038 additions and 1634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
doc/builders/packages/cataclysm-dda.section.md
View File

@ -34,6 +34,41 @@ cataclysm-dda.override {
} }
``` ```
## Important note for overriding packages
After applying `overrideAttrs`, you need to fix `passthru.pkgs` and
`passthru.withMods` attributes either manually or by using `attachPkgs`:
```nix
let
# You enabled parallel building.
myCDDA = cataclysm-dda-git.overrideAttrs (_: {
enableParallelBuilding = true;
});
# Unfortunately, this refers to the package before overriding and
# parallel building is still disabled.
badExample = myCDDA.withMods (_: []);
inherit (cataclysmDDA) attachPkgs pkgs wrapCDDA;
# You can fix it by hand
goodExample1 = myCDDA.overrideAttrs (old: {
passthru = old.passthru // {
pkgs = pkgs.override { build = goodExample1; };
withMods = wrapCDDA goodExample1;
};
});
# or by using a helper function `attachPkgs`.
goodExample2 = attachPkgs pkgs myCDDA;
in
# badExample # parallel building disabled
# goodExample1.withMods (_: []) # parallel building enabled
goodExample2.withMods (_: []) # parallel building enabled
```
## Customizing with mods ## Customizing with mods
To install Cataclysm DDA with mods of your choice, you can use `withMods` To install Cataclysm DDA with mods of your choice, you can use `withMods`

2
lib/systems/doubles.nix
View File

@ -73,7 +73,7 @@ in {
darwin = filterDoubles predicates.isDarwin; darwin = filterDoubles predicates.isDarwin;
freebsd = filterDoubles predicates.isFreeBSD; freebsd = filterDoubles predicates.isFreeBSD;
# Should be better, but MinGW is unclear. # Should be better, but MinGW is unclear.
gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.elfv1; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.elfv2; }); gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; });
illumos = filterDoubles predicates.isSunOS; illumos = filterDoubles predicates.isSunOS;
linux = filterDoubles predicates.isLinux; linux = filterDoubles predicates.isLinux;
netbsd = filterDoubles predicates.isNetBSD; netbsd = filterDoubles predicates.isNetBSD;

10
lib/systems/examples.nix
View File

@ -21,14 +21,10 @@ rec {
config = "powerpc64le-unknown-linux-musl"; config = "powerpc64le-unknown-linux-musl";
}; };
ppc64-elfv1 = { ppc64 = {
config = "powerpc64-unknown-linux-elfv1"; config = "powerpc64-unknown-linux-gnu";
gcc = { abi = "elfv2"; }; # for gcc configuration
}; };
ppc64-elfv2 = {
config = "powerpc64-unknown-linux-elfv2";
};
ppc64 = ppc64-elfv2; # default to modern elfv2
ppc64-musl = { ppc64-musl = {
config = "powerpc64-unknown-linux-musl"; config = "powerpc64-unknown-linux-musl";
gcc = { abi = "elfv2"; }; # for gcc configuration gcc = { abi = "elfv2"; }; # for gcc configuration

9
lib/systems/parse.nix
View File

@ -337,18 +337,10 @@ rec {
The "gnu" ABI is ambiguous on 32-bit ARM. Use "gnueabi" or "gnueabihf" instead. The "gnu" ABI is ambiguous on 32-bit ARM. Use "gnueabi" or "gnueabihf" instead.
''; '';
} }
{ assertion = platform: platform.system != "powerpc64-linux";
message = ''
The "gnu" ABI is ambiguous on big-endian 64-bit PPC. Use "elfv1" or "elfv2" instead.
'';
}
]; ];
}; };
gnuabi64 = { abi = "64"; }; gnuabi64 = { abi = "64"; };
elfv1 = { abi = "elfv1"; };
elfv2 = { abi = "elfv2"; };
musleabi = { float = "soft"; }; musleabi = { float = "soft"; };
musleabihf = { float = "hard"; }; musleabihf = { float = "hard"; };
musl = {}; musl = {};
@ -452,7 +444,6 @@ rec {
if lib.versionAtLeast (parsed.cpu.version or "0") "6" if lib.versionAtLeast (parsed.cpu.version or "0") "6"
then abis.gnueabihf then abis.gnueabihf
else abis.gnueabi else abis.gnueabi
else if cpu == "powerpc64" then abis.elfv2
else abis.gnu else abis.gnu
else abis.unknown; else abis.unknown;
}; };

28
maintainers/maintainer-list.nix
View File

@ -4926,6 +4926,12 @@
email = "jwilberding@afiniate.com"; email = "jwilberding@afiniate.com";
name = "Jordan Wilberding"; name = "Jordan Wilberding";
}; };
jwygoda = {
email = "jaroslaw@wygoda.me";
github = "jwygoda";
githubId = 20658981;
name = "Jarosław Wygoda";
};
jyp = { jyp = {
email = "jeanphilippe.bernardy@gmail.com"; email = "jeanphilippe.bernardy@gmail.com";
github = "jyp"; github = "jyp";
@ -6591,6 +6597,16 @@
githubId = 754512; githubId = 754512;
name = "Mogria"; name = "Mogria";
}; };
mohe2015 = {
name = "Moritz Hedtke";
email = "Moritz.Hedtke@t-online.de";
github = "mohe2015";
githubId = 13287984;
keys = [{
longkeyid = "rsa4096/0x6794D45A488C2EDE";
fingerprint = "1248 D3E1 1D11 4A85 75C9 8934 6794 D45A 488C 2EDE";
}];
};
monsieurp = { monsieurp = {
email = "monsieurp@gentoo.org"; email = "monsieurp@gentoo.org";
github = "monsieurp"; github = "monsieurp";
@ -9497,6 +9513,12 @@
githubId = 321799; githubId = 321799;
name = "Paul Colomiets"; name = "Paul Colomiets";
}; };
takagiy = {
email = "takagiy.4dev@gmail.com";
github = "takagiy";
githubId = 18656090;
name = "Yuki Takagi";
};
taketwo = { taketwo = {
email = "alexandrov88@gmail.com"; email = "alexandrov88@gmail.com";
github = "taketwo"; github = "taketwo";
@ -10482,6 +10504,12 @@
githubId = 78392041; githubId = 78392041;
name = "Winter"; name = "Winter";
}; };
wirew0rm = {
email = "alex@wirew0rm.de";
github = "wirew0rm";
githubId = 1202371;
name = "Alexander Krimm";
};
wishfort36 = { wishfort36 = {
email = "42300264+wishfort36@users.noreply.github.com"; email = "42300264+wishfort36@users.noreply.github.com";
github = "wishfort36"; github = "wishfort36";

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

@ -83,6 +83,17 @@
further details. further details.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The <option>services.packagekit.backend</option> option has been removed as
it only supported a single setting which would always be the default.
Instead new <link
xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC
0042</link> compliant <xref linkend="opt-services.packagekit.settings"/>
and <xref linkend="opt-services.packagekit.vendorSettings"/> options have
been introduced.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

3
nixos/modules/hardware/system-76.nix
View File

@ -17,6 +17,9 @@ let
firmware-pkg = pkgs.system76-firmware; firmware-pkg = pkgs.system76-firmware;
firmwareConfig = mkIf cfg.firmware-daemon.enable { firmwareConfig = mkIf cfg.firmware-daemon.enable {
# Make system76-firmware-cli usable by root from the command line.
environment.systemPackages = [ firmware-pkg ];
services.dbus.packages = [ firmware-pkg ]; services.dbus.packages = [ firmware-pkg ];
systemd.services.system76-firmware-daemon = { systemd.services.system76-firmware-daemon = {

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

@ -866,6 +866,7 @@
./services/security/shibboleth-sp.nix ./services/security/shibboleth-sp.nix
./services/security/sks.nix ./services/security/sks.nix
./services/security/sshguard.nix ./services/security/sshguard.nix
./services/security/step-ca.nix
./services/security/tor.nix ./services/security/tor.nix
./services/security/torify.nix ./services/security/torify.nix
./services/security/torsocks.nix ./services/security/torsocks.nix

2
nixos/modules/services/networking/networkmanager.nix
View File

@ -484,6 +484,8 @@ in {
}) })
]; ];
boot.kernelModules = [ "ctr" ];
security.polkit.extraConfig = polkitConf; security.polkit.extraConfig = polkitConf;
services.dbus.packages = cfg.packages services.dbus.packages = cfg.packages

2
nixos/modules/services/networking/privoxy.nix
View File

@ -242,7 +242,7 @@ in
"default.action" "default.action"
] ++ optional cfg.inspectHttps (toString inspectAction); ] ++ optional cfg.inspectHttps (toString inspectAction);
} // (optionalAttrs cfg.enableTor { } // (optionalAttrs cfg.enableTor {
forward-socks5 = "127.0.0.1:9063 ."; forward-socks5 = "/ 127.0.0.1:9063 .";
toggle = true; toggle = true;
enable-remote-toggle = false; enable-remote-toggle = false;
enable-edit-actions = false; enable-edit-actions = false;

134
nixos/modules/services/security/step-ca.nix Normal file
View File

@ -0,0 +1,134 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.step-ca;
settingsFormat = (pkgs.formats.json { });
in
{
meta.maintainers = with lib.maintainers; [ mohe2015 ];
options = {
services.step-ca = {
enable = lib.mkEnableOption "the smallstep certificate authority server";
openFirewall = lib.mkEnableOption "opening the certificate authority server port";
package = lib.mkOption {
type = lib.types.package;
default = pkgs.step-ca;
description = "Which step-ca package to use.";
};
address = lib.mkOption {
type = lib.types.str;
example = "127.0.0.1";
description = ''
The address (without port) the certificate authority should listen at.
This combined with <option>services.step-ca.port</option> overrides <option>services.step-ca.settings.address</option>.
'';
};
port = lib.mkOption {
type = lib.types.port;
example = 8443;
description = ''
The port the certificate authority should listen on.
This combined with <option>services.step-ca.address</option> overrides <option>services.step-ca.settings.address</option>.
'';
};
settings = lib.mkOption {
type = with lib.types; attrsOf anything;
description = ''
Settings that go into <filename>ca.json</filename>. See
<link xlink:href="https://smallstep.com/docs/step-ca/configuration">
the step-ca manual</link> for more information. The easiest way to
configure this module would be to run <literal>step ca init</literal>
to generate <filename>ca.json</filename> and then import it using
<literal>builtins.fromJSON</literal>.
<link xlink:href="https://smallstep.com/docs/step-cli/basic-crypto-operations#run-an-offline-x509-certificate-authority">This article</link>
may also be useful if you want to customize certain aspects of
certificate generation for your CA.
You need to change the database storage path to <filename>/var/lib/step-ca/db</filename>.
<warning>
<para>
The <option>services.step-ca.settings.address</option> option
will be ignored and overwritten by
<option>services.step-ca.address</option> and
<option>services.step-ca.port</option>.
</para>
</warning>
'';
};
intermediatePasswordFile = lib.mkOption {
type = lib.types.path;
example = "/run/keys/smallstep-password";
description = ''
Path to the file containing the password for the intermediate
certificate private key.
<warning>
<para>
Make sure to use a quoted absolute path instead of a path literal
to prevent it from being copied to the globally readable Nix
store.
</para>
</warning>
'';
};
};
};
config = lib.mkIf config.services.step-ca.enable (
let
configFile = settingsFormat.generate "ca.json" (cfg.settings // {
address = cfg.address + ":" + toString cfg.port;
});
in
{
assertions =
[
{
assertion = !lib.isStorePath cfg.intermediatePasswordFile;
message = ''
<option>services.step-ca.intermediatePasswordFile</option> points to
a file in the Nix store. You should use a quoted absolute path to
prevent this.
'';
}
];
systemd.packages = [ cfg.package ];
# configuration file indirection is needed to support reloading
environment.etc."smallstep/ca.json".source = configFile;
systemd.services."step-ca" = {
wantedBy = [ "multi-user.target" ];
restartTriggers = [ configFile ];
unitConfig = {
ConditionFileNotEmpty = ""; # override upstream
};
serviceConfig = {
Environment = "HOME=%S/step-ca";
WorkingDirectory = ""; # override upstream
ReadWriteDirectories = ""; # override upstream
# LocalCredential handles file permission problems arising from the use of DynamicUser.
LoadCredential = "intermediate_password:${cfg.intermediatePasswordFile}";
ExecStart = [
"" # override upstream
"${cfg.package}/bin/step-ca /etc/smallstep/ca.json --password-file \${CREDENTIALS_DIRECTORY}/intermediate_password"
];
# ProtectProc = "invisible"; # not supported by upstream yet
# ProcSubset = "pid"; # not supported by upstream upstream yet
# PrivateUsers = true; # doesn't work with privileged ports therefore not supported by upstream
DynamicUser = true;
StateDirectory = "step-ca";
};
};
networking.firewall = lib.mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.port ];
};
}
);
}

2
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -157,7 +157,7 @@ let
proxy_connect_timeout 60; proxy_connect_timeout 60;
proxy_send_timeout 60; proxy_send_timeout 60;
proxy_read_timeout 60; proxy_read_timeout 60;
proxy_http_version 1.0; proxy_http_version 1.1;
include ${recommendedProxyConfig}; include ${recommendedProxyConfig};
''} ''}

1
nixos/modules/services/x11/window-managers/default.nix
View File

@ -37,6 +37,7 @@ in
./tinywm.nix ./tinywm.nix
./twm.nix ./twm.nix
./windowmaker.nix ./windowmaker.nix
./wmderland.nix
./wmii.nix ./wmii.nix
./xmonad.nix ./xmonad.nix
./yeahwm.nix ./yeahwm.nix

61
nixos/modules/services/x11/window-managers/wmderland.nix Normal file
View File

@ -0,0 +1,61 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.xserver.windowManager.wmderland;
in
{
options.services.xserver.windowManager.wmderland = {
enable = mkEnableOption "wmderland";
extraSessionCommands = mkOption {
default = "";
type = types.lines;
description = ''
Shell commands executed just before wmderland is started.
'';
};
extraPackages = mkOption {
type = with types; listOf package;
default = with pkgs; [
rofi
dunst
light
hsetroot
feh
rxvt-unicode
];
example = literalExample ''
with pkgs; [
rofi
dunst
light
hsetroot
feh
rxvt-unicode
]
'';
description = ''
Extra packages to be installed system wide.
'';
};
};
config = mkIf cfg.enable {
services.xserver.windowManager.session = singleton {
name = "wmderland";
start = ''
${cfg.extraSessionCommands}
${pkgs.wmderland}/bin/wmderland &
waitPID=$!
'';
};
environment.systemPackages = [
pkgs.wmderland pkgs.wmderlandc
] ++ cfg.extraPackages;
};
}

1
nixos/tests/all-tests.nix
View File

@ -433,6 +433,7 @@ in
wasabibackend = handleTest ./wasabibackend.nix {}; wasabibackend = handleTest ./wasabibackend.nix {};
wiki-js = handleTest ./wiki-js.nix {}; wiki-js = handleTest ./wiki-js.nix {};
wireguard = handleTest ./wireguard {}; wireguard = handleTest ./wireguard {};
wmderland = handleTest ./wmderland.nix {};
wordpress = handleTest ./wordpress.nix {}; wordpress = handleTest ./wordpress.nix {};
xandikos = handleTest ./xandikos.nix {}; xandikos = handleTest ./xandikos.nix {};
xautolock = handleTest ./xautolock.nix {}; xautolock = handleTest ./xautolock.nix {};

2
nixos/tests/gitea.nix
View File

@ -61,7 +61,7 @@ let
+ "Please contact your site administrator.'" + "Please contact your site administrator.'"
) )
server.succeed( server.succeed(
"su -l gitea -c 'GITEA_WORK_DIR=/var/lib/gitea gitea admin create-user " "su -l gitea -c 'GITEA_WORK_DIR=/var/lib/gitea gitea admin user create "
+ "--username test --password totallysafe --email test@localhost'" + "--username test --password totallysafe --email test@localhost'"
) )

54
nixos/tests/wmderland.nix Normal file
View File

@ -0,0 +1,54 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "wmderland";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ takagiy ];
};
machine = { lib, ... }: {
imports = [ ./common/x11.nix ./common/user-account.nix ];
test-support.displayManager.auto.user = "alice";
services.xserver.displayManager.defaultSession = lib.mkForce "none+wmderland";
services.xserver.windowManager.wmderland.enable = true;
systemd.services.setupWmderlandConfig = {
wantedBy = [ "multi-user.target" ];
before = [ "multi-user.target" ];
environment = {
HOME = "/home/alice";
};
unitConfig = {
type = "oneshot";
RemainAfterExit = true;
user = "alice";
};
script = let
config = pkgs.writeText "config" ''
set $Mod = Mod1
bindsym $Mod+Return exec ${pkgs.xterm}/bin/xterm -cm -pc
'';
in ''
mkdir -p $HOME/.config/wmderland
cp ${config} $HOME/.config/wmderland/config
'';
};
};
testScript = { ... }: ''
with subtest("ensure x starts"):
machine.wait_for_x()
machine.wait_for_file("/home/alice/.Xauthority")
machine.succeed("xauth merge ~alice/.Xauthority")
with subtest("ensure we can open a new terminal"):
machine.send_key("alt-ret")
machine.wait_until_succeeds("pgrep xterm")
machine.wait_for_window(r"alice.*?machine")
machine.screenshot("terminal")
with subtest("ensure we can communicate through ipc with wmderlandc"):
# Kills the previously open xterm
machine.succeed("pgrep xterm")
machine.execute("DISPLAY=:0 wmderlandc kill")
machine.fail("pgrep xterm")
'';
})

24
pkgs/applications/editors/bonzomatic/default.nix
View File

@ -1,29 +1,33 @@
{ lib, stdenv, makeWrapper, fetchFromGitHub, cmake, alsaLib, mesa_glu, libXcursor, libXinerama, libXrandr, xorgserver }: { lib, stdenv, fetchFromGitHub
, cmake, makeWrapper
, alsaLib, fontconfig, mesa_glu, libXcursor, libXinerama, libXrandr, xorg
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bonzomatic"; pname = "bonzomatic";
version = "2018-03-29"; version = "2021-03-07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Gargaj"; owner = "Gargaj";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "12mdfjvbhdqz1585772rj4cap8m4ijfci6ib62jysxjf747k41fg"; sha256 = "0gbh7kj7irq2hyvlzjgbs9fcns9kamz7g5p6msv12iw75z9yi330";
}; };
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ alsaLib mesa_glu libXcursor libXinerama libXrandr xorgserver ]; buildInputs = [
alsaLib fontconfig mesa_glu
libXcursor libXinerama libXrandr xorg.xinput xorg.libXi xorg.libXext
];
postFixup = '' postFixup = ''
wrapProgram $out/bin/Bonzomatic --prefix LD_LIBRARY_PATH : "${alsaLib}/lib" wrapProgram $out/bin/bonzomatic --prefix LD_LIBRARY_PATH : "${alsaLib}/lib"
''; '';
meta = with lib; { meta = with lib; {
description = "A live-coding tool for writing 2D fragment/pixel shaders"; description = "Live shader coding tool and Shader Showdown workhorse";
license = with licenses; [ homepage = "https://github.com/gargaj/bonzomatic";
unlicense license = licenses.unlicense;
unfreeRedistributable # contains libbass.so in repository
];
maintainers = [ maintainers.ilian ]; maintainers = [ maintainers.ilian ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
}; };

12
pkgs/applications/graphics/mozjpeg/default.nix
View File

@ -1,18 +1,20 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libpng, nasm }: { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libpng, zlib, nasm }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.3.1"; version = "4.0.3";
pname = "mozjpeg"; pname = "mozjpeg";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mozilla"; owner = "mozilla";
repo = "mozjpeg"; repo = "mozjpeg";
rev = "v${version}"; rev = "v${version}";
sha256 = "1na68860asn8b82ny5ilwbhh4nyl9gvx2yxmm4wr2v1v95v51fky"; sha256 = "1wb2ys0yjy6hgpb9qvzjxs7sb2zzs44p6xf7n026mx5nx85hjbyv";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ]; cmakeFlags = [ "-DENABLE_STATIC=NO" "-DPNG_SUPPORTED=TRUE" ]; # See https://github.com/mozilla/mozjpeg/issues/351
buildInputs = [ libpng nasm ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libpng zlib nasm ];
meta = { meta = {
description = "Mozilla JPEG Encoder Project"; description = "Mozilla JPEG Encoder Project";

7
pkgs/applications/graphics/panotools/default.nix
View File

@ -1,11 +1,12 @@
{ fetchurl, lib, stdenv, libjpeg, libpng, libtiff, perl }: { fetchurl, lib, stdenv, libjpeg, libpng, libtiff, perl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libpano13-2.9.19"; pname = "libpano13";
version = "2.9.20";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/panotools/${name}.tar.gz"; url = "mirror://sourceforge/panotools/${pname}-${version}.tar.gz";
sha256 = "1a4m3plmfcrrplqs9zfzhc5apibn10m5sajpizm1sd3q74w5fwq3"; sha256 = "12cv4886l1czfjwy7k6ipgf3zjksgwhdjzr2s9fdg33vqcv2hlrv";
}; };
buildInputs = [ perl libjpeg libpng libtiff ]; buildInputs = [ perl libjpeg libpng libtiff ];

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

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "dasel"; pname = "dasel";
version = "1.13.6"; version = "1.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TomWright"; owner = "TomWright";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-PTi1blbMVsuftLrFIYNDI8ZFEwRxDA53Md9oZTv7nHs="; sha256 = "1g4a001k86myfln0xlzy8w9krwamvfchnvywpr1p3x6iw95z46w8";
}; };
vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY=";

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

@ -5,13 +5,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "pdfarranger"; pname = "pdfarranger";
version = "1.7.0"; version = "1.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0dmgmvpghsm938iznalbg8h8k17a5h3q466yfc67mcll428n4nx3"; sha256 = "1c2mafnz8pv32wzkc2wx4q8y2x7xffpn6ag12dj7ga5n772fb6s3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

86
pkgs/applications/misc/pytrainer/default.nix
View File

@ -1,81 +1,77 @@
{ lib { lib
, fetchFromGitHub
, perl
, python3 , python3
, sqlite , fetchFromGitHub
, gpsbabel , gdk-pixbuf
, gnome3 , gnome3
, gobject-introspection , gpsbabel
, wrapGAppsHook
, gtk3
, xvfb_run
, webkitgtk
, glib-networking , glib-networking
, glibcLocales , glibcLocales
, gobject-introspection
, gtk3
, perl
, sqlite
, tzdata , tzdata
, substituteAll , webkitgtk
, wrapGAppsHook
, xvfb_run
}: }:
let let
# Pytrainer needs a matplotlib with GTK backend. python = python3.override {
matplotlibGtk = python3.pkgs.matplotlib.override { packageOverrides = (self: super: {
enableGtk3 = true; matplotlib = super.matplotlib.override {
enableGtk3 = true;
};
});
}; };
in python.pkgs.buildPythonApplication rec {
in
python3.pkgs.buildPythonApplication rec {
pname = "pytrainer"; pname = "pytrainer";
version = "2.0.1"; version = "2.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pytrainer"; owner = "pytrainer";
repo = "pytrainer"; repo = "pytrainer";
rev = "v${version}"; rev = "v${version}";
sha256 = "0m2sy3f5pyc4wv1ns31r7vlafqkzp0a2jasaskwrkl6273agbbk9"; sha256 = "sha256-i3QC6ct7tS8B0QQjtVqPcd03LLIxo6djQe4YX35syzk=";
}; };
patches = [ propagatedBuildInputs = with python.pkgs; [
(substituteAll {
src = ./fix-paths.patch;
perl = "${perl}/bin/perl";
})
];
postPatch = ''
substituteInPlace ./setup.py \
--replace "'mysqlclient'," ""
'';
propagatedBuildInputs = with python3.pkgs; [
dateutil
lxml
matplotlibGtk
pygobject3
sqlalchemy
sqlalchemy_migrate sqlalchemy_migrate
psycopg2 python-dateutil
requests matplotlib
certifi lxml
setuptools setuptools
requests
gdal
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
gobject-introspection gobject-introspection
wrapGAppsHook wrapGAppsHook
xvfb_run
]; ];
buildInputs = [ buildInputs = [
gpsbabel
sqlite sqlite
gtk3 gtk3
webkitgtk webkitgtk
glib-networking glib-networking
glibcLocales
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
gdk-pixbuf
]; ];
makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ perl gpsbabel ])
];
checkInputs = [
glibcLocales
perl
xvfb_run
] ++ (with python.pkgs; [
mysqlclient
psycopg2
]);
checkPhase = '' checkPhase = ''
env HOME=$TEMPDIR TZDIR=${tzdata}/share/zoneinfo \ env HOME=$TEMPDIR TZDIR=${tzdata}/share/zoneinfo \
TZ=Europe/Kaliningrad \ TZ=Europe/Kaliningrad \
@ -85,9 +81,9 @@ python3.pkgs.buildPythonApplication rec {
''; '';
meta = with lib; { meta = with lib; {
homepage = "https://github.com/pytrainer/pytrainer/wiki"; homepage = "https://github.com/pytrainer/pytrainer";
description = "Application for logging and graphing sporting excursions"; description = "Application for logging and graphing sporting excursions";
maintainers = [ maintainers.rycee ]; maintainers = with maintainers; [ rycee dotlambda ];
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };

11
pkgs/applications/misc/pytrainer/fix-paths.patch
View File

@ -1,11 +0,0 @@
--- a/imports/file_garminfit.py
+++ b/imports/file_garminfit.py
@@ -81,7 +81,7 @@
logging.debug(">>")
result = False
try:
- result = subprocess.check_output(["perl",
+ result = subprocess.check_output(["@perl@",
self.main_data_path+"plugins/garmin-fit/bin/fit2tcx",
filename])
except subprocess.CalledProcessError:

6
pkgs/applications/misc/qdirstat/default.nix
View File

@ -4,13 +4,13 @@
let let
pname = "qdirstat"; pname = "qdirstat";
version = "1.7"; version = "1.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shundhammer"; owner = "shundhammer";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "163x3fxra0l3vvrzm25mh7jvcwjbmwsqlpppkxx76mkz9a1769fy"; sha256 = "sha256-i1xHMwSnBULJbOA/ykQK9WBd+6TBNBRI9hnU1FDGQlY=";
}; };
in in
@ -50,7 +50,7 @@ mkDerivation {
meta = with lib; { meta = with lib; {
description = "Graphical disk usage analyzer"; description = "Graphical disk usage analyzer";
homepage = src.meta.homepage; homepage = src.meta.homepage;
license = licenses.gpl2; license = licenses.gpl2Plus;
maintainers = with maintainers; [ gnidorah ]; maintainers = with maintainers; [ gnidorah ];
platforms = platforms.linux; platforms = platforms.linux;
}; };

2
pkgs/applications/misc/qlcplus/default.nix
View File

@ -29,6 +29,8 @@ mkDerivation rec {
qmakeFlags = [ "INSTALLROOT=$(out)" ]; qmakeFlags = [ "INSTALLROOT=$(out)" ];
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
postPatch = '' postPatch = ''
patchShebangs . patchShebangs .
sed -i -e '/unix:!macx:INSTALLROOT += \/usr/d' \ sed -i -e '/unix:!macx:INSTALLROOT += \/usr/d' \

8
pkgs/applications/networking/cluster/waypoint/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec { buildGoModule rec {
pname = "waypoint"; pname = "waypoint";
version = "0.2.4"; version = "0.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-6sV2e/m0qVSRWgdvVZ9VxEL/J57nTcTClxHF5X8/8PQ="; sha256 = "sha256-lB9ELa/okNvtKFDP/vImEdYFJCKRgtAcpBG1kIoAysE=";
}; };
deleteVendor = true; deleteVendor = true;
vendorSha256 = "sha256-NPE3YHulqllWDGrxQgPmy/KKE7xFPOUorLQNIU8cP50="; vendorSha256 = "sha256-VxKUYD92DssoSjWxR+1gZLq34vCVM/4U2ju5felLWzI=";
nativeBuildInputs = [ go-bindata ]; nativeBuildInputs = [ go-bindata ];
@ -36,7 +36,7 @@ buildGoModule rec {
export HOME="$TMPDIR" export HOME="$TMPDIR"
$out/bin/waypoint --help $out/bin/waypoint --help
$out/bin/waypoint version # | grep "Waypoint v${version}" $out/bin/waypoint version | grep "Waypoint v${version}"
runHook postInstallCheck runHook postInstallCheck
''; '';

8
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View File

@ -2,7 +2,7 @@
"name": "element-desktop", "name": "element-desktop",
"productName": "Element", "productName": "Element",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "1.7.24", "version": "1.7.25",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "Element", "author": "Element",
"repository": { "repository": {
@ -39,8 +39,8 @@
}, },
"devDependencies": { "devDependencies": {
"asar": "^2.0.1", "asar": "^2.0.1",
"electron-builder": "22.9.1", "electron-builder": "22.10.5",
"electron-builder-squirrel-windows": "22.9.1", "electron-builder-squirrel-windows": "22.10.5",
"electron-devtools-installer": "^3.1.1", "electron-devtools-installer": "^3.1.1",
"electron-notarize": "^1.0.0", "electron-notarize": "^1.0.0",
"eslint": "7.3.1", "eslint": "7.3.1",
@ -62,7 +62,7 @@
}, },
"build": { "build": {
"appId": "im.riot.app", "appId": "im.riot.app",
"electronVersion": "11.2.3", "electronVersion": "12.0.2",
"files": [ "files": [
"package.json", "package.json",
{ {

584
pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
View File

@ -9,6 +9,14 @@
sha1 = "bc5b5532ecafd923a61f2fb097e3b108c0106a3f"; sha1 = "bc5b5532ecafd923a61f2fb097e3b108c0106a3f";
}; };
} }
{
name = "7zip_bin___7zip_bin_5.1.1.tgz";
path = fetchurl {
name = "7zip_bin___7zip_bin_5.1.1.tgz";
url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz";
sha1 = "9274ec7460652f9c632c59addf24efb1684ef876";
};
}
{ {
name = "_babel_code_frame___code_frame_7.5.5.tgz"; name = "_babel_code_frame___code_frame_7.5.5.tgz";
path = fetchurl { path = fetchurl {
@ -129,6 +137,14 @@
sha1 = "3ece22c5838402419a6e0425f85742b961d9b6c6"; sha1 = "3ece22c5838402419a6e0425f85742b961d9b6c6";
}; };
} }
{
name = "_electron_universal___universal_1.0.4.tgz";
path = fetchurl {
name = "_electron_universal___universal_1.0.4.tgz";
url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.4.tgz";
sha1 = "231ac246c39d45b80e159bd21c3f9027dcaa10f5";
};
}
{ {
name = "_iarna_cli___cli_1.2.0.tgz"; name = "_iarna_cli___cli_1.2.0.tgz";
path = fetchurl { path = fetchurl {
@ -385,6 +401,14 @@
sha1 = "2f51e6f14ff8307c4aa83d5e1a277da14a9fe3f7"; sha1 = "2f51e6f14ff8307c4aa83d5e1a277da14a9fe3f7";
}; };
} }
{
name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz";
path = fetchurl {
name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz";
url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz";
sha1 = "504af200af6b98e198bce768bc1730c6936ae01d";
};
}
{ {
name = "_sindresorhus_is___is_0.14.0.tgz"; name = "_sindresorhus_is___is_0.14.0.tgz";
path = fetchurl { path = fetchurl {
@ -426,11 +450,19 @@
}; };
} }
{ {
name = "_types_fs_extra___fs_extra_9.0.1.tgz"; name = "_types_fs_extra___fs_extra_9.0.9.tgz";
path = fetchurl { path = fetchurl {
name = "_types_fs_extra___fs_extra_9.0.1.tgz"; name = "_types_fs_extra___fs_extra_9.0.9.tgz";
url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.1.tgz"; url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.9.tgz";
sha1 = "91c8fc4c51f6d5dbe44c2ca9ab09310bd00c7918"; sha1 = "11ed43b3f3c6b3490f1ef9bd17f58da896e2d861";
};
}
{
name = "_types_glob___glob_7.1.3.tgz";
path = fetchurl {
name = "_types_glob___glob_7.1.3.tgz";
url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz";
sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183";
}; };
} }
{ {
@ -449,6 +481,14 @@
sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee";
}; };
} }
{
name = "_types_minimatch___minimatch_3.0.4.tgz";
path = fetchurl {
name = "_types_minimatch___minimatch_3.0.4.tgz";
url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz";
sha1 = "f0ec25dbf2f0e4b18647313ac031134ca5b24b21";
};
}
{ {
name = "_types_node___node_13.7.1.tgz"; name = "_types_node___node_13.7.1.tgz";
path = fetchurl { path = fetchurl {
@ -465,6 +505,22 @@
sha1 = "d934aacc22424fe9622ebf6857370c052eae464e"; sha1 = "d934aacc22424fe9622ebf6857370c052eae464e";
}; };
} }
{
name = "_types_plist___plist_3.0.2.tgz";
path = fetchurl {
name = "_types_plist___plist_3.0.2.tgz";
url = "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz";
sha1 = "61b3727bba0f5c462fe333542534a0c3e19ccb01";
};
}
{
name = "_types_verror___verror_1.10.4.tgz";
path = fetchurl {
name = "_types_verror___verror_1.10.4.tgz";
url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.4.tgz";
sha1 = "805c0612b3a0c124cf99f517364142946b74ba3b";
};
}
{ {
name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; name = "_types_yargs_parser___yargs_parser_15.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -474,11 +530,11 @@
}; };
} }
{ {
name = "_types_yargs___yargs_15.0.5.tgz"; name = "_types_yargs___yargs_15.0.13.tgz";
path = fetchurl { path = fetchurl {
name = "_types_yargs___yargs_15.0.5.tgz"; name = "_types_yargs___yargs_15.0.13.tgz";
url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz"; url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz";
sha1 = "947e9a6561483bdee9adffc983e91a6902af8b79"; sha1 = "34f7fec8b389d7f3c1fd08026a5763e072d3c6dc";
}; };
} }
{ {
@ -738,19 +794,19 @@
}; };
} }
{ {
name = "app_builder_bin___app_builder_bin_3.5.10.tgz"; name = "app_builder_bin___app_builder_bin_3.5.12.tgz";
path = fetchurl { path = fetchurl {
name = "app_builder_bin___app_builder_bin_3.5.10.tgz"; name = "app_builder_bin___app_builder_bin_3.5.12.tgz";
url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.10.tgz"; url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.12.tgz";
sha1 = "4a7f9999fccc0c435b6284ae1366bc76a17c4a7d"; sha1 = "bbe174972cc1f481f73d6d92ad47a8b4c7eb4530";
}; };
} }
{ {
name = "app_builder_lib___app_builder_lib_22.9.1.tgz"; name = "app_builder_lib___app_builder_lib_22.10.5.tgz";
path = fetchurl { path = fetchurl {
name = "app_builder_lib___app_builder_lib_22.9.1.tgz"; name = "app_builder_lib___app_builder_lib_22.10.5.tgz";
url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.9.1.tgz"; url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.5.tgz";
sha1 = "ccb8f1a02b628514a5dfab9401fa2a976689415c"; sha1 = "24a88581c891e5b187a0d569aa44e7c4a0dc8de2";
}; };
} }
{ {
@ -786,11 +842,11 @@
}; };
} }
{ {
name = "archiver___archiver_5.2.0.tgz"; name = "archiver___archiver_5.3.0.tgz";
path = fetchurl { path = fetchurl {
name = "archiver___archiver_5.2.0.tgz"; name = "archiver___archiver_5.3.0.tgz";
url = "https://registry.yarnpkg.com/archiver/-/archiver-5.2.0.tgz"; url = "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz";
sha1 = "25aa1b3d9febf7aec5b0f296e77e69960c26db94"; sha1 = "dd3e097624481741df626267564f7dd8640a45ba";
}; };
} }
{ {
@ -817,6 +873,14 @@
sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911";
}; };
} }
{
name = "argparse___argparse_2.0.1.tgz";
path = fetchurl {
name = "argparse___argparse_2.0.1.tgz";
url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz";
sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38";
};
}
{ {
name = "array_includes___array_includes_3.1.1.tgz"; name = "array_includes___array_includes_3.1.1.tgz";
path = fetchurl { path = fetchurl {
@ -857,6 +921,14 @@
sha1 = "8518a1c62c238109c15a5f742213e83a09b9fd38"; sha1 = "8518a1c62c238109c15a5f742213e83a09b9fd38";
}; };
} }
{
name = "asar___asar_3.0.3.tgz";
path = fetchurl {
name = "asar___asar_3.0.3.tgz";
url = "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz";
sha1 = "1fef03c2d6d2de0cbad138788e4f7ae03b129c7b";
};
}
{ {
name = "asn1___asn1_0.2.4.tgz"; name = "asn1___asn1_0.2.4.tgz";
path = fetchurl { path = fetchurl {
@ -977,6 +1049,14 @@
sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"; sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1";
}; };
} }
{
name = "base64_js___base64_js_1.5.1.tgz";
path = fetchurl {
name = "base64_js___base64_js_1.5.1.tgz";
url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz";
sha1 = "1b1b440160a5bf7ad40b650f095963481903930a";
};
}
{ {
name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz";
path = fetchurl { path = fetchurl {
@ -1001,6 +1081,14 @@
sha1 = "bd39aadab5dc4bdac222a07df5baf1af745b2228"; sha1 = "bd39aadab5dc4bdac222a07df5baf1af745b2228";
}; };
} }
{
name = "binaryextensions___binaryextensions_4.15.0.tgz";
path = fetchurl {
name = "binaryextensions___binaryextensions_4.15.0.tgz";
url = "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-4.15.0.tgz";
sha1 = "c63a502e0078ff1b0e9b00a9f74d3c2b0f8bd32e";
};
}
{ {
name = "bl___bl_4.0.3.tgz"; name = "bl___bl_4.0.3.tgz";
path = fetchurl { path = fetchurl {
@ -1042,11 +1130,11 @@
}; };
} }
{ {
name = "boxen___boxen_4.2.0.tgz"; name = "boxen___boxen_5.0.0.tgz";
path = fetchurl { path = fetchurl {
name = "boxen___boxen_4.2.0.tgz"; name = "boxen___boxen_5.0.0.tgz";
url = "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz"; url = "https://registry.yarnpkg.com/boxen/-/boxen-5.0.0.tgz";
sha1 = "e411b62357d6d6d36587c8ac3d5d974daa070e64"; sha1 = "64fe9b16066af815f51057adcc800c3730120854";
}; };
} }
{ {
@ -1073,6 +1161,14 @@
sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b";
}; };
} }
{
name = "buffer_equal___buffer_equal_1.0.0.tgz";
path = fetchurl {
name = "buffer_equal___buffer_equal_1.0.0.tgz";
url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz";
sha1 = "59616b498304d556abd466966b22eeda3eca5fbe";
};
}
{ {
name = "buffer_from___buffer_from_1.1.1.tgz"; name = "buffer_from___buffer_from_1.1.1.tgz";
path = fetchurl { path = fetchurl {
@ -1081,6 +1177,14 @@
sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef";
}; };
} }
{
name = "buffer___buffer_5.7.1.tgz";
path = fetchurl {
name = "buffer___buffer_5.7.1.tgz";
url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz";
sha1 = "ba62e7c13133053582197160851a8f648e99eed0";
};
}
{ {
name = "buffer___buffer_5.6.0.tgz"; name = "buffer___buffer_5.6.0.tgz";
path = fetchurl { path = fetchurl {
@ -1090,19 +1194,19 @@
}; };
} }
{ {
name = "builder_util_runtime___builder_util_runtime_8.7.2.tgz"; name = "builder_util_runtime___builder_util_runtime_8.7.3.tgz";
path = fetchurl { path = fetchurl {
name = "builder_util_runtime___builder_util_runtime_8.7.2.tgz"; name = "builder_util_runtime___builder_util_runtime_8.7.3.tgz";
url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz"; url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.3.tgz";
sha1 = "d93afc71428a12789b437e13850e1fa7da956d72"; sha1 = "0aaafa52d25295c939496f62231ca9ff06c30e40";
}; };
} }
{ {
name = "builder_util___builder_util_22.9.1.tgz"; name = "builder_util___builder_util_22.10.5.tgz";
path = fetchurl { path = fetchurl {
name = "builder_util___builder_util_22.9.1.tgz"; name = "builder_util___builder_util_22.10.5.tgz";
url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.9.1.tgz"; url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.5.tgz";
sha1 = "b7087a5cde477f90d718ca5d7fafb6ae261b16af"; sha1 = "8d0b04a3be6acc74938679aa90dcb3181b1ae86b";
}; };
} }
{ {
@ -1177,6 +1281,14 @@
sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; sha1 = "e3c9b31569e106811df242f715725a1f4c494320";
}; };
} }
{
name = "camelcase___camelcase_6.2.0.tgz";
path = fetchurl {
name = "camelcase___camelcase_6.2.0.tgz";
url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz";
sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809";
};
}
{ {
name = "capture_stack_trace___capture_stack_trace_1.0.1.tgz"; name = "capture_stack_trace___capture_stack_trace_1.0.1.tgz";
path = fetchurl { path = fetchurl {
@ -1201,14 +1313,6 @@
sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; sha1 = "cd42541677a54333cf541a49108c1432b44c9424";
}; };
} }
{
name = "chalk___chalk_3.0.0.tgz";
path = fetchurl {
name = "chalk___chalk_3.0.0.tgz";
url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz";
sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4";
};
}
{ {
name = "chalk___chalk_4.1.0.tgz"; name = "chalk___chalk_4.1.0.tgz";
path = fetchurl { path = fetchurl {
@ -1282,11 +1386,11 @@
}; };
} }
{ {
name = "cli_boxes___cli_boxes_2.2.0.tgz"; name = "cli_boxes___cli_boxes_2.2.1.tgz";
path = fetchurl { path = fetchurl {
name = "cli_boxes___cli_boxes_2.2.0.tgz"; name = "cli_boxes___cli_boxes_2.2.1.tgz";
url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz"; url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz";
sha1 = "538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"; sha1 = "ddd5035d25094fce220e9cab40a45840a440318f";
}; };
} }
{ {
@ -1313,6 +1417,14 @@
sha1 = "0252372d94dfc40dbd8df06005f48f31f656f202"; sha1 = "0252372d94dfc40dbd8df06005f48f31f656f202";
}; };
} }
{
name = "cli_truncate___cli_truncate_1.1.0.tgz";
path = fetchurl {
name = "cli_truncate___cli_truncate_1.1.0.tgz";
url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz";
sha1 = "2b2dfd83c53cfd3572b87fc4d430a808afb04086";
};
}
{ {
name = "cli_width___cli_width_3.0.0.tgz"; name = "cli_width___cli_width_3.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -1409,6 +1521,14 @@
sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2";
}; };
} }
{
name = "colors___colors_1.0.3.tgz";
path = fetchurl {
name = "colors___colors_1.0.3.tgz";
url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz";
sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
};
}
{ {
name = "colors___colors_1.4.0.tgz"; name = "colors___colors_1.4.0.tgz";
path = fetchurl { path = fetchurl {
@ -1433,6 +1553,14 @@
sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f";
}; };
} }
{
name = "commander___commander_2.9.0.tgz";
path = fetchurl {
name = "commander___commander_2.9.0.tgz";
url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz";
sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
};
}
{ {
name = "commander___commander_2.20.3.tgz"; name = "commander___commander_2.20.3.tgz";
path = fetchurl { path = fetchurl {
@ -1442,11 +1570,19 @@
}; };
} }
{ {
name = "compress_commons___compress_commons_4.0.2.tgz"; name = "commander___commander_5.1.0.tgz";
path = fetchurl { path = fetchurl {
name = "compress_commons___compress_commons_4.0.2.tgz"; name = "commander___commander_5.1.0.tgz";
url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz";
sha1 = "d6896be386e52f37610cef9e6fa5defc58c31bd7"; sha1 = "46abbd1652f8e059bddaef99bbdcb2ad9cf179ae";
};
}
{
name = "compress_commons___compress_commons_4.1.0.tgz";
path = fetchurl {
name = "compress_commons___compress_commons_4.1.0.tgz";
url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.0.tgz";
sha1 = "25ec7a4528852ccd1d441a7d4353cd0ece11371b";
}; };
} }
{ {
@ -1545,6 +1681,14 @@
sha1 = "0f047d74041737f8a55e86837a1b826bd8ab0067"; sha1 = "0f047d74041737f8a55e86837a1b826bd8ab0067";
}; };
} }
{
name = "crc___crc_3.8.0.tgz";
path = fetchurl {
name = "crc___crc_3.8.0.tgz";
url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz";
sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6";
};
}
{ {
name = "create_error_class___create_error_class_3.0.2.tgz"; name = "create_error_class___create_error_class_3.0.2.tgz";
path = fetchurl { path = fetchurl {
@ -1665,6 +1809,14 @@
sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee";
}; };
} }
{
name = "debug___debug_4.3.2.tgz";
path = fetchurl {
name = "debug___debug_4.3.2.tgz";
url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz";
sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b";
};
}
{ {
name = "debuglog___debuglog_1.0.1.tgz"; name = "debuglog___debuglog_1.0.1.tgz";
path = fetchurl { path = fetchurl {
@ -1786,11 +1938,27 @@
}; };
} }
{ {
name = "dmg_builder___dmg_builder_22.9.1.tgz"; name = "dir_compare___dir_compare_2.4.0.tgz";
path = fetchurl { path = fetchurl {
name = "dmg_builder___dmg_builder_22.9.1.tgz"; name = "dir_compare___dir_compare_2.4.0.tgz";
url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.9.1.tgz"; url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz";
sha1 = "64647224f37ee47fc9bd01947c21cc010a30511f"; sha1 = "785c41dc5f645b34343a4eafc50b79bac7f11631";
};
}
{
name = "dmg_builder___dmg_builder_22.10.5.tgz";
path = fetchurl {
name = "dmg_builder___dmg_builder_22.10.5.tgz";
url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.5.tgz";
sha1 = "65a33c106ead5a350c7de8997c546559bd6e0e7c";
};
}
{
name = "dmg_license___dmg_license_1.0.8.tgz";
path = fetchurl {
name = "dmg_license___dmg_license_1.0.8.tgz";
url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.8.tgz";
sha1 = "d52e234815f1a07a59706e5f2a2fea71991cf784";
}; };
} }
{ {
@ -1889,6 +2057,14 @@
sha1 = "3a83a904e54353287874c564b7549386849a98c9"; sha1 = "3a83a904e54353287874c564b7549386849a98c9";
}; };
} }
{
name = "editions___editions_6.1.0.tgz";
path = fetchurl {
name = "editions___editions_6.1.0.tgz";
url = "https://registry.yarnpkg.com/editions/-/editions-6.1.0.tgz";
sha1 = "ba6c6cf9f4bb571d9e53ea34e771a602e5a66549";
};
}
{ {
name = "editor___editor_1.0.0.tgz"; name = "editor___editor_1.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -1898,27 +2074,27 @@
}; };
} }
{ {
name = "ejs___ejs_3.1.5.tgz"; name = "ejs___ejs_3.1.6.tgz";
path = fetchurl { path = fetchurl {
name = "ejs___ejs_3.1.5.tgz"; name = "ejs___ejs_3.1.6.tgz";
url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz"; url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz";
sha1 = "aed723844dc20acb4b170cd9ab1017e476a0d93b"; sha1 = "5bfd0a0689743bb5268b3550cceeebbc1702822a";
}; };
} }
{ {
name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.9.1.tgz"; name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.10.5.tgz";
path = fetchurl { path = fetchurl {
name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.9.1.tgz"; name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.10.5.tgz";
url = "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-22.9.1.tgz"; url = "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-22.10.5.tgz";
sha1 = "d9ad65a8f5abd1011ac1dbd01492623fb5466a32"; sha1 = "83d3bf498110341a522cc5263fb4474ae6e05caf";
}; };
} }
{ {
name = "electron_builder___electron_builder_22.9.1.tgz"; name = "electron_builder___electron_builder_22.10.5.tgz";
path = fetchurl { path = fetchurl {
name = "electron_builder___electron_builder_22.9.1.tgz"; name = "electron_builder___electron_builder_22.10.5.tgz";
url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.9.1.tgz"; url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.5.tgz";
sha1 = "a2962db6f2757bc01d02489f38fafe0809f68f60"; sha1 = "03b156b93e6012609027c3aaa69201a3ad21e454";
}; };
} }
{ {
@ -1938,11 +2114,11 @@
}; };
} }
{ {
name = "electron_publish___electron_publish_22.9.1.tgz"; name = "electron_publish___electron_publish_22.10.5.tgz";
path = fetchurl { path = fetchurl {
name = "electron_publish___electron_publish_22.9.1.tgz"; name = "electron_publish___electron_publish_22.10.5.tgz";
url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.9.1.tgz"; url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.5.tgz";
sha1 = "7cc76ac4cc53efd29ee31c1e5facb9724329068e"; sha1 = "9cbe46266b6c79d8c6e99840755682e2262d3543";
}; };
} }
{ {
@ -2017,6 +2193,14 @@
sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960";
}; };
} }
{
name = "errlop___errlop_4.1.0.tgz";
path = fetchurl {
name = "errlop___errlop_4.1.0.tgz";
url = "https://registry.yarnpkg.com/errlop/-/errlop-4.1.0.tgz";
sha1 = "8e7b8f4f1bf0a6feafce4d14f0c0cf4bf5ef036b";
};
}
{ {
name = "errno___errno_0.1.7.tgz"; name = "errno___errno_0.1.7.tgz";
path = fetchurl { path = fetchurl {
@ -2569,6 +2753,14 @@
sha1 = "910da0062437ba4c39fedd863f1675ccfefcb9fc"; sha1 = "910da0062437ba4c39fedd863f1675ccfefcb9fc";
}; };
} }
{
name = "fs_extra___fs_extra_9.1.0.tgz";
path = fetchurl {
name = "fs_extra___fs_extra_9.1.0.tgz";
url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz";
sha1 = "5954460c764a8da2094ba3554bf839e6b9a7c86d";
};
}
{ {
name = "fs_minipass___fs_minipass_1.2.7.tgz"; name = "fs_minipass___fs_minipass_1.2.7.tgz";
path = fetchurl { path = fetchurl {
@ -2738,11 +2930,11 @@
}; };
} }
{ {
name = "global_dirs___global_dirs_2.0.1.tgz"; name = "global_dirs___global_dirs_3.0.0.tgz";
path = fetchurl { path = fetchurl {
name = "global_dirs___global_dirs_2.0.1.tgz"; name = "global_dirs___global_dirs_3.0.0.tgz";
url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz"; url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz";
sha1 = "acdf3bb6685bcd55cb35e8a052266569e9469201"; sha1 = "70a76fe84ea315ab37b1f5576cbde7d48ef72686";
}; };
} }
{ {
@ -2801,6 +2993,14 @@
sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb";
}; };
} }
{
name = "graceful_readlink___graceful_readlink_1.0.1.tgz";
path = fetchurl {
name = "graceful_readlink___graceful_readlink_1.0.1.tgz";
url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
};
}
{ {
name = "har_schema___har_schema_2.0.0.tgz"; name = "har_schema___har_schema_2.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -2890,11 +3090,19 @@
}; };
} }
{ {
name = "hosted_git_info___hosted_git_info_3.0.7.tgz"; name = "hosted_git_info___hosted_git_info_3.0.8.tgz";
path = fetchurl { path = fetchurl {
name = "hosted_git_info___hosted_git_info_3.0.7.tgz"; name = "hosted_git_info___hosted_git_info_3.0.8.tgz";
url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz"; url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz";
sha1 = "a30727385ea85acfcee94e0aad9e368c792e036c"; sha1 = "6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d";
};
}
{
name = "hosted_git_info___hosted_git_info_4.0.2.tgz";
path = fetchurl {
name = "hosted_git_info___hosted_git_info_4.0.2.tgz";
url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz";
sha1 = "5e425507eede4fea846b7262f0838456c4209961";
}; };
} }
{ {
@ -2945,6 +3153,14 @@
sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed";
}; };
} }
{
name = "iconv_corefoundation___iconv_corefoundation_1.1.5.tgz";
path = fetchurl {
name = "iconv_corefoundation___iconv_corefoundation_1.1.5.tgz";
url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.5.tgz";
sha1 = "90596d444a579aeb109f5ca113f6bb665a41be2b";
};
}
{ {
name = "iconv_lite___iconv_lite_0.4.24.tgz"; name = "iconv_lite___iconv_lite_0.4.24.tgz";
path = fetchurl { path = fetchurl {
@ -2961,6 +3177,14 @@
sha1 = "ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"; sha1 = "ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01";
}; };
} }
{
name = "ieee754___ieee754_1.2.1.tgz";
path = fetchurl {
name = "ieee754___ieee754_1.2.1.tgz";
url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz";
sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352";
};
}
{ {
name = "ieee754___ieee754_1.1.13.tgz"; name = "ieee754___ieee754_1.1.13.tgz";
path = fetchurl { path = fetchurl {
@ -3065,6 +3289,14 @@
sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c";
}; };
} }
{
name = "ini___ini_2.0.0.tgz";
path = fetchurl {
name = "ini___ini_2.0.0.tgz";
url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz";
sha1 = "e5fd556ecdd5726be978fa1001862eacb0a94bc5";
};
}
{ {
name = "ini___ini_1.3.8.tgz"; name = "ini___ini_1.3.8.tgz";
path = fetchurl { path = fetchurl {
@ -3169,6 +3401,14 @@
sha1 = "72e233d8e1c4cd1d3f11713fcce3eba7b0e3476f"; sha1 = "72e233d8e1c4cd1d3f11713fcce3eba7b0e3476f";
}; };
} }
{
name = "is_core_module___is_core_module_2.2.0.tgz";
path = fetchurl {
name = "is_core_module___is_core_module_2.2.0.tgz";
url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz";
sha1 = "97037ef3d52224d85163f5597b2b63d9afed981a";
};
}
{ {
name = "is_date_object___is_date_object_1.0.1.tgz"; name = "is_date_object___is_date_object_1.0.1.tgz";
path = fetchurl { path = fetchurl {
@ -3234,11 +3474,11 @@
}; };
} }
{ {
name = "is_installed_globally___is_installed_globally_0.3.1.tgz"; name = "is_installed_globally___is_installed_globally_0.4.0.tgz";
path = fetchurl { path = fetchurl {
name = "is_installed_globally___is_installed_globally_0.3.1.tgz"; name = "is_installed_globally___is_installed_globally_0.4.0.tgz";
url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.1.tgz"; url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz";
sha1 = "679afef819347a72584617fd19497f010b8ed35f"; sha1 = "9a0fd407949c30f86eb6959ef1b7994ed0b7b520";
}; };
} }
{ {
@ -3250,11 +3490,11 @@
}; };
} }
{ {
name = "is_npm___is_npm_4.0.0.tgz"; name = "is_npm___is_npm_5.0.0.tgz";
path = fetchurl { path = fetchurl {
name = "is_npm___is_npm_4.0.0.tgz"; name = "is_npm___is_npm_5.0.0.tgz";
url = "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz"; url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz";
sha1 = "c90dd8380696df87a7a6d823c20d0b12bbe3c84d"; sha1 = "43e8d65cc56e1b67f8d47262cf667099193f45a8";
}; };
} }
{ {
@ -3282,11 +3522,11 @@
}; };
} }
{ {
name = "is_path_inside___is_path_inside_3.0.2.tgz"; name = "is_path_inside___is_path_inside_3.0.3.tgz";
path = fetchurl { path = fetchurl {
name = "is_path_inside___is_path_inside_3.0.2.tgz"; name = "is_path_inside___is_path_inside_3.0.3.tgz";
url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz"; url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz";
sha1 = "f5220fc82a3e233757291dddc9c5877f2a1f3017"; sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283";
}; };
} }
{ {
@ -3377,14 +3617,6 @@
sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
}; };
} }
{
name = "isbinaryfile___isbinaryfile_4.0.6.tgz";
path = fetchurl {
name = "isbinaryfile___isbinaryfile_4.0.6.tgz";
url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz";
sha1 = "edcb62b224e2b4710830b67498c8e4e5a4d2610b";
};
}
{ {
name = "isexe___isexe_2.0.0.tgz"; name = "isexe___isexe_2.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -3401,6 +3633,14 @@
sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
}; };
} }
{
name = "istextorbinary___istextorbinary_5.12.0.tgz";
path = fetchurl {
name = "istextorbinary___istextorbinary_5.12.0.tgz";
url = "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-5.12.0.tgz";
sha1 = "2f84777838668fdf524c305a2363d6057aaeec84";
};
}
{ {
name = "jake___jake_10.8.2.tgz"; name = "jake___jake_10.8.2.tgz";
path = fetchurl { path = fetchurl {
@ -3442,11 +3682,11 @@
}; };
} }
{ {
name = "js_yaml___js_yaml_3.14.0.tgz"; name = "js_yaml___js_yaml_4.0.0.tgz";
path = fetchurl { path = fetchurl {
name = "js_yaml___js_yaml_3.14.0.tgz"; name = "js_yaml___js_yaml_4.0.0.tgz";
url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz"; url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz";
sha1 = "a7a34170f26a21bb162424d8adacb4113a69e482"; sha1 = "f426bc0ff4b4051926cd588c71113183409a121f";
}; };
} }
{ {
@ -4018,11 +4258,11 @@
}; };
} }
{ {
name = "mime___mime_2.5.0.tgz"; name = "mime___mime_2.5.2.tgz";
path = fetchurl { path = fetchurl {
name = "mime___mime_2.5.0.tgz"; name = "mime___mime_2.5.2.tgz";
url = "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz"; url = "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz";
sha1 = "2b4af934401779806ee98026bb42e8c1ae1876b1"; sha1 = "6e3dc6cc2b9510643830e5f19d5cb753da5eeabe";
}; };
} }
{ {
@ -4217,6 +4457,14 @@
sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366";
}; };
} }
{
name = "node_addon_api___node_addon_api_1.7.2.tgz";
path = fetchurl {
name = "node_addon_api___node_addon_api_1.7.2.tgz";
url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz";
sha1 = "3df30b95720b53c24e59948b49532b662444f54d";
};
}
{ {
name = "node_fetch_npm___node_fetch_npm_2.0.2.tgz"; name = "node_fetch_npm___node_fetch_npm_2.0.2.tgz";
path = fetchurl { path = fetchurl {
@ -4273,6 +4521,14 @@
sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8";
}; };
} }
{
name = "normalize_package_data___normalize_package_data_3.0.2.tgz";
path = fetchurl {
name = "normalize_package_data___normalize_package_data_3.0.2.tgz";
url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz";
sha1 = "cae5c410ae2434f9a6c1baa65d5bc3b9366c8699";
};
}
{ {
name = "normalize_path___normalize_path_3.0.0.tgz"; name = "normalize_path___normalize_path_3.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -4865,6 +5121,14 @@
sha1 = "100ec235cc150e4fd42519412596a28512a0def5"; sha1 = "100ec235cc150e4fd42519412596a28512a0def5";
}; };
} }
{
name = "plist___plist_3.0.2.tgz";
path = fetchurl {
name = "plist___plist_3.0.2.tgz";
url = "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz";
sha1 = "74bbf011124b90421c22d15779cee60060ba95bc";
};
}
{ {
name = "png_to_ico___png_to_ico_2.1.1.tgz"; name = "png_to_ico___png_to_ico_2.1.1.tgz";
path = fetchurl { path = fetchurl {
@ -5066,11 +5330,11 @@
}; };
} }
{ {
name = "pupa___pupa_2.0.1.tgz"; name = "pupa___pupa_2.1.1.tgz";
path = fetchurl { path = fetchurl {
name = "pupa___pupa_2.0.1.tgz"; name = "pupa___pupa_2.1.1.tgz";
url = "https://registry.yarnpkg.com/pupa/-/pupa-2.0.1.tgz"; url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz";
sha1 = "dbdc9ff48ffbea4a26a069b6f9f7abb051008726"; sha1 = "f5e8fd4afc2c5d97828faa523549ed8744a20d62";
}; };
} }
{ {
@ -5353,6 +5617,14 @@
sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444";
}; };
} }
{
name = "resolve___resolve_1.20.0.tgz";
path = fetchurl {
name = "resolve___resolve_1.20.0.tgz";
url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz";
sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975";
};
}
{ {
name = "responselike___responselike_1.0.2.tgz"; name = "responselike___responselike_1.0.2.tgz";
path = fetchurl { path = fetchurl {
@ -5601,6 +5873,14 @@
sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
}; };
} }
{
name = "slice_ansi___slice_ansi_1.0.0.tgz";
path = fetchurl {
name = "slice_ansi___slice_ansi_1.0.0.tgz";
url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz";
sha1 = "044f1a49d8842ff307aad6b505ed178bd950134d";
};
}
{ {
name = "slice_ansi___slice_ansi_2.1.0.tgz"; name = "slice_ansi___slice_ansi_2.1.0.tgz";
path = fetchurl { path = fetchurl {
@ -6017,14 +6297,6 @@
sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; sha1 = "458b83887f288fc56d6fffbfad262e26638efa69";
}; };
} }
{
name = "term_size___term_size_2.2.0.tgz";
path = fetchurl {
name = "term_size___term_size_2.2.0.tgz";
url = "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz";
sha1 = "1f16adedfe9bdc18800e1776821734086fcc6753";
};
}
{ {
name = "text_table___text_table_0.2.0.tgz"; name = "text_table___text_table_0.2.0.tgz";
path = fetchurl { path = fetchurl {
@ -6033,6 +6305,14 @@
sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
}; };
} }
{
name = "textextensions___textextensions_5.12.0.tgz";
path = fetchurl {
name = "textextensions___textextensions_5.12.0.tgz";
url = "https://registry.yarnpkg.com/textextensions/-/textextensions-5.12.0.tgz";
sha1 = "b908120b5c1bd4bb9eba41423d75b176011ab68a";
};
}
{ {
name = "through2___through2_2.0.5.tgz"; name = "through2___through2_2.0.5.tgz";
path = fetchurl { path = fetchurl {
@ -6225,6 +6505,14 @@
sha1 = "3240b891a78b0deae910dbeb86553e552a148860"; sha1 = "3240b891a78b0deae910dbeb86553e552a148860";
}; };
} }
{
name = "type_fest___type_fest_0.20.2.tgz";
path = fetchurl {
name = "type_fest___type_fest_0.20.2.tgz";
url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz";
sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4";
};
}
{ {
name = "type_fest___type_fest_0.8.1.tgz"; name = "type_fest___type_fest_0.8.1.tgz";
path = fetchurl { path = fetchurl {
@ -6321,6 +6609,14 @@
sha1 = "b61a1da173e8435b2fe3c67d29b9adf8594bd16d"; sha1 = "b61a1da173e8435b2fe3c67d29b9adf8594bd16d";
}; };
} }
{
name = "universalify___universalify_2.0.0.tgz";
path = fetchurl {
name = "universalify___universalify_2.0.0.tgz";
url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz";
sha1 = "75a4984efedc4b08975c5aeb73f530d02df25717";
};
}
{ {
name = "unpipe___unpipe_1.0.0.tgz"; name = "unpipe___unpipe_1.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -6362,11 +6658,11 @@
}; };
} }
{ {
name = "update_notifier___update_notifier_4.1.3.tgz"; name = "update_notifier___update_notifier_5.1.0.tgz";
path = fetchurl { path = fetchurl {
name = "update_notifier___update_notifier_4.1.3.tgz"; name = "update_notifier___update_notifier_5.1.0.tgz";
url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz"; url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz";
sha1 = "be86ee13e8ce48fb50043ff72057b5bd598e1ea3"; sha1 = "4ab0d7c7f36a231dd7316cf7729313f0214d9ad9";
}; };
} }
{ {
@ -6489,6 +6785,22 @@
sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
}; };
} }
{
name = "version_compare___version_compare_1.1.0.tgz";
path = fetchurl {
name = "version_compare___version_compare_1.1.0.tgz";
url = "https://registry.yarnpkg.com/version-compare/-/version-compare-1.1.0.tgz";
sha1 = "7b3e67e7e6cec5c72d9c9e586f8854e419ade17c";
};
}
{
name = "version_range___version_range_1.1.0.tgz";
path = fetchurl {
name = "version_range___version_range_1.1.0.tgz";
url = "https://registry.yarnpkg.com/version-range/-/version-range-1.1.0.tgz";
sha1 = "1c233064202ee742afc9d56e21da3b2e15260acf";
};
}
{ {
name = "wcwidth___wcwidth_1.0.1.tgz"; name = "wcwidth___wcwidth_1.0.1.tgz";
path = fetchurl { path = fetchurl {
@ -6665,6 +6977,22 @@
sha1 = "4fa2d846ec803237de86f30aa9b5f70b6600de02"; sha1 = "4fa2d846ec803237de86f30aa9b5f70b6600de02";
}; };
} }
{
name = "xmlbuilder___xmlbuilder_15.1.1.tgz";
path = fetchurl {
name = "xmlbuilder___xmlbuilder_15.1.1.tgz";
url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz";
sha1 = "9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5";
};
}
{
name = "xmlbuilder___xmlbuilder_9.0.7.tgz";
path = fetchurl {
name = "xmlbuilder___xmlbuilder_9.0.7.tgz";
url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz";
sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d";
};
}
{ {
name = "xmlbuilder___xmlbuilder_11.0.1.tgz"; name = "xmlbuilder___xmlbuilder_11.0.1.tgz";
path = fetchurl { path = fetchurl {
@ -6673,6 +7001,14 @@
sha1 = "be9bae1c8a046e76b31127726347d0ad7002beb3"; sha1 = "be9bae1c8a046e76b31127726347d0ad7002beb3";
}; };
} }
{
name = "xmldom___xmldom_0.5.0.tgz";
path = fetchurl {
name = "xmldom___xmldom_0.5.0.tgz";
url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz";
sha1 = "193cb96b84aa3486127ea6272c4596354cb4962e";
};
}
{ {
name = "xtend___xtend_4.0.2.tgz"; name = "xtend___xtend_4.0.2.tgz";
path = fetchurl { path = fetchurl {
@ -6786,11 +7122,11 @@
}; };
} }
{ {
name = "zip_stream___zip_stream_4.0.4.tgz"; name = "zip_stream___zip_stream_4.1.0.tgz";
path = fetchurl { path = fetchurl {
name = "zip_stream___zip_stream_4.0.4.tgz"; name = "zip_stream___zip_stream_4.1.0.tgz";
url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz"; url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz";
sha1 = "3a8f100b73afaa7d1ae9338d910b321dec77ff3a"; sha1 = "51dd326571544e36aa3f756430b313576dc8fc79";
}; };
} }
]; ];

4
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -8,12 +8,12 @@
let let
executableName = "element-desktop"; executableName = "element-desktop";
version = "1.7.24"; version = "1.7.25";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vector-im"; owner = "vector-im";
repo = "element-desktop"; repo = "element-desktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-16sqiOwJvKTs6MPmdkuiPhnr1G7ErWCT5ctp5xqZRlk="; sha256 = "sha256-q8hVmTLt/GdLc6NSldLggogObQcPFp+lAeS3wmO0qPo=";
}; };
in mkYarnPackage rec { in mkYarnPackage rec {
name = "element-desktop-${version}"; name = "element-desktop-${version}";

4
pkgs/applications/networking/instant-messengers/element/element-web.nix
View File

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "element-web"; pname = "element-web";
version = "1.7.24"; version = "1.7.25";
src = fetchurl { src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "sha256-u6mcO+MMjrr2YujVVcsaA7qsruirmHJz3o8nAPOecSU="; sha256 = "sha256-T4lsGVSUHkw4R7tSeTKPifbhwaTf/YF2vVAakFSrt9k=";
}; };
installPhase = '' installPhase = ''

80
pkgs/applications/science/astronomy/celestia/default.nix
View File

@ -1,75 +1,37 @@
{ lib, stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu { lib, stdenv, fetchFromGitHub, pkg-config, freeglut, gtk2, gtkglext
, lua, libGLU, libGL, pkg-config, perl, autoreconfHook , libjpeg_turbo, libtheora, libXmu, lua, libGLU, libGL, perl, autoreconfHook
}: }:
let stdenv.mkDerivation rec {
name = "celestia-1.6.1"; pname = "celestia";
version = "1.6.2.2";
gcc46Patch = fetchurl { src = fetchFromGitHub {
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-gcc46.patch?h=packages/celestia"; owner = "CelestiaProject";
sha256 = "0my7dpyh5wpz5df7bjhwb4db3ci2rn8ib1nkjv15fbp1g76bxfaz"; repo = "Celestia";
name = "celestia-1.6.1-gcc46.patch"; rev = version;
sha256 = "1s9fgxh6i3x1sy75y5wcidi2mjrf5xj71dd4n6rg0hkps441sgsp";
}; };
libpng15Patch = fetchurl { nativeBuildInputs = [ pkg-config autoreconfHook ];
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-libpng15.patch?h=packages/celestia"; buildInputs = [
sha256 = "1jrmbwmvs9b6k2b2g4104q22v4vqi0wfpz6hmfhniaq34626jcms"; freeglut gtk2 gtkglext lua perl
name = "celestia-1.6.1-libpng15.patch"; libjpeg_turbo libtheora libXmu libGLU libGL
}; ];
libpng16Patch = fetchurl {
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-libpng16.patch?h=packages/celestia";
sha256 = "1q85prw4ci6d50lri8w1jm19pghxw96qizf5dl4g0j86rlhlkc8f";
name = "celestia-1.6.1-libpng16.patch";
};
linkingPatch = fetchurl {
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-linking.patch?h=packages/celestia";
sha256 = "1m8xyq26nm352828bp12c3b8f6m9bys9fwfxbfzqppllk7il2f24";
name = "celestia-1.6.1-linking.patch";
};
gcc47Patch = fetchurl {
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc-4.7-fixes.diff?h=packages/celestia";
sha256 = "1na26c7pv9qfv8a981m1zvglhv05r3h8513xqjra91qhhzx8wr8n";
name = "gcc-4.7-fixes.diff";
};
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/celestia/${name}.tar.gz";
sha256 = "1i1lvhbgllsh2z8i6jj4mvrjak4a7r69psvk7syw03s4p7670mfk";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU libGL lua
perl autoreconfHook ];
patchPhase = ''
patch -Np0 -i "${gcc46Patch}"
patch -Np0 -i "${libpng15Patch}"
patch -Np2 -i "${libpng16Patch}"
patch -Np1 -i "${linkingPatch}"
patch -Np1 -i "${gcc47Patch}"
'';
configureFlags = [ configureFlags = [
"--with-gtk" "--with-gtk"
"--with-lua=${lua}" "--with-lua=${lua}"
]; ];
installPhase = ''make MKDIR_P="mkdir -p" install'';
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with lib; {
description = "Free space simulation";
homepage = "https://celestia.space/"; homepage = "https://celestia.space/";
license = lib.licenses.gpl2; description = "Real-time 3D simulation of space";
changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}";
platforms = lib.platforms.linux; license = licenses.gpl2Plus;
maintainers = [ lib.maintainers.peti ]; maintainers = with maintainers; [ peti ];
platforms = platforms.linux;
}; };
} }

6
pkgs/applications/version-management/git-and-tools/gitui/default.nix
View File

@ -1,16 +1,16 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gitui"; pname = "gitui";
version = "0.13.0"; version = "0.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "extrawurst"; owner = "extrawurst";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0fc8vxpy1zarxd5lqgwdj2jzv35qsxaydczg0qkws1f88m43n33x"; sha256 = "1ymvvmryzv5is535bjg8h9p7gsxygyawnpyd0hicdrdiwml5mgsq";
}; };
cargoSha256 = "1j5cf5z8ksf5kvi6zfrabv1c127yb6s0dpkl9p8vqdgdc6mzghvd"; cargoSha256 = "14hf3xkdvk2mgag5pzai5382h3g79fq76s0p9pj8q9v8q21wg6pr";
nativeBuildInputs = [ python3 perl ]; nativeBuildInputs = [ python3 perl ];
buildInputs = [ openssl ] buildInputs = [ openssl ]

8
pkgs/applications/version-management/git-and-tools/stgit/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "stgit"; pname = "stgit";
version = "0.23"; version = "1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ctmarinas"; owner = "stacked-git";
repo = "stgit"; repo = "stgit";
rev = "v${version}"; rev = "v${version}";
sha256 = "1r9y8qnl6kdvq61788pnfhhgyv2xrnyrizbhy4qz4l1bpqkwfr2r"; sha256 = "16q8994widg040n1ag4m82kbn3r02n39ah7dvwa7aixhw5y35vlm";
}; };
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; { meta = with lib; {
description = "A patch manager implemented on top of Git"; description = "A patch manager implemented on top of Git";
homepage = "http://procode.org/stgit/"; homepage = "https://stacked-git.github.io/";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
}; };

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

@ -16,12 +16,12 @@ with lib;
buildGoPackage rec { buildGoPackage rec {
pname = "gitea"; pname = "gitea";
version = "1.13.7"; version = "1.14.0";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI # not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl { src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "sha256-jJbX+kcXqd1v8aXNhmt24mq9mxOpTogCVm263rHVGHw="; sha256 = "sha256-SE+YqcRNkhRQXDzgv72YrQX9bG/URYj4NAFvTg4bE3Y=";
}; };
unpackPhase = '' unpackPhase = ''

8
pkgs/applications/virtualization/docker/default.nix
View File

@ -132,10 +132,10 @@ rec {
goPackagePath = "github.com/docker/cli"; goPackagePath = "github.com/docker/cli";
nativeBuildInputs = [ pkg-config go-md2man go libtool installShellFiles ]; nativeBuildInputs = [
buildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles
makeWrapper ];
] ++ optionals (stdenv.isLinux) [ buildInputs = optionals (stdenv.isLinux) [
sqlite lvm2 btrfs-progs systemd libseccomp sqlite lvm2 btrfs-progs systemd libseccomp
] ++ optionals (buildxSupport) [ docker-buildx ]; ] ++ optionals (buildxSupport) [ docker-buildx ];

13
pkgs/applications/window-managers/wmderland/0001-remove-flto.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17a4944..33406f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ include(BuildType)
# Request C++14 standard, using new CMake variables.
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED True)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto -Wall")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
# If the BuildType is Debug, then add -rdynamic.
# (used to print stacktrace with function names)

49
pkgs/applications/window-managers/wmderland/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib, stdenv, fetchFromGitHub, cmake, libnotify, libX11, xorgproto, nixosTests }:
stdenv.mkDerivation {
pname = "wmderland";
version = "unstable-2020-07-17";
src = fetchFromGitHub {
owner = "aesophor";
repo = "wmderland";
rev = "a40a3505dd735b401d937203ab6d8d1978307d72";
sha256 = "0npmlnybblp82mfpinjbz7dhwqgpdqc1s63wc1zs8mlcs19pdh98";
};
nativeBuildInputs = [
cmake
];
cmakeBuildType = "MinSizeRel";
patches = [ ./0001-remove-flto.patch ];
postPatch = ''
substituteInPlace src/util.cc \
--replace "notify-send" "${libnotify}/bin/notify-send"
'';
buildInputs = [
libX11
xorgproto
];
postInstall = ''
install -Dm0644 -t $out/share/wmderland/contrib $src/example/config
install -Dm0644 -t $out/share/xsessions $src/example/wmderland.desktop
'';
passthru = {
tests.basic = nixosTests.wmderland;
providedSessions = [ "wmderland" ];
};
meta = with lib; {
description = "Modern and minimal X11 tiling window manager";
homepage = "https://github.com/aesophor/wmderland";
license = licenses.mit;
platforms = libX11.meta.platforms;
maintainers = with maintainers; [ takagiy ];
};
}

32
pkgs/applications/window-managers/wmderlandc/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib, stdenv, fetchFromGitHub, cmake, libX11, xorgproto }:
stdenv.mkDerivation {
pname = "wmderlandc";
version = "unstable-2020-07-17";
src = fetchFromGitHub {
owner = "aesophor";
repo = "wmderland";
rev = "a40a3505dd735b401d937203ab6d8d1978307d72";
sha256 = "0npmlnybblp82mfpinjbz7dhwqgpdqc1s63wc1zs8mlcs19pdh98";
};
sourceRoot = "source/ipc-client";
nativeBuildInputs = [
cmake
];
buildInputs = [
libX11
xorgproto
];
meta = with lib; {
description = "A tiny program to interact with wmderland";
homepage = "https://github.com/aesophor/wmderland/tree/master/ipc-client";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ takagiy ];
};
}

6
pkgs/build-support/docker/default.nix
View File

@ -418,7 +418,11 @@ rec {
# details on what's going on here; basically this command # details on what's going on here; basically this command
# means that the runAsRootScript will be executed in a nearly # means that the runAsRootScript will be executed in a nearly
# completely isolated environment. # completely isolated environment.
unshare -imnpuf --mount-proc chroot mnt ${runAsRootScript} #
# Ideally we would use --mount-proc=mnt/proc or similar, but this
# doesn't work. The workaround is to setup proc after unshare.
# See: https://github.com/karelzak/util-linux/issues/648
unshare -imnpuf --mount-proc sh -c 'mount --rbind /proc mnt/proc && chroot mnt ${runAsRootScript}'
# Unmount directories and remove them. # Unmount directories and remove them.
umount -R mnt/dev mnt/sys mnt${storeDir} umount -R mnt/dev mnt/sys mnt${storeDir}

4
pkgs/data/fonts/recursive/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchzip }: { lib, fetchzip }:
let let
version = "1.077"; version = "1.078";
in in
fetchzip { fetchzip {
name = "recursive-${version}"; name = "recursive-${version}";
@ -14,7 +14,7 @@ fetchzip {
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
''; '';
sha256 = "sha256-deztulQ33TIMevEQOP5OS8tmf6UjXT8IiVpRjkdismY="; sha256 = "0vmdcqz6rlshfk653xpanyxps96p85b1spqahl3yiy29mq4xfdn3";
meta = with lib; { meta = with lib; {
homepage = "https://recursive.design/"; homepage = "https://recursive.design/";

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

@ -124,11 +124,11 @@ rec {
}; };
sdk_5_0 = buildNetCoreSdk { sdk_5_0 = buildNetCoreSdk {
version = "5.0.100"; version = "5.0.200";
sha512 = { sha512 = {
x86_64-linux = "bec37bfb327c45cc01fd843ef93b22b556f753b04724bba501622df124e7e144c303a4d7e931b5dbadbd4f7b39e5adb8f601cb6293e317ad46d8fe7d52aa9a09"; x86_64-linux = "0g7zcmkcdwc11h42m6hq8d0w55nnvnsmj3dc16829q55cp7l7kggmjljnd9slx7r7nrsyi7yy8brwh8n4kfi5998pdyb09fzhq5w60d";
aarch64-linux = "5fceac0a9468097d66af25516da597eb4836b294ed1647ba272ade5c8faea2ed977a95d9ce720c44d71607fa3a0cf9de55afe0e66c0c89ab1cc6736945978204"; aarch64-linux = "2zy6nxiw313g2sbmnkg76r64llbk2w2wcsa6frq535zbviw52zf163jvw2687rpiw4szdizf337l3b0qa0396abw5dhq2czqlxjyjv8";
x86_64-darwin = "69ccc7c686ac06f6c658d118f59cf1a0e7284b4570375dd88d3e3043098e311745922301f2650d159624d09c4d39a1f3cbdd5daee0e408eef915de839e3bce8f"; x86_64-darwin = "2p0yxplafhi5ks38pq8nyi43kpv4l4npa718rvcvl57qs76j0dqlk1s4wdw7msx8g7xxy1aal47zy9rxvlypmgwx4dnp339cmbd6mf6";
}; };
}; };
} }

65
pkgs/development/compilers/roslyn/create-deps.sh Executable file
View File

@ -0,0 +1,65 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p dotnet-sdk_5 -p jq -p xmlstarlet -p curl
set -euo pipefail
cat << EOL
{ fetchurl }: [
EOL
tmpdir="$(mktemp -d -p "$(pwd)")" # must be under source root
trap 'rm -rf "$tmpdir"' EXIT
HOME="$tmpdir" dotnet msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir"/.nuget/packages \
-p:RestoreNoCache=true -p:RestoreForce=true \
src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj >&2
mapfile -t repos < <(
xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.config "$tmpdir"/.nuget/NuGet/NuGet.Config |
while IFS= read index
do
curl --compressed -fsL "$index" | \
jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"'
done
)
cd "$tmpdir/.nuget/packages"
for package in *
do
cd "$package"
for version in *
do
found=false
for repo in "${repos[@]}"
do
url="$repo$package/$version/$package.$version.nupkg"
if curl -fsL "$url" -o /dev/null
then
found=true
break
fi
done
if ! $found
then
echo "couldn't find $package $version" >&2
exit 1
fi
sha256=$(nix-prefetch-url "$url" 2>/dev/null)
cat << EOL
{
name = "$package";
version = "$version";
src = fetchurl {
url = "$url";
sha256 = "$sha256";
};
}
EOL
done
cd ..
done
cat << EOL
]
EOL

121
pkgs/development/compilers/roslyn/default.nix Normal file
View File

@ -0,0 +1,121 @@
{ lib, stdenv
, fetchFromGitHub
, fetchurl
, mono
, dotnet-sdk_5
, makeWrapper
, dotnetPackages
, unzip
, writeText
, symlinkJoin
}:
let
deps = map (package: stdenv.mkDerivation (with package; {
pname = name;
inherit version src;
buildInputs = [ unzip ];
unpackPhase = ''
unzip -o $src
chmod -R u+r .
function traverseRename () {
for e in *
do
t="$(echo "$e" | sed -e "s/%20/\ /g" -e "s/%2B/+/g")"
[ "$t" != "$e" ] && mv -vn "$e" "$t"
if [ -d "$t" ]
then
cd "$t"
traverseRename
cd ..
fi
done
}
traverseRename
'';
installPhase = ''
runHook preInstall
package=$out/lib/dotnet/${name}/${version}
mkdir -p $package
cp -r . $package
echo "{}" > $package/.nupkg.metadata
runHook postInstall
'';
dontFixup = true;
}))
(import ./deps.nix { inherit fetchurl; });
nuget-config = writeText "NuGet.Config" ''
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
</packageSources>
</configuration>
'';
packages = symlinkJoin { name = "roslyn-deps"; paths = deps; };
packageVersion = "3.10.0";
in stdenv.mkDerivation rec {
pname = "roslyn";
version = "${packageVersion}-1.21102.26";
src = fetchFromGitHub {
owner = "dotnet";
repo = "roslyn";
rev = "v${version}";
sha256 = "0yf4f4vpqn9lixr37lkp29m2mk51xcm3ysv2ag332xn6zm5zpm2b";
};
nativeBuildInputs = [ makeWrapper dotnet-sdk_5 unzip ];
buildPhase = ''
runHook preBuild
rm NuGet.config
install -m644 -D ${nuget-config} fake-home/.nuget/NuGet/NuGet.Config
ln -s ${packages}/lib/dotnet fake-home/.nuget/packages
HOME=$(pwd)/fake-home dotnet add \
src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj \
package -n -v 5.10.0-preview.2.7169 nuget.build.tasks.pack
HOME=$(pwd)/fake-home dotnet msbuild -r -v:m -t:pack \
-p:Configuration=Release \
-p:RepositoryUrl="${meta.homepage}" \
-p:RepositoryCommit="v${version}" \
src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj
runHook postBuild
'';
installPhase = ''
pkg=$out/lib/dotnet/microsoft.net.compilers.toolset/${packageVersion}
mkdir -p $out/bin $pkg
unzip -q artifacts/packages/Release/Shipping/Microsoft.Net.Compilers.Toolset.${packageVersion}-dev.nupkg \
-d $pkg
# nupkg has 0 permissions for a bunch of things
chmod -R +rw $pkg
makeWrapper ${mono}/bin/mono $out/bin/csc \
--add-flags "$pkg/tasks/net472/csc.exe"
makeWrapper ${mono}/bin/mono $out/bin/vbs \
--add-flags "$pkg/tasks/net472/vbs.exe"
'';
meta = with lib; {
description = ".NET C# and Visual Basic compiler";
homepage = "https://github.com/dotnet/roslyn";
platforms = platforms.linux;
license = licenses.mit;
maintainers = with maintainers; [ corngood ];
};
}

1138
pkgs/development/compilers/roslyn/deps.nix generated Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -22,8 +22,8 @@ let
}; };
in mkDerivation { in mkDerivation {
version = "18.3.4.8"; version = "18.3.4.11";
sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g"; sha256 = "190xbv77v5x2g8xkzdg9bpwa1ylkc18d03ag2a0frcwcv76x53k1";
patches = [ patches = [
rmAndPwdPatch rmAndPwdPatch

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

@ -1,8 +1,8 @@
{ mkDerivation, fetchpatch }: { mkDerivation, fetchpatch }:
mkDerivation { mkDerivation {
version = "19.3.6.11"; version = "19.3.6.13";
sha256 = "0b02iv8dly1vkc2xnqqi030sdj34h4gji2h4qgilllajr1f868vm"; sha256 = "1zbg54p7pdr8bjyrxvi7vs41vgamqa8lsynnm6ac6845q0xwpwid";
patches = [ patches = [
# macOS 10.13 crypto fix from OTP-20.1.2 # macOS 10.13 crypto fix from OTP-20.1.2

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

@ -1,8 +1,8 @@
{ mkDerivation }: { mkDerivation }:
mkDerivation { mkDerivation {
version = "20.3.8.9"; version = "20.3.8.26";
sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a"; sha256 = "062405s59hkdkmw2dryq0qc1k03jsncj7yqisgj35x9sqpzm4w7a";
prePatch = '' prePatch = ''
substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"

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

@ -1,6 +1,6 @@
{ mkDerivation }: { mkDerivation }:
mkDerivation { mkDerivation {
version = "21.3.8.21"; version = "21.3.8.22";
sha256 = "sha256-zQCs2hOA66jxAaxl/B42EKCejAktIav2rpVQCNyKCh4="; sha256 = "sha256-k6dChY/ogWqmcNz9P3t+p9C7oywXhR5oqdBfNtkh6I4=";
} }

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

@ -3,6 +3,6 @@
# How to obtain `sha256`: # How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation { mkDerivation {
version = "22.3.4.16"; version = "22.3.4.17";
sha256 = "sha256-V0RwEPfjnHtEzShNh6Q49yGC5fbt2mNR4xy6f6iWvck="; sha256 = "sha256-YhKU9I4qN+TVG3t//t9htUBkOu8DS75vbn/qWvS1zc0=";
} }

20
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@ -5,6 +5,8 @@
, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null
, parallelBuild ? false , parallelBuild ? false
, systemd, wxSupport ? true , systemd, wxSupport ? true
# updateScript deps
, writeScript, common-updater-scripts, coreutils, git
}: }:
{ baseName ? "erlang" { baseName ? "erlang"
, version , version
@ -103,6 +105,24 @@ in stdenv.mkDerivation ({
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
passthru = {
updateScript =
let major = builtins.head (builtins.splitVersion version);
in writeScript "update.sh" ''
#!${stdenv.shell}
set -ox errexit
PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused ]}
latest=$(list-git-tags https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1)
if [ "$latest" != "${version}" ]; then
nixpkgs="$(git rev-parse --show-toplevel)"
nix_file="$nixpkgs/pkgs/development/interpreters/erlang/R${major}.nix"
update-source-version ${baseName}R${major} "$latest" --version-key=version --print-changes --file="$nix_file"
else
echo "${baseName}R${major} is already up-to-date"
fi
'';
};
meta = with lib; ({ meta = with lib; ({
homepage = "https://www.erlang.org/"; homepage = "https://www.erlang.org/";
downloadPage = "https://www.erlang.org/download.html"; downloadPage = "https://www.erlang.org/download.html";

12
pkgs/development/libraries/aqbanking/sources.nix
View File

@ -1,11 +1,11 @@
{ {
gwenhywfar.version = "5.4.1"; gwenhywfar.version = "5.6.0";
gwenhywfar.sha256 = "16waq39mbhhjcma2ykdbqvpcw0ba3ksqqwsp55zczhg320s41zgv"; gwenhywfar.sha256 = "1isbj4a7vdgagp3kkvx2pjcjy8lba6kzjr11fmr06aci1694dbsp";
gwenhywfar.releaseId = "344"; gwenhywfar.releaseId = "364";
libchipcard.version = "5.0.4"; libchipcard.version = "5.0.4";
libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj"; libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj";
libchipcard.releaseId = "158"; libchipcard.releaseId = "158";
aqbanking.version = "6.2.5"; aqbanking.version = "6.2.10";
aqbanking.sha256 = "1pyny15g8y5dzzl4yg7jjnavygfzsi2g1jl7as9grqy77q70cnyg"; aqbanking.sha256 = "13dbpi58mw09gnsza11pxy5c8j99r11nkyg2j53y4lqk47rmyhvq";
aqbanking.releaseId = "342"; aqbanking.releaseId = "368";
} }

121
pkgs/development/libraries/openvino/default.nix Normal file
View File

@ -0,0 +1,121 @@
{ lib
, addOpenGLRunpath
, autoPatchelfHook
, stdenv
, fetchFromGitHub
, cmake
, git
, protobuf
, tbb
, opencv
, unzip
, shellcheck
, python
, enablePython ? false
}:
let
onnx_src = fetchFromGitHub {
owner = "onnx";
repo = "onnx";
rev = "v1.8.1";
sha256 = "+1zNnZ4lAyVYRptfk0PV7koIX9FqcfD1Ah33qj/G2rA=";
};
in
stdenv.mkDerivation rec {
pname = "openvino";
version = "2021.2";
src = fetchFromGitHub {
owner = "openvinotoolkit";
repo = "openvino";
rev = version;
sha256 = "pv4WTfY1U5GbA9Yj07UOLQifvVH3oDfWptxxYW5IwVQ=";
fetchSubmodules = true;
};
dontUseCmakeBuildDir = true;
cmakeFlags = [
"-DNGRAPH_USE_SYSTEM_PROTOBUF:BOOL=ON"
"-DFETCHCONTENT_FULLY_DISCONNECTED:BOOL=ON"
"-DFETCHCONTENT_SOURCE_DIR_EXT_ONNX:STRING=${onnx_src}"
"-DENABLE_VPU:BOOL=OFF"
"-DTBB_DIR:STRING=${tbb}"
"-DENABLE_OPENCV:BOOL=ON"
"-DOPENCV:STRING=${opencv}"
"-DENABLE_GNA:BOOL=OFF"
"-DENABLE_SPEECH_DEMO:BOOL=OFF"
"-DBUILD_TESTING:BOOL=OFF"
"-DENABLE_CLDNN_TESTS:BOOL=OFF"
"-DNGRAPH_INTERPRETER_ENABLE:BOOL=ON"
"-DNGRAPH_TEST_UTIL_ENABLE:BOOL=OFF"
"-DNGRAPH_UNIT_TEST_ENABLE:BOOL=OFF"
"-DENABLE_SAMPLES:BOOL=OFF"
"-DENABLE_CPPLINT:BOOL=OFF"
] ++ lib.optional enablePython [
"-DENABLE_PYTHON:BOOL=ON"
];
preConfigure = ''
# To make install openvino inside /lib instead of /python
substituteInPlace inference-engine/ie_bridges/python/CMakeLists.txt \
--replace 'DESTINATION python/''${PYTHON_VERSION}/openvino' 'DESTINATION lib/''${PYTHON_VERSION}/site-packages/openvino' \
--replace 'DESTINATION python/''${PYTHON_VERSION}' 'DESTINATION lib/''${PYTHON_VERSION}/site-packages/openvino'
substituteInPlace inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt \
--replace 'python/''${PYTHON_VERSION}/openvino/inference_engine' 'lib/''${PYTHON_VERSION}/site-packages/openvino/inference_engine'
# Used to download OpenCV based on Linux Distro and make it use system OpenCV
substituteInPlace inference-engine/cmake/dependencies.cmake \
--replace 'include(linux_name)' ' ' \
--replace 'if (ENABLE_OPENCV)' 'if (ENABLE_OPENCV AND NOT DEFINED OPENCV)'
cmakeDir=$PWD
mkdir ../build
cd ../build
'';
autoPatchelfIgnoreMissingDeps = true;
nativeBuildInputs = [
cmake
autoPatchelfHook
addOpenGLRunpath
];
buildInputs = [
git
protobuf
opencv
unzip
python
tbb
shellcheck
] ++ lib.optional enablePython (with python.pkgs; [
cython
pybind11
]);
postFixup = ''
# Link to OpenCL
find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
addOpenGLRunpath "$lib"
done
'';
meta = with lib; {
description = "OpenVINO™ Toolkit repository";
longDescription = ''
This toolkit allows developers to deploy pre-trained deep learning models through a high-level C++ Inference Engine API integrated with application logic.
This open source version includes several components: namely Model Optimizer, nGraph and Inference Engine, as well as CPU, GPU, MYRIAD,
multi device and heterogeneous plugins to accelerate deep learning inferencing on Intel® CPUs and Intel® Processor Graphics.
It supports pre-trained models from the Open Model Zoo, along with 100+ open source and public models in popular formats such as Caffe*, TensorFlow*, MXNet* and ONNX*.
'';
homepage = "https://docs.openvinotoolkit.org/";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ tfmoraes ];
};
}

23
pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
View File

@ -4,23 +4,36 @@
, ocaml-syntax-shims , ocaml-syntax-shims
, yojson , yojson
, result , result
, fetchzip , fetchurl
, lib , lib
, ocaml
}: }:
let params =
if lib.versionAtLeast ocaml.version "4.12"
then {
version = "1.5.0";
sha256 = "0g82m3jrp4s0m3fn9xmm8khrb3acccq8ns9p62bqa09pjd4vgdk2";
} else {
version = "1.4.1";
sha256 = "1ssyazc0yrdng98cypwa9m3nzfisdzpp7hqnx684rqj8f0g3gs6f";
}
; in
buildDunePackage rec { buildDunePackage rec {
pname = "jsonrpc"; pname = "jsonrpc";
version = "1.4.1"; inherit (params) version;
src = fetchzip { src = fetchurl {
url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz"; url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz";
sha256 = "0hzpw17qfhb0cxgwah1fv4k300r363dy1kv0977anl44dlanx1v5"; inherit (params) sha256;
}; };
useDune2 = true; useDune2 = true;
minimumOCamlVersion = "4.06"; minimumOCamlVersion = "4.06";
buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ppx_yojson_conv_lib result ]; buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ];
propagatedBuildInputs = [ ppx_yojson_conv_lib result ];
meta = with lib; { meta = with lib; {
description = "Jsonrpc protocol implementation in OCaml"; description = "Jsonrpc protocol implementation in OCaml";

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

@ -9,13 +9,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "certbot"; pname = "certbot";
version = "1.13.0"; version = "1.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1cwhhybj2fjalhhyd184ndn3bid3qib1yy5a93m146cqqgwpw4j6"; sha256 = "sha256-J514zgmIcHpwySChFBXGKR4552wS9z5x8Berk/irHSU=";
}; };
sourceRoot = "source/${pname}"; sourceRoot = "source/${pname}";

9
pkgs/development/python-modules/greenlet/default.nix
View File

@ -8,21 +8,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "greenlet"; pname = "greenlet";
version = "0.4.17"; version = "1.0.0";
disabled = isPyPy; # builtin for pypy disabled = isPyPy; # builtin for pypy
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0swdhrcq13bdszv3yz5645gi4ijbzmmhxpb6whcfg3d7d5f87n21"; sha256 = "1y6wbg9yhm9dw6m768n4yslp56h85pnxkk3drz6icn15g6f1d7ki";
}; };
propagatedBuildInputs = [ six ]; propagatedBuildInputs = [ six ];
# see https://github.com/python-greenlet/greenlet/issues/85
preCheck = ''
rm tests/test_leaks.py
'';
meta = { meta = {
homepage = "https://pypi.python.org/pypi/greenlet"; homepage = "https://pypi.python.org/pypi/greenlet";
description = "Module for lightweight in-process concurrent programming"; description = "Module for lightweight in-process concurrent programming";

6
pkgs/development/python-modules/isbnlib/default.nix
View File

@ -7,11 +7,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "isbnlib"; pname = "isbnlib";
version = "3.10.6"; version = "3.10.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "b324c7c8689741bba6d71d1369d49780a24fe946b11a3c005d56e09bf705cd19"; sha256 = "sha256-gbMxV9qOLCpIH3rUceG1ds9ZUpjwOv1gyYL3GLkS3Ik=";
}; };
checkInputs = [ checkInputs = [
@ -27,7 +27,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Extract, clean, transform, hyphenate and metadata for ISBNs"; description = "Extract, clean, transform, hyphenate and metadata for ISBNs";
homepage = "https://github.com/xlcnd/isbnlib"; homepage = "https://github.com/xlcnd/isbnlib";
license = licenses.lgpl3; license = licenses.lgpl3Only;
maintainers = with maintainers; [ dotlambda ]; maintainers = with maintainers; [ dotlambda ];
}; };
} }

2
pkgs/development/python-modules/jsonpath-ng/default.nix
View File

@ -26,7 +26,7 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ]; checkInputs = [ pytestCheckHook ];
disabledTestFiles = [ disabledTestPaths = [
# Exclude tests that require oslotest # Exclude tests that require oslotest
"tests/test_jsonpath_rw_ext.py" "tests/test_jsonpath_rw_ext.py"
]; ];

42
pkgs/development/python-modules/karton-asciimagic/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, karton-core
, python
}:
buildPythonPackage rec {
pname = "karton-asciimagic";
version = "1.0.0";
src = fetchFromGitHub {
owner = "CERT-Polska";
repo = pname;
rev = "v${version}";
sha256 = "0yvd0plpwy5qkd2jljpd6wm6dlj2g8csvj1q2md23vsgx7h7v2vm";
};
propagatedBuildInputs = [
karton-core
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "karton.core==4.0.5" "karton-core"
'';
checkPhase = ''
runHook preCheck
${python.interpreter} -m unittest discover
runHook postCheck
'';
pythonImportsCheck = [ "karton.asciimagic" ];
meta = with lib; {
description = "Decoders for ascii-encoded executables for the Karton framework";
homepage = "https://github.com/CERT-Polska/karton-asciimagic";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ fab ];
};
}

6
pkgs/development/python-modules/meinheld/default.nix
View File

@ -9,6 +9,12 @@ buildPythonPackage rec {
sha256 = "008c76937ac2117cc69e032dc69cea9f85fc605de9bac1417f447c41c16a56d6"; sha256 = "008c76937ac2117cc69e032dc69cea9f85fc605de9bac1417f447c41c16a56d6";
}; };
patchPhase = ''
# Allow greenlet-1.0.0.
# See https://github.com/mopemope/meinheld/pull/123
substituteInPlace setup.py --replace "greenlet>=0.4.5,<0.5" "greenlet>=0.4.5,<2.0.0"
'';
propagatedBuildInputs = [ greenlet ]; propagatedBuildInputs = [ greenlet ];
# No tests # No tests

11
pkgs/development/python-modules/pymazda/default.nix
View File

@ -1,22 +1,25 @@
{ lib { lib
, aiohttp , aiohttp
, buildPythonPackage , buildPythonPackage
, cryptography
, fetchPypi , fetchPypi
, pycryptodome
, pythonOlder , pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pymazda"; pname = "pymazda";
version = "0.0.10"; version = "0.1.1";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-sJj4RkVaELNitcz1H8YitNgIx4f35WeQf7M5miYD5yI="; sha256 = "sha256-Z0sRfLkOxYmPDZiSKqqbd68dcTDU+x8QhPe/Oo43KEA=";
}; };
propagatedBuildInputs = [ aiohttp pycryptodome ]; propagatedBuildInputs = [
aiohttp
cryptography
];
# Project has no tests # Project has no tests
doCheck = false; doCheck = false;

49
pkgs/development/python-modules/pywemo/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, ifaddr
, lxml
, poetry-core
, pytest-vcr
, pytestCheckHook
, pythonOlder
, requests
, urllib3
}:
buildPythonPackage rec {
pname = "pywemo";
version = "0.6.4";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "1hm1vs6m65vqar0lcjnynz0d9y9ri5s75fzhvp0yfjkcnp06gnfa";
};
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
ifaddr
requests
urllib3
lxml
];
checkInputs = [
pytest-vcr
pytestCheckHook
];
pythonImportsCheck = [ "pywemo" ];
meta = with lib; {
description = "Python module to discover and control WeMo devices";
homepage = "https://github.com/pywemo/pywemo";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

2
pkgs/development/ruby-modules/bundler-env/default.nix
View File

@ -23,7 +23,7 @@
let let
inherit (import ../bundled-common/functions.nix {inherit lib ruby gemConfig groups; }) genStubsScript; inherit (import ../bundled-common/functions.nix {inherit lib ruby gemConfig groups; }) genStubsScript;
basicEnv = (callPackage ../bundled-common {}) (args // { inherit pname name; mainGemName = pname; }); basicEnv = (callPackage ../bundled-common { inherit bundler; }) (args // { inherit pname name; mainGemName = pname; });
inherit (basicEnv) envPaths; inherit (basicEnv) envPaths;
# Idea here is a mkDerivation that gen-bin-stubs new stubs "as specified" - # Idea here is a mkDerivation that gen-bin-stubs new stubs "as specified" -

57
pkgs/development/tools/build-managers/msbuild/create-deps.sh Executable file
View File

@ -0,0 +1,57 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p jq -p xmlstarlet -p curl
set -euo pipefail
cat << EOL
{ fetchurl }: [
EOL
mapfile -t repos < <(
xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.config |
while IFS= read index
do
curl --compressed -fsL "$index" | \
jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"'
done
)
find .packages fake-home/.nuget/packages -name \*.nupkg -printf '%P\n' | sort -u |
while IFS= read file
do
packagedir=$(dirname $file)
version=$(basename $packagedir)
package=$(dirname $packagedir)
found=false
for repo in "${repos[@]}"
do
url="$repo$package/$version/$package.$version.nupkg"
if curl -fsL "$url" -o /dev/null
then
found=true
break
fi
done
if ! $found
then
echo "couldn't find $package $version" >&2
exit 1
fi
sha256=$(nix-prefetch-url "$url" 2>/dev/null)
cat << EOL
{
name = "$package";
version = "$version";
src = fetchurl {
url = "$url";
sha256 = "$sha256";
};
}
EOL
done
cat << EOL
]
EOL

56
pkgs/development/tools/build-managers/msbuild/default.nix
View File

@ -1,23 +1,33 @@
{ lib, stdenv, fetchurl, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk }: { lib, stdenv, fetchurl, fetchpatch, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk, writeText, roslyn }:
let let
xplat = fetchurl { xplat = fetchurl {
url = "https://github.com/mono/msbuild/releases/download/0.07/mono_msbuild_xplat-master-8f608e49.zip"; url = "https://github.com/mono/msbuild/releases/download/0.08/mono_msbuild_6.4.0.208.zip";
sha256 = "1jxq3fk9a6q2a8i9zacxaz3fkvc22i9qvzlpa7wbb95h42g0ffhq"; sha256 = "05k7qmnhfvrdgyjn6vp81jb97y21m261jnwdyqpjqpcmzz18j93g";
}; };
deps = import ./nuget.nix { inherit fetchurl; }; deps = map (package: package.src)
(import ./deps.nix { inherit fetchurl; });
nuget-config = writeText "NuGet.config" ''
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
</packageSources>
</configuration>
'';
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "msbuild"; pname = "msbuild";
version = "16.3+xamarinxplat.2019.07.26.14.57"; version = "16.8+xamarinxplat.2020.07.30.15.02";
src = fetchurl { src = fetchurl {
url = "https://download.mono-project.com/sources/msbuild/msbuild-${version}.tar.xz"; url = "https://download.mono-project.com/sources/msbuild/msbuild-${version}.tar.xz";
sha256 = "1zcdfx4xsh62wj3g1jc2an0lppsfs691lz4dv05xbgi01aq1hk6a"; sha256 = "10amyca78b6pjfsy54b1rgwz2c1bx0sfky9zhldvzy4divckp25g";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -32,25 +42,34 @@ stdenv.mkDerivation rec {
makeWrapper makeWrapper
]; ];
# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=msbuild
phases = ["unpackPhase" "buildPhase" "installPhase" "installCheckPhase"];
# https://github.com/NixOS/nixpkgs/issues/38991 # https://github.com/NixOS/nixpkgs/issues/38991
# bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
LOCALE_ARCHIVE = lib.optionalString stdenv.isLinux LOCALE_ARCHIVE = lib.optionalString stdenv.isLinux
"${glibcLocales}/lib/locale/locale-archive"; "${glibcLocales}/lib/locale/locale-archive";
patches = [
(fetchpatch {
url = "https://github.com/mono/msbuild/commit/cad85cefabdaa001fb4bdbea2f5bf1d1cdb83c9b.patch";
sha256 = "1s8agc7nxxs69b3fl1v1air0c4dpig3hy4sk11l1560jrlx06dhh";
})
];
postPatch = ''
sed -i -e "/<\/projectImportSearchPaths>/a <property name=\"MSBuildExtensionsPath\" value=\"$out/lib/mono/xbuild\"/>" \
src/MSBuild/app.config
'';
buildPhase = '' buildPhase = ''
# nuget would otherwise try to base itself in /homeless-shelter # nuget would otherwise try to base itself in /homeless-shelter
export HOME=$(pwd)/fake-home export HOME=$(pwd)/fake-home
cp ${nuget-config} NuGet.config
nuget sources Add -Name nixos -Source $(pwd)/nixos
for package in ${toString deps}; do for package in ${toString deps}; do
nuget add $package -Source nixos nuget add $package -Source nixos
done done
nuget sources Disable -Name "nuget.org"
nuget sources Add -Name nixos -Source $(pwd)/nixos
# license check is case sensitive # license check is case sensitive
mv LICENSE license.bak && mv license.bak license mv LICENSE license.bak && mv license.bak license
@ -64,27 +83,25 @@ stdenv.mkDerivation rec {
# overwrite the file # overwrite the file
echo "#!${stdenv.shell}" > eng/common/dotnet-install.sh echo "#!${stdenv.shell}" > eng/common/dotnet-install.sh
# msbuild response files to use only the nixos source
echo "/p:RestoreSources=nixos" > artifacts/mono-msbuild/MSBuild.rsp
echo "/p:RestoreSources=nixos" > src/MSBuild/MSBuild.rsp
# not patchShebangs, there is /bin/bash in the body of the script as well # not patchShebangs, there is /bin/bash in the body of the script as well
substituteInPlace ./eng/cibuild_bootstrapped_msbuild.sh --replace /bin/bash ${stdenv.shell} substituteInPlace ./eng/cibuild_bootstrapped_msbuild.sh --replace /bin/bash ${stdenv.shell}
# DisableNerdbankVersioning https://gitter.im/Microsoft/msbuild/archives/2018/06/27?at=5b33dbc4ce3b0f268d489bfa # DisableNerdbankVersioning https://gitter.im/Microsoft/msbuild/archives/2018/06/27?at=5b33dbc4ce3b0f268d489bfa
# TODO there are some (many?) failing tests # TODO there are some (many?) failing tests
./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests /p:DisableNerdbankVersioning=true ./eng/cibuild_bootstrapped_msbuild.sh --host_type mono --configuration Release --skip_tests /p:DisableNerdbankVersioning=true
patchShebangs stage1/mono-msbuild/msbuild
''; '';
installPhase = '' installPhase = ''
mono artifacts/mono-msbuild/MSBuild.dll mono/build/install.proj /p:MonoInstallPrefix="$out" /p:Configuration=Release-MONO stage1/mono-msbuild/msbuild mono/build/install.proj /p:MonoInstallPrefix="$out" /p:Configuration=Release-MONO
ln -s ${mono}/lib/mono/msbuild/Current/bin/Roslyn $out/lib/mono/msbuild/Current/bin/Roslyn ln -s ${roslyn}/lib/dotnet/microsoft.net.compilers.toolset/*/tasks/net472 $out/lib/mono/msbuild/Current/bin/Roslyn
makeWrapper ${mono}/bin/mono $out/bin/msbuild \ makeWrapper ${mono}/bin/mono $out/bin/msbuild \
--set MSBuildExtensionsPath $out/lib/mono/xbuild \
--set-default MONO_GC_PARAMS "nursery-size=64m" \ --set-default MONO_GC_PARAMS "nursery-size=64m" \
--add-flags "$out/lib/mono/msbuild/15.0/bin/MSBuild.dll" --add-flags "$out/lib/mono/msbuild/15.0/bin/MSBuild.dll"
ln -s $(find ${dotnet-sdk} -name libhostfxr.so) $out/lib/mono/msbuild/Current/bin/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/
''; '';
doInstallCheck = true; doInstallCheck = true;
@ -130,4 +147,3 @@ EOF
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

1562
pkgs/development/tools/build-managers/msbuild/deps.nix generated Normal file
View File

File diff suppressed because it is too large Load Diff

1130
pkgs/development/tools/build-managers/msbuild/nuget.nix
View File

File diff suppressed because it is too large Load Diff

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ccls"; pname = "ccls";
version = "0.20201219"; version = "0.20210330";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MaskRay"; owner = "MaskRay";
repo = "ccls"; repo = "ccls";
rev = version; rev = version;
sha256 = "sha256-qCZYSzUh5WBQxMX6LtWRBz0VWnZVNR4v06aH9bJIb1o="; sha256 = "sha256-jipSipgD0avd7XODlpxnqjHK3s6nacaxbIQIddix7X8=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

116
pkgs/development/tools/scenebuilder/default.nix Normal file
View File

@ -0,0 +1,116 @@
{ lib, stdenv, fetchFromGitHub, jdk, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
let
# The default one still uses jdk8 (#89731)
gradle = (gradleGen.override (old: { java = jdk; })).gradle_latest;
pname = "scenebuilder";
version = "15.0.1";
src = fetchFromGitHub {
owner = "gluonhq";
repo = pname;
rev = version;
sha256 = "0dqlpfgr9qpmk62zsnhzw4q6n0swjqy00294q0kb4djp3jn47iz4";
};
deps = stdenv.mkDerivation {
name = "${pname}-deps";
inherit src;
nativeBuildInputs = [ jdk perl gradle ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d);
gradle --no-daemon build -x test
'';
# Mavenize dependency paths
# e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar
installPhase = ''
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
| sh
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0n93kb8pajlbidvdrsf3hwcwqzvgdm6dnly7wvk3vpargx6k7y1r";
};
# Point to our local deps repo
gradleInit = writeText "init.gradle" ''
settingsEvaluated { settings ->
settings.pluginManagement {
repositories {
clear()
maven { url '${deps}' }
}
}
}
logger.lifecycle 'Replacing Maven repositories with ${deps}...'
gradle.projectsLoaded {
rootProject.allprojects {
buildscript {
repositories {
clear()
maven { url '${deps}' }
}
}
repositories {
clear()
maven { url '${deps}' }
}
}
}
'';
desktopItem = makeDesktopItem {
name = "Scene Builder";
exec = "scenebuilder";
icon = "scenebuilder";
comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces.";
desktopName = pname;
mimeType = "application/java;application/java-vm;application/java-archive";
categories = "Development";
};
in stdenv.mkDerivation rec {
inherit pname src version;
nativeBuildInputs = [ jdk gradle makeWrapper glib wrapGAppsHook ];
dontWrapGApps = true; # prevent double wrapping
buildPhase = ''
runHook preBuild
export GRADLE_USER_HOME=$(mktemp -d)
gradle -PVERSION=${version} --offline --no-daemon --info --init-script ${gradleInit} build -x test
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/{${pname},icons/hicolor/128x128/apps}
cp app/build/libs/SceneBuilder-${version}-all.jar $out/share/${pname}/${pname}.jar
cp app/build/resources/main/com/oracle/javafx/scenebuilder/app/SB_Logo.png $out/share/icons/hicolor/128x128/apps/scenebuilder.png
runHook postInstall
'';
postFixup = ''
makeWrapper ${jdk}/bin/java $out/bin/${pname} --add-flags "-jar $out/share/${pname}/${pname}.jar" "''${gappsWrapperArgs[@]}"
'';
desktopItems = [ desktopItem ];
meta = with lib; {
description = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces.";
homepage = "https://gluonhq.com/products/scene-builder/";
license = licenses.bsd3;
maintainers = with maintainers; [ wirew0rm ];
platforms = platforms.all;
};
}

113
pkgs/development/tools/scenic-view/default.nix Normal file
View File

@ -0,0 +1,113 @@
{ lib, stdenv, fetchFromGitHub, jdk, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper }:
let
# The default one still uses jdk8 (#89731)
gradle = (gradleGen.override (old: { java = jdk; })).gradle_latest;
pname = "scenic-view";
version = "11.0.2";
src = fetchFromGitHub {
owner = "JonathanGiles";
repo = pname;
rev = version;
sha256 = "1idfh9hxqs4fchr6gvhblhvjqk4mpl4rnpi84vn1l3yb700z7dwy";
};
deps = stdenv.mkDerivation {
name = "${pname}-deps";
inherit src;
nativeBuildInputs = [ jdk perl gradle ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d);
gradle --no-daemon build
'';
# Mavenize dependency paths
# e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar
installPhase = ''
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
| sh
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0d6qs0wg2nfxyq85q46a8dcdqknz9pypb2qmvc8k2w8vcdac1y7n";
};
# Point to our local deps repo
gradleInit = writeText "init.gradle" ''
settingsEvaluated { settings ->
settings.pluginManagement {
repositories {
clear()
maven { url '${deps}' }
}
}
}
logger.lifecycle 'Replacing Maven repositories with ${deps}...'
gradle.projectsLoaded {
rootProject.allprojects {
buildscript {
repositories {
clear()
maven { url '${deps}' }
}
}
repositories {
clear()
maven { url '${deps}' }
}
}
}
'';
desktopItem = makeDesktopItem {
name = pname;
desktopName = pname;
exec = pname;
comment = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications.";
mimeType = "application/java;application/java-vm;application/java-archive";
categories = "Development";
};
in stdenv.mkDerivation rec {
inherit pname version src;
nativeBuildInputs = [ jdk gradle makeWrapper ];
buildPhase = ''
runHook preBuild
export GRADLE_USER_HOME=$(mktemp -d)
gradle --offline --no-daemon --info --init-script ${gradleInit} build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/${pname}
cp build/libs/scenicview.jar $out/share/${pname}/${pname}.jar
makeWrapper ${jdk}/bin/java $out/bin/${pname} --add-flags "-jar $out/share/${pname}/${pname}.jar"
runHook postInstall
'';
desktopItems = [ desktopItem ];
meta = with lib; {
description = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications.";
longDescription = ''
A JavaFX application designed to make it simple to understand the current state of your application scenegraph
and to also easily manipulate properties of the scenegraph without having to keep editing your code.
This lets you find bugs and get things pixel perfect without having to do the compile-check-compile dance.
'';
homepage = "https://github.com/JonathanGiles/scenic-view/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ wirew0rm ];
platforms = platforms.all;
};
}

3
pkgs/games/cataclysm-dda/default.nix
View File

@ -33,7 +33,8 @@ let
buildMod buildMod
buildSoundPack buildSoundPack
buildTileSet buildTileSet
wrapCDDA; wrapCDDA
attachPkgs;
inherit pkgs; inherit pkgs;
}; };

9
pkgs/games/cataclysm-dda/git.nix
View File

@ -1,4 +1,4 @@
{ lib, callPackage, CoreFoundation, fetchFromGitHub, pkgs, wrapCDDA { lib, callPackage, CoreFoundation, fetchFromGitHub, pkgs, wrapCDDA, attachPkgs
, tiles ? true, Cocoa , tiles ? true, Cocoa
, debug ? false , debug ? false
, useXdgDir ? false , useXdgDir ? false
@ -26,11 +26,6 @@ let
"VERSION=git-${version}-${lib.substring 0 8 src.rev}" "VERSION=git-${version}-${lib.substring 0 8 src.rev}"
]; ];
passthru = common.passthru // {
pkgs = pkgs.override { build = self; };
withMods = wrapCDDA self;
};
meta = common.meta // { meta = common.meta // {
maintainers = with lib.maintainers; maintainers = with lib.maintainers;
common.meta.maintainers ++ [ rardiol ]; common.meta.maintainers ++ [ rardiol ];
@ -38,4 +33,4 @@ let
}); });
in in
self attachPkgs pkgs self

31
pkgs/games/cataclysm-dda/lib.nix
View File

@ -1,6 +1,6 @@
{ callPackage }: { callPackage }:
{ rec {
buildMod = callPackage ./builder.nix { buildMod = callPackage ./builder.nix {
type = "mod"; type = "mod";
}; };
@ -14,4 +14,33 @@
}; };
wrapCDDA = callPackage ./wrapper.nix {}; wrapCDDA = callPackage ./wrapper.nix {};
# Required to fix `pkgs` and `withMods` attrs after applying `overrideAttrs`.
#
# Example:
# let
# myBuild = cataclysmDDA.jenkins.latest.tiles.overrideAttrs (_: {
# x = "hello";
# });
#
# # This refers to the derivation before overriding! So, `badExample.x` is not accessible.
# badExample = myBuild.withMods (_: []);
#
# # `myBuild` is correctly referred by `withMods` and `goodExample.x` is accessible.
# goodExample = let
# inherit (cataclysmDDA) attachPkgs pkgs;
# in
# (attachPkgs pkgs myBuild).withMods (_: []);
# in
# goodExample.x # returns "hello"
attachPkgs = pkgs: super:
let
self = super.overrideAttrs (old: {
passthru = old.passthru // {
pkgs = pkgs.override { build = self; };
withMods = wrapCDDA self;
};
});
in
self;
} }

10
pkgs/games/cataclysm-dda/pkgs/default.nix
View File

@ -13,15 +13,17 @@ let
}; };
}; };
pkgs' = lib.mapAttrs (_: mod: lib.filterAttrs availableForBuild mod) pkgs; pkgs' = lib.mapAttrs (_: mods: lib.filterAttrs isAvailable mods) pkgs;
availableForBuild = _: mod: isAvailable = _: mod:
if isNull build then if isNull build then
true true
else if build.isTiles then else if build.isTiles then
mod.forTiles mod.forTiles or false
else if build.isCurses then
mod.forCurses or false
else else
mod.forCurses; false;
in in
lib.makeExtensible (_: pkgs') lib.makeExtensible (_: pkgs')

9
pkgs/games/cataclysm-dda/stable.nix
View File

@ -1,4 +1,4 @@
{ lib, callPackage, CoreFoundation, fetchFromGitHub, pkgs, wrapCDDA { lib, callPackage, CoreFoundation, fetchFromGitHub, pkgs, wrapCDDA, attachPkgs
, tiles ? true, Cocoa , tiles ? true, Cocoa
, debug ? false , debug ? false
, useXdgDir ? false , useXdgDir ? false
@ -19,11 +19,6 @@ let
sha256 = "qhHtsm5cM0ct/7qXev0SiLInO2jqs2odxhWndLfRDIE="; sha256 = "qhHtsm5cM0ct/7qXev0SiLInO2jqs2odxhWndLfRDIE=";
}; };
passthru = common.passthru // {
pkgs = pkgs.override { build = self; };
withMods = wrapCDDA self;
};
meta = common.meta // { meta = common.meta // {
maintainers = with lib.maintainers; maintainers = with lib.maintainers;
common.meta.maintainers ++ [ skeidel ]; common.meta.maintainers ++ [ skeidel ];
@ -31,4 +26,4 @@ let
}); });
in in
self attachPkgs pkgs self

1248
pkgs/games/shticker-book-unwritten/cargo-lock.patch Normal file
View File

File diff suppressed because it is too large Load Diff

24
pkgs/games/shticker-book-unwritten/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ buildFHSUserEnv, callPackage, lib, stdenvNoCC }:
let
shticker-book-unwritten-unwrapped = callPackage ./unwrapped.nix { };
in buildFHSUserEnv {
name = "shticker_book_unwritten";
targetPkgs = pkgs: with pkgs; [
alsaLib
xorg.libX11
xorg.libXext
libglvnd
shticker-book-unwritten-unwrapped
];
runScript = "shticker_book_unwritten";
meta = with lib; {
description = "Minimal CLI launcher for the Toontown Rewritten MMORPG";
homepage = "https://github.com/JonathanHelianthicusDoe/shticker_book_unwritten";
license = licenses.gpl3Plus;
maintainers = [ maintainers.reedrw ];
platforms = platforms.linux;
};
}

20
pkgs/games/shticker-book-unwritten/unwrapped.nix Normal file
View File

@ -0,0 +1,20 @@
{ fetchFromGitHub, lib, openssl, pkg-config, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "shticker-book-unwritten";
version = "1.0.3";
src = fetchFromGitHub {
owner = "JonathanHelianthicusDoe";
repo = "shticker_book_unwritten";
rev = "v${version}";
sha256 = "08lyxica0b0vvivybsvzigy2j7saar78mbz723y3g5hqrilfb5np";
};
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "1lnhdr8mri1ns9lxj6aks4vs2v4fvg7mcriwzwj78inpi1l0xqk5";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
}

18
pkgs/games/shticker-book-unwritten/update-cargo-lock.sh Executable file
View File

@ -0,0 +1,18 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p cargo coreutils git gnugrep jq
set -eu -o verbose
here=$PWD
version=$(cat unwrapped.nix | grep '^ version = "' | cut -d '"' -f 2)
checkout=$(mktemp -d)
git clone -b "v$version" --depth=1 https://github.com/JonathanHelianthicusDoe/shticker_book_unwritten "$checkout"
cd "$checkout"
rm -f rust-toolchain
cargo generate-lockfile
git add -f Cargo.lock
git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch
cd "$here"
rm -rf "$checkout"

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

@ -1,12 +1,14 @@
{ lib, python3 }: { lib
, python3
}:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "homeassistant-cli"; pname = "homeassistant-cli";
version = "0.9.1"; version = "0.9.3";
src = python3.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1a31ky2p5w8byf0bjgma6xi328jj690qqksm3dwbi3v8dpqvghgf"; sha256 = "18h6bc99skzb0a1pffb6lr2z04928srrcz1w2zy66bndasic5yfs";
}; };
postPatch = '' postPatch = ''
@ -15,7 +17,17 @@ python3.pkgs.buildPythonApplication rec {
''; '';
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
requests netdisco click click-log tabulate jsonpath_rw jinja2 dateparser regex ruamel_yaml aiohttp aiohttp
click
click-log
dateparser
jinja2
jsonpath-ng
netdisco
regex
requests
ruamel-yaml
tabulate
]; ];
postInstall = '' postInstall = ''
@ -25,16 +37,14 @@ python3.pkgs.buildPythonApplication rec {
''; '';
checkInputs = with python3.pkgs; [ checkInputs = with python3.pkgs; [
pytest requests-mock pytestCheckHook
requests-mock
]; ];
checkPhase = ''
pytest
'';
meta = with lib; { meta = with lib; {
description = "Command-line tool for Home Assistant"; description = "Command-line tool for Home Assistant";
homepage = "https://github.com/home-assistant/home-assistant-cli"; homepage = "https://github.com/home-assistant/home-assistant-cli";
changelog = "https://github.com/home-assistant-ecosystem/home-assistant-cli/releases/tag/${version}";
license = licenses.asl20; license = licenses.asl20;
maintainers = teams.home-assistant.members; maintainers = teams.home-assistant.members;
}; };

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -937,7 +937,7 @@
"webhook" = ps: with ps; [ aiohttp-cors ]; "webhook" = ps: with ps; [ aiohttp-cors ];
"webostv" = ps: with ps; [ aiopylgtv ]; "webostv" = ps: with ps; [ aiopylgtv ];
"websocket_api" = ps: with ps; [ aiohttp-cors ]; "websocket_api" = ps: with ps; [ aiohttp-cors ];
"wemo" = ps: with ps; [ ]; # missing inputs: pywemo "wemo" = ps: with ps; [ pywemo ];
"whois" = ps: with ps; [ python-whois ]; "whois" = ps: with ps; [ python-whois ];
"wiffi" = ps: with ps; [ wiffi ]; "wiffi" = ps: with ps; [ wiffi ];
"wilight" = ps: with ps; [ pywilight ]; "wilight" = ps: with ps; [ pywilight ];

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

@ -367,6 +367,7 @@ in with py.pkgs; buildPythonApplication rec {
"weather" "weather"
"webhook" "webhook"
"websocket_api" "websocket_api"
"wemo"
"wled" "wled"
"workday" "workday"
"worldclock" "worldclock"

13
pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ grafanaPlugin, lib }:
grafanaPlugin rec {
pname = "doitintl-bigquery-datasource";
version = "2.0.1";
zipHash = "sha256-tZyvER/rxL+mo2tgxFvwSIAmjFm/AnZ0RgvmD1YAE2U=";
meta = with lib; {
description = "BigQuery DataSource for Grafana";
license = licenses.mit;
maintainers = with maintainers; [ jwygoda ];
platforms = platforms.unix;
};
}

1
pkgs/servers/monitoring/grafana/plugins/plugins.nix
View File

@ -4,6 +4,7 @@
grafanaPlugin = callPackage ./grafana-plugin.nix { }; grafanaPlugin = callPackage ./grafana-plugin.nix { };
doitintl-bigquery-datasource = callPackage ./doitintl-bigquery-datasource { };
grafana-clock-panel = callPackage ./grafana-clock-panel { }; grafana-clock-panel = callPackage ./grafana-clock-panel { };
grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-piechart-panel = callPackage ./grafana-piechart-panel { };
grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { };

3
pkgs/servers/sql/mysql/5.7.x.nix
View File

@ -21,7 +21,8 @@ self = stdenv.mkDerivation rec {
export PATH=$PATH:$TMPDIR export PATH=$PATH:$TMPDIR
''; '';
nativeBuildInputs = [ cmake bison pkg-config rpcsvc-proto ]; nativeBuildInputs = [ bison cmake pkg-config ]
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ] buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ]
++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ] ++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]

3
pkgs/servers/sql/mysql/8.0.x.nix
View File

@ -17,7 +17,8 @@ self = stdenv.mkDerivation rec {
./abi-check.patch ./abi-check.patch
]; ];
nativeBuildInputs = [ bison cmake pkg-config rpcsvc-proto ]; nativeBuildInputs = [ bison cmake pkg-config ]
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
postPatch = '' postPatch = ''

8
pkgs/servers/web-apps/matomo/default.nix
View File

@ -3,16 +3,16 @@
let let
versions = { versions = {
matomo = { matomo = {
version = "3.14.1"; version = "4.2.1";
sha256 = "0gp6v797118z703nh0p77zvsizvdg0c2jkn26996d4sqw5pa78v3"; sha256 = "d3ea7572c5b42f2636da89b9c15dd7ae16da1d06dab0cea2ed93304a960277ac";
}; };
matomo-beta = { matomo-beta = {
version = "3.14.1"; version = "4.2.1";
# `beta` examples: "b1", "rc1", null # `beta` examples: "b1", "rc1", null
# TOOD when updating: use null if stable version is >= latest beta or release candidate # TOOD when updating: use null if stable version is >= latest beta or release candidate
beta = null; beta = null;
sha256 = "0gp6v797118z703nh0p77zvsizvdg0c2jkn26996d4sqw5pa78v3"; sha256 = "d3ea7572c5b42f2636da89b9c15dd7ae16da1d06dab0cea2ed93304a960277ac";
}; };
}; };
common = pname: { version, sha256, beta ? null }: common = pname: { version, sha256, beta ? null }:

3
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -19,8 +19,7 @@ in with pkgs; rec {
tarMinimal = gnutar.override { acl = null; }; tarMinimal = gnutar.override { acl = null; };
busyboxMinimal = busybox.override { busyboxMinimal = busybox.override {
useMusl = with stdenv.targetPlatform; !isRiscV && useMusl = !stdenv.targetPlatform.isRiscV;
(system == "powerpc64-linux" -> parsed.abi.name != "elfv1");
enableStatic = true; enableStatic = true;
enableMinimal = true; enableMinimal = true;
extraConfig = '' extraConfig = ''

4
pkgs/tools/admin/lxd/default.nix
View File

@ -18,13 +18,13 @@ let
in in
buildGoPackage rec { buildGoPackage rec {
pname = "lxd"; pname = "lxd";
version = "4.12"; version = "4.13";
goPackagePath = "github.com/lxc/lxd"; goPackagePath = "github.com/lxc/lxd";
src = fetchurl { src = fetchurl {
url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "1qgi9ciljq8h3ja9kalfvnxnjymddd5j4agv984137z443mqfnrw"; sha256 = "0w2r80wf86jijgfxbkv06lgfhz4p2aaidsqd96bx3q1382nrbzcf";
}; };
postPatch = '' postPatch = ''

2
pkgs/tools/misc/tmux/default.nix
View File

@ -2,7 +2,6 @@
, fetchFromGitHub , fetchFromGitHub
, autoreconfHook , autoreconfHook
, pkg-config , pkg-config
, makeWrapper
, bison , bison
, ncurses , ncurses
, libevent , libevent
@ -41,7 +40,6 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
ncurses ncurses
libevent libevent
makeWrapper
]; ];
configureFlags = [ configureFlags = [

63
pkgs/tools/networking/p2p/amule/default.nix
View File

@ -2,53 +2,46 @@
, enableDaemon ? false # build amule daemon , enableDaemon ? false # build amule daemon
, httpServer ? false # build web interface for the daemon , httpServer ? false # build web interface for the daemon
, client ? false # build amule remote gui , client ? false # build amule remote gui
, fetchFromGitHub, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng , fetchFromGitHub
, autoreconfHook, pkg-config, makeWrapper, libX11 }: , stdenv
, lib
, cmake
, zlib
, wxGTK
, perl
, cryptopp
, libupnp
, gettext
, libpng
, autoreconfHook
, pkg-config
, makeWrapper
, libX11
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "amule"; pname = "amule";
version = "unstable-20201006"; version = "2.3.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "amule-project"; owner = "amule-project";
repo = "amule"; repo = "amule";
rev = "6f8951527eda670c7266984ce476061bfe8867fc"; rev = version;
sha256 = "12b44b6hz3mb7nsn6xhzvm726xs06xcim013i1appif4dr8njbx1"; sha256 = "1nm4vxgmisn1b6l3drmz0q04x067j2i8lw5rnf0acaapwlp8qwvi";
}; };
postPatch = '' nativeBuildInputs = [ cmake gettext makeWrapper pkg-config ];
substituteInPlace src/libs/ec/file_generator.pl \
--replace /usr/bin/perl ${perl}/bin/perl
# autotools expects these to be in the root
cp docs/{AUTHORS,README} .
cp docs/Changelog ./ChangeLog
cp docs/Changelog ./NEWS
'';
preAutoreconf = ''
pushd src/pixmaps/flags_xpm >/dev/null
./makeflags.sh
popd >/dev/null
'';
nativeBuildInputs = [ autoreconfHook gettext makeWrapper pkg-config ];
buildInputs = [ buildInputs = [
zlib wxGTK perl cryptopp libupnp zlib wxGTK perl cryptopp.dev libupnp
] ++ lib.optional httpServer libpng ] ++ lib.optional httpServer libpng
++ lib.optional client libX11; ++ lib.optional client libX11;
enableParallelBuilding = true; cmakeFlags = [
"-DBUILD_MONOLITHIC=${if monolithic then "ON" else "OFF"}"
configureFlags = [ "-DBUILD_DAEMON=${if enableDaemon then "ON" else "OFF"}"
"--with-crypto-prefix=${cryptopp}" "-DBUILD_REMOTEGUI=${if client then "ON" else "OFF"}"
"--disable-debug" "-DBUILD_WEBSERVER=${if httpServer then "ON" else "OFF"}"
"--enable-optimize"
(lib.enableFeature monolithic "monolithic")
(lib.enableFeature enableDaemon "amule-daemon")
(lib.enableFeature client "amule-gui")
(lib.enableFeature httpServer "webserver")
]; ];
# aMule will try to `dlopen' libupnp and libixml, so help it # aMule will try to `dlopen' libupnp and libixml, so help it
@ -75,7 +68,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ phreedom ]; maintainers = with maintainers; [ phreedom ];
platforms = platforms.unix; platforms = platforms.unix;
# Could not find crypto++ installation or sources. # cmake fails: Cannot specify link libraries for target "wxWidgets::ADV" which is not built by this project.
broken = true; broken = enableDaemon;
}; };
} }

4
pkgs/tools/security/clamav/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clamav"; pname = "clamav";
version = "0.103.1"; version = "0.103.2";
src = fetchurl { src = fetchurl {
url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
sha256 = "sha256-cwjEe4myaK87nzYUBSiSekn/PmM6nJwKrCcS2BBW4lc="; sha256 = "sha256-1LXQrGZiYuQjoyb7VHeMqnxpYk1sP5VCiV/rhHgnG9I=";
}; };
# don't install sample config files into the absolute sysconfdir folder # don't install sample config files into the absolute sysconfdir folder

6
pkgs/tools/security/enpass/data.json
View File

@ -1,8 +1,8 @@
{ {
"amd64": { "amd64": {
"path": "pool/main/e/enpass/enpass_6.5.1.723_amd64.deb", "path": "pool/main/e/enpass/enpass_6.6.1.809_amd64.deb",
"sha256": "d9bb408fa2253ce44ab5396898f7db13291ce23ae58964f4a27ade38bd5067bf", "sha256": "b1b9bd67653c3163bd80b340150ecf123552cbe4af23c350fbadea8ffd7939ba",
"version": "6.5.1.723" "version": "6.6.1.809"
}, },
"i386": { "i386": {
"path": "pool/main/e/enpass/enpass_5.6.9_i386.deb", "path": "pool/main/e/enpass/enpass_5.6.9_i386.deb",

2
pkgs/tools/security/metasploit/Gemfile
View File

@ -1,4 +1,4 @@
# frozen_string_literal: true # frozen_string_literal: true
source "https://rubygems.org" source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.38" gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.39"

30
pkgs/tools/security/metasploit/Gemfile.lock
View File

@ -1,9 +1,9 @@
GIT GIT
remote: https://github.com/rapid7/metasploit-framework remote: https://github.com/rapid7/metasploit-framework
revision: 4c7a221f3d186b0cd65d2a765533fda54f0848f4 revision: 5cba6ecd3c745f45290400f0705400f26913852e
ref: refs/tags/6.0.38 ref: refs/tags/6.0.39
specs: specs:
metasploit-framework (6.0.38) metasploit-framework (6.0.39)
actionpack (~> 5.2.2) actionpack (~> 5.2.2)
activerecord (~> 5.2.2) activerecord (~> 5.2.2)
activesupport (~> 5.2.2) activesupport (~> 5.2.2)
@ -27,11 +27,11 @@ GIT
jsobfu jsobfu
json json
metasm metasm
metasploit-concern metasploit-concern (~> 3.0.0)
metasploit-credential metasploit-credential (~> 4.0.0)
metasploit-model metasploit-model (~> 3.1.0)
metasploit-payloads (= 2.0.41) metasploit-payloads (= 2.0.41)
metasploit_data_models metasploit_data_models (~> 4.1.0)
metasploit_payloads-mettle (= 1.0.8) metasploit_payloads-mettle (= 1.0.8)
mqtt mqtt
msgpack msgpack
@ -123,13 +123,13 @@ GEM
arel-helpers (2.12.0) arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7) activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1) aws-eventstream (1.1.1)
aws-partitions (1.441.0) aws-partitions (1.443.0)
aws-sdk-core (3.113.1) aws-sdk-core (3.113.1)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0) aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
jmespath (~> 1.0) jmespath (~> 1.0)
aws-sdk-ec2 (1.232.0) aws-sdk-ec2 (1.234.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-iam (1.52.0) aws-sdk-iam (1.52.0)
@ -190,7 +190,7 @@ GEM
jsobfu (0.4.2) jsobfu (0.4.2)
rkelly-remix rkelly-remix
json (2.5.1) json (2.5.1)
loofah (2.9.0) loofah (2.9.1)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
metasm (1.0.4) metasm (1.0.4)
@ -213,7 +213,7 @@ GEM
activesupport (~> 5.2.2) activesupport (~> 5.2.2)
railties (~> 5.2.2) railties (~> 5.2.2)
metasploit-payloads (2.0.41) metasploit-payloads (2.0.41)
metasploit_data_models (4.1.2) metasploit_data_models (4.1.3)
activerecord (~> 5.2.2) activerecord (~> 5.2.2)
activesupport (~> 5.2.2) activesupport (~> 5.2.2)
arel-helpers arel-helpers
@ -238,7 +238,7 @@ GEM
network_interface (0.0.2) network_interface (0.0.2)
nexpose (7.3.0) nexpose (7.3.0)
nio4r (2.5.7) nio4r (2.5.7)
nokogiri (1.11.2) nokogiri (1.11.3)
mini_portile2 (~> 2.5.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4) racc (~> 1.4)
octokit (4.20.0) octokit (4.20.0)
@ -330,15 +330,15 @@ GEM
rex-socket rex-socket
rex-text rex-text
rex-struct2 (0.1.3) rex-struct2 (0.1.3)
rex-text (0.2.33) rex-text (0.2.34)
rex-zip (0.1.4) rex-zip (0.1.4)
rex-text rex-text
rexml (3.2.4) rexml (3.2.5)
rkelly-remix (0.0.7) rkelly-remix (0.0.7)
ruby-macho (2.5.0) ruby-macho (2.5.0)
ruby-rc4 (0.1.5) ruby-rc4 (0.1.5)
ruby2_keywords (0.0.4) ruby2_keywords (0.0.4)
ruby_smb (2.0.7) ruby_smb (2.0.8)
bindata bindata
openssl-ccm openssl-ccm
openssl-cmac openssl-cmac

4
pkgs/tools/security/metasploit/default.nix
View File

@ -8,13 +8,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "metasploit-framework"; pname = "metasploit-framework";
version = "6.0.38"; version = "6.0.39";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapid7"; owner = "rapid7";
repo = "metasploit-framework"; repo = "metasploit-framework";
rev = version; rev = version;
sha256 = "sha256-/e1BWhkM4A+xrvDS6Z01sND9aOZDn+cL0RIcAgT5oZs="; sha256 = "sha256-9uoxxcuEJudJGRQfkVBUWDHoZ1sxaIb+Hjf/sEpcqik=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

38
pkgs/tools/security/metasploit/gemset.nix
View File

@ -114,10 +114,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "07i9mqbh19pd25wd3laxv1bcmzcpriw54g0x3mqzkn600h8f3lg9"; sha256 = "0vvav3449v3m0nyflcw07sbxlpgqf4pwa2fmirgjvc9r9asssi79";
type = "gem"; type = "gem";
}; };
version = "1.441.0"; version = "1.443.0";
}; };
aws-sdk-core = { aws-sdk-core = {
groups = ["default"]; groups = ["default"];
@ -134,10 +134,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0n7hi66zpm8mgfgf32gw7c9p4rv09q9kipsr01l5l2n2d69k67q5"; sha256 = "1rlq8vifcmz24v1aw8vj2czqj4dnf00smm5ndfpaxz5k6550lbz4";
type = "gem"; type = "gem";
}; };
version = "1.232.0"; version = "1.234.0";
}; };
aws-sdk-iam = { aws-sdk-iam = {
groups = ["default"]; groups = ["default"];
@ -474,10 +474,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck"; sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7";
type = "gem"; type = "gem";
}; };
version = "2.9.0"; version = "2.9.1";
}; };
metasm = { metasm = {
groups = ["default"]; groups = ["default"];
@ -514,12 +514,12 @@
platforms = []; platforms = [];
source = { source = {
fetchSubmodules = false; fetchSubmodules = false;
rev = "4c7a221f3d186b0cd65d2a765533fda54f0848f4"; rev = "5cba6ecd3c745f45290400f0705400f26913852e";
sha256 = "16x1z420470js45yg7s3wrlgvl5h6nfyklphmsqhzq0c35d43vgx"; sha256 = "0adabi5b1zrp3vz8cs1ibdkyhcaqai8927ql354yf9l4rg2k3spn";
type = "git"; type = "git";
url = "https://github.com/rapid7/metasploit-framework"; url = "https://github.com/rapid7/metasploit-framework";
}; };
version = "6.0.38"; version = "6.0.39";
}; };
metasploit-model = { metasploit-model = {
groups = ["default"]; groups = ["default"];
@ -546,10 +546,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1kzlvq20ml4b5lr1qbrkmivdi37mxi8fasdqg4yla2libfbdz008"; sha256 = "0li8lphplsmv9x1f14c22w95gjx2lscas3x5py7x7kc05pfv33bg";
type = "gem"; type = "gem";
}; };
version = "4.1.2"; version = "4.1.3";
}; };
metasploit_payloads-mettle = { metasploit_payloads-mettle = {
groups = ["default"]; groups = ["default"];
@ -696,10 +696,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p"; sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
type = "gem"; type = "gem";
}; };
version = "1.11.2"; version = "1.11.3";
}; };
octokit = { octokit = {
groups = ["default"]; groups = ["default"];
@ -1096,10 +1096,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1933p6fri27d2gscws43k1v8jw1821l5j4yfi9z97ch5l80mv1zr"; sha256 = "01g6jr73c3hbqhmzlc80jlqz2cwn9bq1j3cc19fpkq3hdg89drjp";
type = "gem"; type = "gem";
}; };
version = "0.2.33"; version = "0.2.34";
}; };
rex-zip = { rex-zip = {
groups = ["default"]; groups = ["default"];
@ -1116,10 +1116,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
type = "gem"; type = "gem";
}; };
version = "3.2.4"; version = "3.2.5";
}; };
rkelly-remix = { rkelly-remix = {
groups = ["default"]; groups = ["default"];
@ -1166,10 +1166,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0px84i3d9kqb40ff7nk3k7hb3w3kk80w5zsgi61svgddp1dbzh1n"; sha256 = "0bg7xxw5cww4wy7vhr54i07ni82sh4qq465fir7az5z0hf36b1kg";
type = "gem"; type = "gem";
}; };
version = "2.0.7"; version = "2.0.8";
}; };
rubyntlm = { rubyntlm = {
groups = ["default"]; groups = ["default"];

28
pkgs/tools/security/step-ca/default.nix
View File

@ -2,29 +2,43 @@
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, buildGoModule , buildGoModule
, coreutils
, pcsclite , pcsclite
, PCSC , PCSC
, pkg-config , pkg-config
, hsmSupport ? true
}: }:
buildGoModule rec { buildGoModule rec {
pname = "step-ca"; pname = "step-ca";
version = "0.15.6"; version = "0.15.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "smallstep"; owner = "smallstep";
repo = "certificates"; repo = "certificates";
rev = "v${version}"; rev = "v${version}";
sha256 = "0n26692ph4q4cmrqammfazmx1k9p2bydwqc57q4hz5ni6jd31zbz"; sha256 = "wFRs3n6V0z2keNVtqFw1q5jpA6BvNK5EftsNhichfsY=";
}; };
vendorSha256 = "0w0phyqymcg2h2jjasxmkf4ryn4y1bqahcy94rs738cqr5ifyfbg"; vendorSha256 = "f1NdszqYYx6X1HqwqG26jjfjXq1gDXLOrh64ccKRQ90=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ];
buildInputs = buildInputs =
lib.optional stdenv.isLinux (lib.getDev pcsclite) lib.optionals (hsmSupport && stdenv.isLinux) [ pcsclite ]
++ lib.optional stdenv.isDarwin PCSC; ++ lib.optionals (hsmSupport && stdenv.isDarwin) [ PCSC ];
postPatch = ''
substituteInPlace systemd/step-ca.service --replace "/bin/kill" "${coreutils}/bin/kill"
'';
preBuild = ''
${lib.optionalString (!hsmSupport) "export CGO_ENABLED=0"}
'';
postInstall = ''
install -Dm444 -t $out/lib/systemd/system systemd/step-ca.service
'';
# Tests fail on darwin with # Tests fail on darwin with
# panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted [recovered] # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted [recovered]
@ -35,7 +49,7 @@ buildGoModule rec {
description = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH"; description = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH";
homepage = "https://smallstep.com/certificates/"; homepage = "https://smallstep.com/certificates/";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ cmcdragonkai ]; maintainers = with maintainers; [ cmcdragonkai mohe2015 ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

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

@ -11050,6 +11050,8 @@ in
monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
roslyn = callPackage ../development/compilers/roslyn { mono = mono6; };
msbuild = callPackage ../development/tools/build-managers/msbuild { mono = mono6; }; msbuild = callPackage ../development/tools/build-managers/msbuild { mono = mono6; };
mosml = callPackage ../development/compilers/mosml { }; mosml = callPackage ../development/compilers/mosml { };
@ -13294,6 +13296,10 @@ in
schemaspy = callPackage ../development/tools/database/schemaspy { }; schemaspy = callPackage ../development/tools/database/schemaspy { };
scenebuilder = callPackage ../development/tools/scenebuilder { };
scenic-view = callPackage ../development/tools/scenic-view { };
shncpd = callPackage ../tools/networking/shncpd { }; shncpd = callPackage ../tools/networking/shncpd { };
sigrok-cli = callPackage ../development/tools/sigrok-cli { }; sigrok-cli = callPackage ../development/tools/sigrok-cli { };
@ -26580,6 +26586,10 @@ in
wmctrl = callPackage ../tools/X11/wmctrl { }; wmctrl = callPackage ../tools/X11/wmctrl { };
wmderland = callPackage ../applications/window-managers/wmderland { };
wmderlandc = callPackage ../applications/window-managers/wmderlandc { };
wmii_hg = callPackage ../applications/window-managers/wmii-hg { }; wmii_hg = callPackage ../applications/window-managers/wmii-hg { };
wofi = callPackage ../applications/misc/wofi { }; wofi = callPackage ../applications/misc/wofi { };
@ -27936,6 +27946,8 @@ in
shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { };
shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { };
sienna = callPackage ../games/sienna { love = love_0_10; }; sienna = callPackage ../games/sienna { love = love_0_10; };
sil = callPackage ../games/sil { }; sil = callPackage ../games/sil { };
@ -29231,7 +29243,6 @@ in
celestia = callPackage ../applications/science/astronomy/celestia { celestia = callPackage ../applications/science/astronomy/celestia {
autoreconfHook = buildPackages.autoreconfHook269; autoreconfHook = buildPackages.autoreconfHook269;
lua = lua5_1;
inherit (pkgs.gnome2) gtkglext; inherit (pkgs.gnome2) gtkglext;
}; };
@ -30726,6 +30737,10 @@ in
openring = callPackage ../applications/misc/openring { }; openring = callPackage ../applications/misc/openring { };
openvino = callPackage ../development/libraries/openvino {
python = python3;
};
phonetisaurus = callPackage ../development/libraries/phonetisaurus {}; phonetisaurus = callPackage ../development/libraries/phonetisaurus {};
duti = callPackage ../os-specific/darwin/duti { duti = callPackage ../os-specific/darwin/duti {

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

@ -3675,6 +3675,8 @@ in {
kaptan = callPackage ../development/python-modules/kaptan { }; kaptan = callPackage ../development/python-modules/kaptan { };
karton-asciimagic = callPackage ../development/python-modules/karton-asciimagic { };
karton-classifier = callPackage ../development/python-modules/karton-classifier { }; karton-classifier = callPackage ../development/python-modules/karton-classifier { };
karton-core = callPackage ../development/python-modules/karton-core { }; karton-core = callPackage ../development/python-modules/karton-core { };
@ -4873,6 +4875,11 @@ in {
opentracing = callPackage ../development/python-modules/opentracing { }; opentracing = callPackage ../development/python-modules/opentracing { };
openvino = disabledIf isPy27 (toPythonModule (pkgs.openvino.override {
inherit (self) python;
enablePython = true;
}));
openwebifpy = callPackage ../development/python-modules/openwebifpy { }; openwebifpy = callPackage ../development/python-modules/openwebifpy { };
openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { }); openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { });
@ -7093,6 +7100,8 @@ in {
pywebview = callPackage ../development/python-modules/pywebview { }; pywebview = callPackage ../development/python-modules/pywebview { };
pywemo = callPackage ../development/python-modules/pywemo { };
pywick = callPackage ../development/python-modules/pywick { }; pywick = callPackage ../development/python-modules/pywick { };
pywilight = callPackage ../development/python-modules/pywilight { }; pywilight = callPackage ../development/python-modules/pywilight { };

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