Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
8aeb21f8cb
|
|
@ -148,6 +148,28 @@ rec {
|
|||
/* A combination of `traceVal` and `traceSeqN`. */
|
||||
traceValSeqN = traceValSeqNFn id;
|
||||
|
||||
/* Trace the input and output of a function `f` named `name`,
|
||||
both down to `depth`.
|
||||
|
||||
This is useful for adding around a function call,
|
||||
to see the before/after of values as they are transformed.
|
||||
|
||||
Example:
|
||||
traceFnSeqN 2 "id" (x: x) { a.b.c = 3; }
|
||||
trace: { fn = "id"; from = { a.b = {…}; }; to = { a.b = {…}; }; }
|
||||
=> { a.b.c = 3; }
|
||||
*/
|
||||
traceFnSeqN = depth: name: f: v:
|
||||
let res = f v;
|
||||
in lib.traceSeqN
|
||||
(depth + 1)
|
||||
{
|
||||
fn = name;
|
||||
from = v;
|
||||
to = res;
|
||||
}
|
||||
res;
|
||||
|
||||
|
||||
# -- TESTING --
|
||||
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ let
|
|||
assertMsg assertOneOf;
|
||||
inherit (self.debug) addErrorContextToAttrs traceIf traceVal traceValFn
|
||||
traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq
|
||||
traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal
|
||||
traceValSeqFn traceValSeqN traceValSeqNFn traceFnSeqN traceShowVal
|
||||
traceShowValMarked showVal traceCall traceCall2 traceCall3
|
||||
traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr;
|
||||
inherit (self.misc) maybeEnv defaultMergeArg defaultMerge foldArgs
|
||||
|
|
|
|||
|
|
@ -10524,4 +10524,10 @@
|
|||
github = "zupo";
|
||||
githubId = 311580;
|
||||
};
|
||||
jbcrail = {
|
||||
name = "Joseph Crail";
|
||||
email = "jbcrail@gmail.com";
|
||||
github = "jbcrail";
|
||||
githubId = 6038;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
|
||||
# TODO: test configuration when building nixexpr (use -t parameter)
|
||||
# TODO: support sqlite3 (it's deprecate?) and mysql
|
||||
|
||||
|
|
@ -111,6 +112,7 @@ let
|
|||
{
|
||||
options = {
|
||||
password = mkOption {
|
||||
type = types.str;
|
||||
# TODO: required?
|
||||
description = ''
|
||||
Specifies the password that must be supplied for the default Bacula
|
||||
|
|
@ -130,6 +132,7 @@ let
|
|||
};
|
||||
|
||||
monitor = mkOption {
|
||||
type = types.enum [ "no" "yes" ];
|
||||
default = "no";
|
||||
example = "yes";
|
||||
description = ''
|
||||
|
|
@ -150,6 +153,7 @@ let
|
|||
{
|
||||
options = {
|
||||
changerDevice = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
The specified name-string must be the generic SCSI device name of the
|
||||
autochanger that corresponds to the normal read/write Archive Device
|
||||
|
|
@ -168,6 +172,7 @@ let
|
|||
};
|
||||
|
||||
changerCommand = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
The name-string specifies an external program to be called that will
|
||||
automatically change volumes as required by Bacula. Normally, this
|
||||
|
|
@ -191,10 +196,12 @@ let
|
|||
|
||||
devices = mkOption {
|
||||
description = "";
|
||||
type = types.listOf types.str;
|
||||
};
|
||||
|
||||
extraAutochangerConfig = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = ''
|
||||
Extra configuration to be passed in Autochanger directive.
|
||||
'';
|
||||
|
|
@ -211,6 +218,7 @@ let
|
|||
options = {
|
||||
archiveDevice = mkOption {
|
||||
# TODO: required?
|
||||
type = types.str;
|
||||
description = ''
|
||||
The specified name-string gives the system file name of the storage
|
||||
device managed by this storage daemon. This will usually be the
|
||||
|
|
@ -227,6 +235,7 @@ let
|
|||
|
||||
mediaType = mkOption {
|
||||
# TODO: required?
|
||||
type = types.str;
|
||||
description = ''
|
||||
The specified name-string names the type of media supported by this
|
||||
device, for example, <literal>DLT7000</literal>. Media type names are
|
||||
|
|
@ -264,6 +273,7 @@ let
|
|||
|
||||
extraDeviceConfig = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = ''
|
||||
Extra configuration to be passed in Device directive.
|
||||
'';
|
||||
|
|
@ -292,6 +302,7 @@ in {
|
|||
|
||||
name = mkOption {
|
||||
default = "${config.networking.hostName}-fd";
|
||||
type = types.str;
|
||||
description = ''
|
||||
The client name that must be used by the Director when connecting.
|
||||
Generally, it is a good idea to use a name related to the machine so
|
||||
|
|
@ -320,6 +331,7 @@ in {
|
|||
|
||||
extraClientConfig = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = ''
|
||||
Extra configuration to be passed in Client directive.
|
||||
'';
|
||||
|
|
@ -331,6 +343,7 @@ in {
|
|||
|
||||
extraMessagesConfig = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = ''
|
||||
Extra configuration to be passed in Messages directive.
|
||||
'';
|
||||
|
|
@ -351,6 +364,7 @@ in {
|
|||
|
||||
name = mkOption {
|
||||
default = "${config.networking.hostName}-sd";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Specifies the Name of the Storage daemon.
|
||||
'';
|
||||
|
|
@ -391,6 +405,7 @@ in {
|
|||
|
||||
extraStorageConfig = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = ''
|
||||
Extra configuration to be passed in Storage directive.
|
||||
'';
|
||||
|
|
@ -402,6 +417,7 @@ in {
|
|||
|
||||
extraMessagesConfig = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = ''
|
||||
Extra configuration to be passed in Messages directive.
|
||||
'';
|
||||
|
|
@ -423,6 +439,7 @@ in {
|
|||
|
||||
name = mkOption {
|
||||
default = "${config.networking.hostName}-dir";
|
||||
type = types.str;
|
||||
description = ''
|
||||
The director name used by the system administrator. This directive is
|
||||
required.
|
||||
|
|
@ -444,6 +461,7 @@ in {
|
|||
|
||||
password = mkOption {
|
||||
# TODO: required?
|
||||
type = types.str;
|
||||
description = ''
|
||||
Specifies the password that must be supplied for a Director.
|
||||
'';
|
||||
|
|
@ -451,6 +469,7 @@ in {
|
|||
|
||||
extraMessagesConfig = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = ''
|
||||
Extra configuration to be passed in Messages directive.
|
||||
'';
|
||||
|
|
@ -461,6 +480,7 @@ in {
|
|||
|
||||
extraDirectorConfig = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = ''
|
||||
Extra configuration to be passed in Director directive.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -66,10 +66,10 @@ let
|
|||
++ optional service.debugTraceDisabled
|
||||
"--debug-trace-disabled"
|
||||
++ map (e: "--env ${escapeShellArg e}") (mapAttrsToList (name: value: "${name}=${value}") service.environmentVariables)
|
||||
++ optionals (service.executor == "docker") (
|
||||
++ optionals (hasPrefix "docker" service.executor) (
|
||||
assert (
|
||||
assertMsg (service.dockerImage != null)
|
||||
"dockerImage option is required for docker executor (${name})");
|
||||
"dockerImage option is required for ${service.executor} executor (${name})");
|
||||
[ "--docker-image ${service.dockerImage}" ]
|
||||
++ optional service.dockerDisableCache
|
||||
"--docker-disable-cache"
|
||||
|
|
|
|||
32
pkgs/applications/audio/apple-music-electron/default.nix
Normal file
32
pkgs/applications/audio/apple-music-electron/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ appimageTools, lib, fetchurl }:
|
||||
let
|
||||
pname = "apple-music-electron";
|
||||
version = "1.5.2";
|
||||
name = "Apple.Music-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/iiFir3z/Apple-Music-Electron/releases/download/${version}/${name}.AppImage";
|
||||
sha256 = "1jl0wgwy6ajmfkzygwb7cm9m49nkhp3x6vd8kwmh6ccs3jy4ayp5";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit name src; };
|
||||
in appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${name} $out/bin/${pname}
|
||||
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=$out/bin/apple-music-electron'
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial Apple Music application without having to bother with a Web Browser or iTunes";
|
||||
homepage = "https://github.com/iiFir3z/Apple-Music-Electron";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ivar ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
24
pkgs/applications/audio/m4acut/default.nix
Normal file
24
pkgs/applications/audio/m4acut/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, stdenv, autoreconfHook, fetchFromGitHub, l-smash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "m4acut";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nu774";
|
||||
repo = "m4acut";
|
||||
rev = "v${version}";
|
||||
sha256 = "1hzf9f1fzmlpnxjaxhs2w22wzb28vd87ycaddnix1mmhvh3nvzkd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ l-smash ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Losslessly & gaplessly cut m4a (AAC in MP4) files.";
|
||||
homepage = "https://github.com/nu774/m4acut";
|
||||
license = with licenses; [ bsdOriginal zlib ];
|
||||
maintainers = [ maintainers.chkno ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
2
pkgs/applications/audio/pifi/Gemfile
Normal file
2
pkgs/applications/audio/pifi/Gemfile
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
source 'https://rubygems.org'
|
||||
gem 'pifi'
|
||||
39
pkgs/applications/audio/pifi/Gemfile.lock
Normal file
39
pkgs/applications/audio/pifi/Gemfile.lock
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
daemons (1.3.1)
|
||||
eventmachine (1.2.7)
|
||||
json (2.5.1)
|
||||
mustermann (1.1.1)
|
||||
ruby2_keywords (~> 0.0.1)
|
||||
optimist (3.0.1)
|
||||
pifi (0.4.11)
|
||||
json (~> 2.2)
|
||||
optimist (~> 3.0)
|
||||
ruby-mpd (~> 0.3)
|
||||
sinatra (~> 2.0)
|
||||
thin (~> 1.7)
|
||||
rack (2.2.3)
|
||||
rack-protection (2.1.0)
|
||||
rack
|
||||
ruby-mpd (0.3.3)
|
||||
ruby2_keywords (0.0.4)
|
||||
sinatra (2.1.0)
|
||||
mustermann (~> 1.0)
|
||||
rack (~> 2.2)
|
||||
rack-protection (= 2.1.0)
|
||||
tilt (~> 2.0)
|
||||
thin (1.8.0)
|
||||
daemons (~> 1.0, >= 1.0.9)
|
||||
eventmachine (~> 1.0, >= 1.0.4)
|
||||
rack (>= 1, < 3)
|
||||
tilt (2.0.10)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
pifi
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
18
pkgs/applications/audio/pifi/default.nix
Normal file
18
pkgs/applications/audio/pifi/default.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{ lib, bundlerEnv, ruby }:
|
||||
|
||||
bundlerEnv rec {
|
||||
pname = "pifi";
|
||||
|
||||
version = (import ./gemset.nix).pifi.version;
|
||||
inherit ruby;
|
||||
# expects Gemfile, Gemfile.lock and gemset.nix in the same directory
|
||||
gemdir = ./.;
|
||||
|
||||
meta = with lib; {
|
||||
description = "MPD web client to listen to radio, written in React and Sinatra";
|
||||
homepage = "https://github.com/rccavalcanti/pifi-radio";
|
||||
license = with licenses; gpl3Only;
|
||||
maintainers = with maintainers; [ kmein ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
137
pkgs/applications/audio/pifi/gemset.nix
Normal file
137
pkgs/applications/audio/pifi/gemset.nix
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
{
|
||||
daemons = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.1";
|
||||
};
|
||||
eventmachine = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.7";
|
||||
};
|
||||
json = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.1";
|
||||
};
|
||||
mustermann = {
|
||||
dependencies = ["ruby2_keywords"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.1";
|
||||
};
|
||||
optimist = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.1";
|
||||
};
|
||||
pifi = {
|
||||
dependencies = ["json" "optimist" "ruby-mpd" "sinatra" "thin"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xwjaql852m0p7himc3pak1ibc8lfxi29bbgic153wp713xc2cga";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.11";
|
||||
};
|
||||
rack = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.3";
|
||||
};
|
||||
rack-protection = {
|
||||
dependencies = ["rack"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
};
|
||||
ruby-mpd = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0l80gbnma009pfcqgz4azbngkr5jn9nm46fflx5p7c4vz4kwshpc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.3";
|
||||
};
|
||||
ruby2_keywords = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.4";
|
||||
};
|
||||
sinatra = {
|
||||
dependencies = ["mustermann" "rack" "rack-protection" "tilt"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
};
|
||||
thin = {
|
||||
dependencies = ["daemons" "eventmachine" "rack"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.0";
|
||||
};
|
||||
tilt = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.10";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,16 @@
|
|||
{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper
|
||||
, alsaLib, xorg, libjack2
|
||||
, gtk3, pango, gdk-pixbuf, cairo, glib, freetype
|
||||
, libpulseaudio, xdg_utils
|
||||
{ config, lib, stdenv
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, makeWrapper
|
||||
|
||||
, alsaLib
|
||||
, gtk3
|
||||
, lame
|
||||
, ffmpeg
|
||||
, vlc
|
||||
|
||||
, jackSupport ? true, libjack2
|
||||
, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -17,22 +26,15 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
alsaLib
|
||||
|
||||
xorg.libX11
|
||||
xorg.libXi
|
||||
|
||||
gdk-pixbuf
|
||||
pango
|
||||
cairo
|
||||
glib
|
||||
freetype
|
||||
|
||||
xdg_utils
|
||||
stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6
|
||||
gtk3
|
||||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
gtk3
|
||||
];
|
||||
gtk3 # libSwell needs libgdk-3.so.0
|
||||
]
|
||||
++ lib.optional jackSupport libjack2
|
||||
++ lib.optional pulseaudioSupport libpulseaudio;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
|
@ -42,8 +44,15 @@ stdenv.mkDerivation rec {
|
|||
--integrate-user-desktop
|
||||
rm $out/opt/REAPER/uninstall-reaper.sh
|
||||
|
||||
# Dynamic loading of plugin dependencies does not adhere to rpath of
|
||||
# reaper executable that gets modified with runtimeDependencies.
|
||||
# Patching each plugin with DT_NEEDED is cumbersome and requires
|
||||
# hardcoding of API versions of each dependency.
|
||||
# Setting the rpath of the plugin shared object files does not
|
||||
# seem to have an effect for some plugins.
|
||||
# We opt for wrapping the executable with LD_LIBRARY_PATH prefix.
|
||||
wrapProgram $out/opt/REAPER/reaper \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpulseaudio libjack2 ]}"
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ lame ffmpeg vlc ]}"
|
||||
|
||||
mkdir $out/bin
|
||||
ln -s $out/opt/REAPER/reaper $out/bin/
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
, unzip
|
||||
, which
|
||||
, gmp
|
||||
, libsodium
|
||||
, python3
|
||||
, sqlite
|
||||
, zlib
|
||||
|
|
@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ];
|
||||
|
||||
buildInputs = [ gmp sqlite zlib ];
|
||||
buildInputs = [ gmp libsodium sqlite zlib ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs \
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ let
|
|||
|
||||
in gnustep'.gsmakeDerivation rec {
|
||||
pname = "pikopixel";
|
||||
version = "1.0-b9e";
|
||||
version = "1.0-b10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://twilightedge.com/downloads/PikoPixel.Sources.${version}.tar.gz";
|
||||
sha256 = "1gmgb5ch7s6fwvg85l6pl6fsx0maqwd8yvg7sz3r9lj32g2pz5wn";
|
||||
sha256 = "1b27npgsan2nx1p581b9q2krx4506yyd6s34r4sf1r9x9adshm77";
|
||||
};
|
||||
|
||||
sourceRoot = "PikoPixel.Sources.${version}/PikoPixel";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pdfarranger";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "wJ6ImWpszfgErfLh7YgHirVKFIt0ij8A/CdYJmkNBP0=";
|
||||
sha256 = "0dmgmvpghsm938iznalbg8h8k17a5h3q466yfc67mcll428n4nx3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -29,6 +29,7 @@ python3Packages.buildPythonApplication rec {
|
|||
pikepdf
|
||||
img2pdf
|
||||
setuptools
|
||||
dateutil
|
||||
];
|
||||
|
||||
# incompatible with wrapGAppsHook
|
||||
|
|
@ -45,6 +46,6 @@ python3Packages.buildPythonApplication rec {
|
|||
description = "Merge or split pdf documents and rotate, crop and rearrange their pages using an interactive and intuitive graphical interface";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ symphorien ];
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, jre
|
||||
, version ? "1.6" }:
|
||||
|
||||
let
|
||||
versionMap = {
|
||||
"1.5" = {
|
||||
flinkVersion = "1.5.5";
|
||||
sha256 = "18wqcqi3gyqd40nspih99gq7ylfs20b35f4dcrspffagwkfp2l4z";
|
||||
};
|
||||
"1.6" = {
|
||||
flinkVersion = "1.11.1";
|
||||
sha256 = "0338bg2sb427c1rrf2cmsz63sz0yk6gclpli2lskq0mpx72wxpl0";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
with versionMap.${version};
|
||||
{ lib, stdenv, fetchurl, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "flink-${flinkVersion}";
|
||||
pname = "flink";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/flink/${name}/${name}-bin-scala_2.11.tgz";
|
||||
inherit sha256;
|
||||
url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz";
|
||||
sha256 = "146azc5wg1xby3nqz8mha959qy99z2h8032rfgs2mcl3d5rrsm2l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@ buildGoModule rec {
|
|||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.18.1";
|
||||
version = "0.18.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1sdb2x06va0j9cxdwz95dklv2csq0s596wjsjqi4sq65y9bxjr7i";
|
||||
sha256 = "0msfc2cgfq7dz02n2z898iw2bx98qsny3j4pzja767vcdpnzjmr5";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, installShellFiles
|
||||
, git
|
||||
}:
|
||||
{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
|
|
@ -35,10 +30,8 @@ buildGoModule rec {
|
|||
done
|
||||
'';
|
||||
|
||||
checkInputs = [ git ];
|
||||
checkPhase = ''
|
||||
make test
|
||||
'';
|
||||
# fails with `unable to find git executable in PATH`
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "GitHub CLI tool";
|
||||
|
|
|
|||
|
|
@ -1,16 +1,13 @@
|
|||
{ lib, stdenv, fetchurl, gcc, makeWrapper
|
||||
, db, gmp, ncurses }:
|
||||
|
||||
let
|
||||
version = "2.2";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnu-cobol";
|
||||
inherit version;
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sourceforge.com/projects/open-cobol/files/gnu-cobol/${version}/gnucobol-${version}.tar.gz";
|
||||
sha256 = "1jrjmdx0swssjh388pp08awhiisbrs2i7gx4lcm4p1k5rpg3hn4j";
|
||||
url = "mirror://sourceforge/gnucobol/${lib.versions.majorMinor version}/gnucobol-${version}.tar.xz";
|
||||
sha256 = "0x15ybfm63g7c9340fc6712h9v59spnbyaz4rf85pmnp3zbhaw2r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -31,9 +28,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "An open-source COBOL compiler";
|
||||
homepage = "https://sourceforge.net/projects/open-cobol/";
|
||||
license = licenses.gpl3;
|
||||
homepage = "https://sourceforge.net/projects/gnucobol/";
|
||||
license = with licenses; [ gpl3Only lgpl3Only ];
|
||||
maintainers = with maintainers; [ ericsagnes ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
24
pkgs/development/libraries/tkrzw/default.nix
Normal file
24
pkgs/development/libraries/tkrzw/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tkrzw";
|
||||
version = "0.9.3";
|
||||
# TODO: defeat multi-output reference cycles
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz";
|
||||
sha256 = "1ap93fsw7vhn329kvy8g20l8p4jdygfl8r8mrgsfcpa20a29fnwl";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = false; # memory intensive
|
||||
|
||||
meta = with lib; {
|
||||
description = "A set of implementations of DBM";
|
||||
homepage = "https://dbmx.net/tkrzw/";
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -51,8 +51,6 @@
|
|||
, xdg-dbus-proxy
|
||||
, substituteAll
|
||||
, glib
|
||||
, libwpe
|
||||
, libwpe-fdo
|
||||
}:
|
||||
|
||||
assert enableGeoLocation -> geoclue2 != null;
|
||||
|
|
@ -122,8 +120,6 @@ stdenv.mkDerivation rec {
|
|||
libsecret
|
||||
libtasn1
|
||||
libwebp
|
||||
libwpe
|
||||
libwpe-fdo
|
||||
libxkbcommon
|
||||
libxml2
|
||||
libxslt
|
||||
|
|
@ -158,6 +154,7 @@ stdenv.mkDerivation rec {
|
|||
"-DENABLE_INTROSPECTION=ON"
|
||||
"-DPORT=GTK"
|
||||
"-DUSE_LIBHYPHEN=OFF"
|
||||
"-DUSE_WPE_RENDERER=OFF"
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
"-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
|
||||
"-DENABLE_GTKDOC=OFF"
|
||||
|
|
|
|||
23
pkgs/development/libraries/zydis/default.nix
Normal file
23
pkgs/development/libraries/zydis/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zydis";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zyantific";
|
||||
repo = "zydis";
|
||||
rev = "bfee99f49274a0eec3ffea16ede3a5bda9cda88f";
|
||||
sha256 = "0x2lpc33ynd0zzirdxp2lycvg3545wh1ssgy4qlv81471iwwzv6b";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and lightweight x86/x86-64 disassembler library";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.jbcrail ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "brottsplatskartan";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrillux";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "07iwmnchvpw156j23yfccg4c32izbwm8b02bjr1xgmcwzbq21ks9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
checkInputs = [
|
||||
pytest-cov
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "brottsplatskartan" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API wrapper for brottsplatskartan.se";
|
||||
homepage = "https://github.com/chrillux/brottsplatskartan";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
28
pkgs/development/python-modules/pyedimax/default.nix
Normal file
28
pkgs/development/python-modules/pyedimax/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyedimax";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1i3gr5vygqh2ryg67sl13aaql7nvf3nbybrg54628r4g7911b5rk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pyedimax" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for interfacing with the Edimax smart plugs";
|
||||
homepage = "https://github.com/andreipop2005/pyedimax";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,15 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygdbmi";
|
||||
version = "0.9.0.2";
|
||||
version = "0.10.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
#inherit pname version;
|
||||
#inherit pname version;
|
||||
owner = "cs01";
|
||||
repo = "pygdbmi";
|
||||
rev = version;
|
||||
sha256 = "01isx7912dbalmc3xsafk1a1n6bzzfrjn2363djcq0v57rqii53d";
|
||||
sha256 = "0a6b3zyxwdcb671c6lrwxm8fhvsbjh0m8hf1r18m9dha86laimjr";
|
||||
};
|
||||
|
||||
checkInputs = [ gdb ];
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-check";
|
||||
version = "0.3.9";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pytest_check";
|
||||
inherit version;
|
||||
sha256 = "0asrrz0fgk6wqffsz1ffd6z9xyw314fwh5bwjzcq75w8w1g4ass9";
|
||||
sha256 = "1i01i5ab06ic11na13gcacrlcs2ab6rmaii0yz0x06z5ynnljn6s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pytest ];
|
||||
|
|
|
|||
|
|
@ -6,12 +6,16 @@
|
|||
, easywatch
|
||||
, jinja2
|
||||
, pytestCheckHook
|
||||
, pytest-check
|
||||
, fetchPypi
|
||||
, markdown
|
||||
, sphinx
|
||||
, sphinx_rtd_theme
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "staticjinja";
|
||||
version = "0.4.0";
|
||||
version = "1.0.3";
|
||||
|
||||
disabled = isPy27; # 0.4.0 drops python2 support
|
||||
|
||||
|
|
@ -21,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "staticjinja";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0pysk8pzmcg1nfxz8m4i6bvww71w2zg6xp33zgg5vrf8yd2dfx9i";
|
||||
sha256 = "12rpv5gv64i5j4w98wm1444xnnmarcn3pg783j3fkkzc58lk5wwj";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -32,13 +36,18 @@ buildPythonPackage rec {
|
|||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-check
|
||||
markdown
|
||||
sphinx_rtd_theme
|
||||
sphinx
|
||||
];
|
||||
|
||||
# Import paths differ by a "build/lib" subdirectory, but the files are
|
||||
# the same, so we ignore import mismatches.
|
||||
preCheck = ''
|
||||
# Import paths differ by a "build/lib" subdirectory, but the files are
|
||||
# the same, so we ignore import mismatches.
|
||||
export PY_IGNORE_IMPORTMISMATCH=1
|
||||
# The tests need to find and call the installed staticjinja executable
|
||||
export PATH="$PATH:$out/bin";
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
|
||||
|
||||
let
|
||||
version = "20.2.0.175.1842";
|
||||
version = "20.4.0.379.2205";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "sqldeveloper";
|
||||
|
|
@ -46,7 +46,7 @@ in
|
|||
|
||||
nix-prefetch-url --type sha256 file:///path/to/${name}
|
||||
'';
|
||||
sha256 = "1fcaq7ffn1q35f7rvp3ybs2191lvfc0jgjx7y4wn1nqglgj7zy7n";
|
||||
sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper unzip ];
|
||||
|
|
|
|||
|
|
@ -3,6 +3,10 @@
|
|||
, fetchPypi
|
||||
, gdb
|
||||
, flask
|
||||
, six
|
||||
, bidict
|
||||
, python-engineio
|
||||
, python-socketio
|
||||
, flask-socketio
|
||||
, flask-compress
|
||||
, pygdbmi
|
||||
|
|
@ -12,14 +16,48 @@
|
|||
, eventlet
|
||||
, }:
|
||||
|
||||
let
|
||||
# gdbgui only works with the latest previous major version of flask-socketio,
|
||||
# which depends itself on the latest previous major versions of dependencies.
|
||||
python-engineio' = python-engineio.overridePythonAttrs (old: rec {
|
||||
version = "3.14.2";
|
||||
src = fetchPypi {
|
||||
inherit (old) pname;
|
||||
inherit version;
|
||||
sha256 = "119halljynqsgswlhlh750qv56js1p7j52sc0nbwxh8450zmbd7a";
|
||||
};
|
||||
propagatedBuildInputs = [ six ];
|
||||
doCheck = false;
|
||||
});
|
||||
python-socketio' = python-socketio.overridePythonAttrs (old: rec {
|
||||
version = "4.6.1";
|
||||
src = fetchPypi {
|
||||
inherit (old) pname;
|
||||
inherit version;
|
||||
sha256 = "047syhrrxh327p0fnab0d1zy25zijnj3gs1qg3kjpsy1jaj5l7yd";
|
||||
};
|
||||
propagatedBuildInputs = [ bidict python-engineio' ];
|
||||
doCheck = false;
|
||||
});
|
||||
flask-socketio' = flask-socketio.overridePythonAttrs (old: rec {
|
||||
version = "4.3.2";
|
||||
src = fetchPypi {
|
||||
inherit (old) pname;
|
||||
inherit version;
|
||||
sha256 = "0s2xs9kv9cbwy8bcxszhdwlcb9ldv0fj33lwilf5vypj0wsin01p";
|
||||
};
|
||||
propagatedBuildInputs = [ flask python-socketio' ];
|
||||
doCheck = false;
|
||||
});
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "gdbgui";
|
||||
version = "0.13.2.1";
|
||||
version = "0.14.0.2";
|
||||
|
||||
buildInputs = [ gdb ];
|
||||
propagatedBuildInputs = [
|
||||
flask
|
||||
flask-socketio
|
||||
flask-socketio'
|
||||
flask-compress
|
||||
pygdbmi
|
||||
pygments
|
||||
|
|
@ -30,13 +68,14 @@ buildPythonApplication rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0zn5wi47m8pn4amx574ryyhqvhynipxzyxbx0878ap6g36vh6l1h";
|
||||
sha256 = "1v6wwsncgnhlg5c7gsmzcp52hfblfnz5kf5pk4d0zybflsxak02d";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
echo ${version} > gdbgui/VERSION.txt
|
||||
# remove upper version bound
|
||||
sed -ie 's!, <.*"!"!' setup.py
|
||||
sed -i 's/greenlet==/greenlet>=/' setup.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -52,6 +91,6 @@ buildPythonApplication rec {
|
|||
homepage = "https://www.gdbgui.com/";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ yrashk ];
|
||||
maintainers = with maintainers; [ yrashk dump_stack ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "gede";
|
||||
version = "2.16.2";
|
||||
version = "2.17.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz";
|
||||
sha256 = "18a8n9yvhgkbc97p2995j7b5ncfdzy1fy13ahdafqmcpkl4r1hrj";
|
||||
url = "http://gede.dexar.se/uploads/source/${pname}-${version}.tar.xz";
|
||||
sha256 = "0hbsy2ymzgl8xd9mnh43gxdfncy7g6czxfvfyh7zp3ij8yiwf8x3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake makeWrapper python ];
|
||||
|
|
@ -25,7 +25,7 @@ mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Graphical frontend (GUI) to GDB";
|
||||
homepage = "http://gede.acidron.com";
|
||||
homepage = "http://gede.dexar.se";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ juliendehos ];
|
||||
|
|
|
|||
32
pkgs/development/tools/parsing/javacc/default.nix
Normal file
32
pkgs/development/tools/parsing/javacc/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ stdenv, lib, fetchFromGitHub, ant, jdk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "javacc";
|
||||
version = "7.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "120jva4sw1kylkwgqf869zxddss01mcn1nmimx9vmd4xaadz7cf2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ant jdk ];
|
||||
|
||||
buildPhase = ''
|
||||
ant jar
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/target
|
||||
mv scripts $out/bin
|
||||
mv target/javacc.jar $out/target/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://javacc.github.io/javacc";
|
||||
description = "A parser generator for building parsers from grammars";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ teams.deshaw.members ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,12 +2,12 @@
|
|||
"x86_64-linux": {
|
||||
"alpha": {
|
||||
"experimental": {
|
||||
"name": "factorio_alpha_x64-1.1.12.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.16.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "1b6rccm3vvvgs1sky0nrm001hsrzahrd8hc0pgldgyk0i6g5bmss",
|
||||
"sha256": "000n19mm7xc1qvc93kakvayjd0j749hv5nrdmsp7vdixcd773vjn",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.12/alpha/linux64",
|
||||
"version": "1.1.12"
|
||||
"url": "https://factorio.com/get-download/1.1.16/alpha/linux64",
|
||||
"version": "1.1.16"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_alpha_x64-1.0.0.tar.xz",
|
||||
|
|
@ -20,12 +20,12 @@
|
|||
},
|
||||
"demo": {
|
||||
"experimental": {
|
||||
"name": "factorio_demo_x64-1.1.12.tar.xz",
|
||||
"name": "factorio_demo_x64-1.1.16.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "037lipqxgfxycjsjffgd6rnx3xv62r40fmkyarcclww3yi596zrw",
|
||||
"sha256": "11nkpx8f3a30i06q7iqds12fiy1q67h64vh72y8x5l4mjg16j1js",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.12/demo/linux64",
|
||||
"version": "1.1.12"
|
||||
"url": "https://factorio.com/get-download/1.1.16/demo/linux64",
|
||||
"version": "1.1.16"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_demo_x64-1.0.0.tar.xz",
|
||||
|
|
@ -38,12 +38,12 @@
|
|||
},
|
||||
"headless": {
|
||||
"experimental": {
|
||||
"name": "factorio_headless_x64-1.1.12.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.16.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0chgv7ymsiz4rrjmp04ckdhk2yzgi4ly7rwl0nv2fswajhl7ngmf",
|
||||
"sha256": "02w92sgw4i3k1zywdg30mkr7nfylynsdn7sz5jzslyp0mkglrixi",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.12/headless/linux64",
|
||||
"version": "1.1.12"
|
||||
"url": "https://factorio.com/get-download/1.1.16/headless/linux64",
|
||||
"version": "1.1.16"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_headless_x64-1.0.0.tar.xz",
|
||||
|
|
|
|||
22
pkgs/games/hhexen/default.nix
Normal file
22
pkgs/games/hhexen/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, fetchurl, SDL, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hhexen";
|
||||
version = "1.6.3";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/hhexen/hhexen-${version}-src.tgz";
|
||||
sha256 = "1jwccqawbdn0rjn5p59j21rjy460jdhps7zwn2z0gq9biggw325b";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL ];
|
||||
installPhase = ''
|
||||
install -Dm755 hhexen-gl -t $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux port of Raven Game's Hexen";
|
||||
homepage = "http://hhexen.sourceforge.net/hhexen.html";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ djanatyn ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs
|
||||
, dotnet-sdk_3, dotnetPackages, dotnetCorePackages
|
||||
, dotnet-sdk_5, dotnetPackages, dotnetCorePackages
|
||||
, SDL2, libX11, openal
|
||||
, gtk3, gobject-introspection, wrapGAppsHook
|
||||
, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -13,16 +13,16 @@ let
|
|||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.0.5551"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
|
||||
version = "1.0.6416"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "2dcc6333f8cbb959293832f52857bdaeab1918bf";
|
||||
sha256 = "1hfa498fr9mdxas9s02y25ncb982wa1sqhl06jpnkhqsiicbkgcf";
|
||||
rev = "ad491b5570ec428d0d87d56426b03125e2ca5220";
|
||||
sha256 = "0gjrvdh6n26r9kkljiw9xvmvb47vmpwsjxi4iv41ir3nsdigdvsn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ];
|
||||
nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ];
|
||||
|
||||
nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix {
|
||||
fetchNuGet = { name, version, sha256 }: fetchurl {
|
||||
|
|
@ -73,12 +73,12 @@ in stdenv.mkDerivation rec {
|
|||
shopt -s extglob
|
||||
|
||||
makeWrapper $out/lib/ryujinx/Ryujinx $out/bin/Ryujinx \
|
||||
--set DOTNET_ROOT "${dotnetCorePackages.netcore_3_1}" \
|
||||
--set DOTNET_ROOT "${dotnetCorePackages.net_5_0}" \
|
||||
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \
|
||||
''${gappsWrapperArgs[@]}
|
||||
|
||||
for i in 16 32 48 64 96 128 256 512 1024; do
|
||||
install -D ${src}/Ryujinx/Ui/assets/Icon.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png
|
||||
install -D ${src}/Ryujinx/Ui/Resources/Logo_Ryujinx.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png
|
||||
done
|
||||
cp -r ${makeDesktopItem {
|
||||
desktopName = "Ryujinx";
|
||||
|
|
|
|||
126
pkgs/misc/emulators/ryujinx/deps.nix
generated
126
pkgs/misc/emulators/ryujinx/deps.nix
generated
|
|
@ -1,13 +1,13 @@
|
|||
{ fetchNuGet }: [
|
||||
(fetchNuGet {
|
||||
name = "AtkSharp";
|
||||
version = "3.22.25.56";
|
||||
sha256 = "069fm4wplxb4s1i6mdj00b22zqpz6pg9miglcj8mkf1b4lnn09g0";
|
||||
version = "3.22.25.128";
|
||||
sha256 = "0fg01zi7v6127043jzxzihirsdp187pyj83gfa6p79cx763l7z94";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "CairoSharp";
|
||||
version = "3.22.25.56";
|
||||
sha256 = "0b7p4yj88wgayh464j3rkbc4js8z57wxy3mprgvx86i3rc2v5jd9";
|
||||
version = "3.22.25.128";
|
||||
sha256 = "1rjdxd4fq5z3n51qx8vrcaf4i277ccc62jxk88xzbsxapdmjjdf9";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Concentus";
|
||||
|
|
@ -21,8 +21,8 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "DiscordRichPresence";
|
||||
version = "1.0.150";
|
||||
sha256 = "0qmbi4sccia3w80q8xfvj3bw62nvz047wq198n2b2aflkf47bq79";
|
||||
version = "1.0.166";
|
||||
sha256 = "019rz0br8hamydmdrgzcc6280jfhm4i4ix27jh66a7h37alvdi3a";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "FFmpeg.AutoGen";
|
||||
|
|
@ -31,18 +31,18 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "GdkSharp";
|
||||
version = "3.22.25.56";
|
||||
sha256 = "0f708dwy6i9hghxs711scwkww28lvfjd6gykk7xv921vich5xvy6";
|
||||
version = "3.22.25.128";
|
||||
sha256 = "0bmn0ddaw8797pnhpyl03h2zl8i5ha67yv38gly4ydy50az2xhj7";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "GioSharp";
|
||||
version = "3.22.25.56";
|
||||
sha256 = "1i7x1bakv5sq27ppl6w79c1wbvnfhf1713plc9ixaznh1fclcnwr";
|
||||
version = "3.22.25.128";
|
||||
sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "GLibSharp";
|
||||
version = "3.22.25.56";
|
||||
sha256 = "12czfm0lgjcy9hgqsiycwfv124dq619svrnsi036246i5hycj37w";
|
||||
version = "3.22.25.128";
|
||||
sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "GLWidget";
|
||||
|
|
@ -51,8 +51,8 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "GtkSharp";
|
||||
version = "3.22.25.56";
|
||||
sha256 = "18dbn834wimdmxmgsqd81hyvjyyzgbnayzvz9f714cgw4yjkjyqs";
|
||||
version = "3.22.25.128";
|
||||
sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "GtkSharp.Dependencies";
|
||||
|
|
@ -66,23 +66,23 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
|
||||
version = "3.1.8";
|
||||
sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135";
|
||||
version = "5.0.0";
|
||||
sha256 = "14njzl0907wzcbsnxl62m4y6mv9pdirm68bj8qbbip0q5a6xgidw";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.App.Runtime.osx-x64";
|
||||
version = "3.1.8";
|
||||
sha256 = "0dkib4r4v5wqxsi6zca6x3zin1x4lha53dqbgsaiah961h1yhpp4";
|
||||
version = "5.0.0";
|
||||
sha256 = "1mmklq1fwq4km9y9jgk63wmwjlarx4npkpvjaiwdzv83vdv104ja";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.App.Runtime.win-x64";
|
||||
version = "3.1.8";
|
||||
sha256 = "05sv39b6sc8fhh3m8kwq0lp58n8mrv5ivxa60rfqk6v6i7gs8b0f";
|
||||
version = "5.0.0";
|
||||
sha256 = "0k7q89w3nky4m0j5jsk95c8gczlyp5jl9982gf1hli3gqpl2q4jr";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.CodeCoverage";
|
||||
version = "16.7.0";
|
||||
sha256 = "10f6y1q8w61vc8ffqd7jsndwfskkfqbdzfqswyxnrr0qkkqx29v1";
|
||||
version = "16.8.0";
|
||||
sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.CSharp";
|
||||
|
|
@ -96,28 +96,28 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.NETCore.App.Host.osx-x64";
|
||||
version = "3.1.8";
|
||||
sha256 = "1ip8pgra9z6ha3yc4xqkb85cl9kx2jbwhwzdi3dp8bkqbvlirvkb";
|
||||
version = "5.0.0";
|
||||
sha256 = "1nirb155gzn2ws1ayaqspjmjaizw87jq2684mzkn18jv4si0hbpf";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.NETCore.App.Host.win-x64";
|
||||
version = "3.1.8";
|
||||
sha256 = "1d7wlnibf9fgq57hwnjqhlh33hxg417ljf1djb9yan4xik1wl4hb";
|
||||
version = "5.0.0";
|
||||
sha256 = "0nghghcapc28ixg21wb30ccjirc9wz83h0y3bn5zyfanxv2m2ypx";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.NETCore.App.Runtime.linux-x64";
|
||||
version = "3.1.8";
|
||||
sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa";
|
||||
version = "5.0.0";
|
||||
sha256 = "1k9yxklzdnjfkqysg54dz0mr75yg29fhlls9alh5qlfpsfpk32yq";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.NETCore.App.Runtime.osx-x64";
|
||||
version = "3.1.8";
|
||||
sha256 = "1iabp5czrz9wmsqcl0gi8r580vlhky3aak5ndz9fw065wlsqpv7w";
|
||||
version = "5.0.0";
|
||||
sha256 = "0lvpf4zz617y94zz3zsmzrg6zcdd6z3z9gz2bd5kq1l8y1pmq77y";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.NETCore.App.Runtime.win-x64";
|
||||
version = "3.1.8";
|
||||
sha256 = "010c514ls1q9gdnyj0kvknx7a0z034lfbbcxqa8cjiv0snax4pqz";
|
||||
version = "5.0.0";
|
||||
sha256 = "1486654z369857h45v73jz8pwr8ibb97fiw5mfm7f01kdbyjdsdd";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.NETCore.Platforms";
|
||||
|
|
@ -139,6 +139,11 @@
|
|||
version = "3.1.0";
|
||||
sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.NETCore.Platforms";
|
||||
version = "5.0.0";
|
||||
sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.NETCore.Targets";
|
||||
version = "1.0.1";
|
||||
|
|
@ -151,18 +156,18 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.NET.Test.Sdk";
|
||||
version = "16.7.0";
|
||||
sha256 = "1vkp6b82566z2pxn9035wrh4339kz3ki17g5qlwmwdbn4br6lcfy";
|
||||
version = "16.8.0";
|
||||
sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.TestPlatform.ObjectModel";
|
||||
version = "16.7.0";
|
||||
sha256 = "0nmw80ap2rn9h4i1x7qb15n763sh3wy8hjp1i5n0av7100g0yjqz";
|
||||
version = "16.8.0";
|
||||
sha256 = "0ii9d88py6mjsxzj9v3zx4izh6rb9ma6s9kj85xmc0xrw7jc2g3m";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.TestPlatform.TestHost";
|
||||
version = "16.7.0";
|
||||
sha256 = "0485nv0wcwdwjhif5a7d1i0znaf9acqyawhpqcwschw827chqzrs";
|
||||
version = "16.8.0";
|
||||
sha256 = "1rh8cga1km3jfafkwfjr0dwqrxb4306hf7fipwba9h02w7vlhb9a";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.Win32.Primitives";
|
||||
|
|
@ -189,6 +194,11 @@
|
|||
version = "4.7.0";
|
||||
sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.Win32.Registry";
|
||||
version = "5.0.0";
|
||||
sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.Win32.SystemEvents";
|
||||
version = "4.5.0";
|
||||
|
|
@ -241,13 +251,13 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "OpenTK.NetStandard";
|
||||
version = "1.0.5.22";
|
||||
sha256 = "10bdhc4qbffac862zg03ab5j3iqrr33bydxmnmrxn82brldahm23";
|
||||
version = "1.0.5.32";
|
||||
sha256 = "12y8kg73llmq3zibcp6j3hhiw04g7mqlm1nslmb74gfkzx0b4m9f";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "PangoSharp";
|
||||
version = "3.22.25.56";
|
||||
sha256 = "12b0761nfsci4rvzcba4hrh5rcn6q24qaxwwz66myb82c999qj8w";
|
||||
version = "3.22.25.128";
|
||||
sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "runtime.any.System.Collections";
|
||||
|
|
@ -489,6 +499,11 @@
|
|||
version = "4.3.0";
|
||||
sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Ryujinx.Audio.OpenAL.Dependencies";
|
||||
version = "1.21.0.1";
|
||||
sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Ryujinx.Graphics.Nvdec.Dependencies";
|
||||
version = "4.3.0";
|
||||
|
|
@ -496,8 +511,8 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "SharpZipLib";
|
||||
version = "1.2.0";
|
||||
sha256 = "0ynhx1qkjm723bwjwsrdviw1d2s9azndpa12dagrjshhma3igqm5";
|
||||
version = "1.3.0";
|
||||
sha256 = "1pizj82wisch28nfdaszwqm9bz19lnl0s5mq8c0zybm2vhnrhvk4";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.AppContext";
|
||||
|
|
@ -521,8 +536,8 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "System.CodeDom";
|
||||
version = "4.7.0";
|
||||
sha256 = "1lch8gwmw420wsvbv9ir4v5g1ij2ag23cbgi3c9gramj1h4vhlz2";
|
||||
version = "5.0.0";
|
||||
sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Collections";
|
||||
|
|
@ -701,8 +716,8 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Management";
|
||||
version = "4.7.0";
|
||||
sha256 = "0aw61jl6l78liiq04afxplz0ad5qbyg6vmyjaqrlnrv7whb58n66";
|
||||
version = "5.0.0";
|
||||
sha256 = "09hyv3p0zd549577clydlb2szl84m4gvdjnsry73n8b12ja7d75s";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Net.Http";
|
||||
|
|
@ -829,11 +844,6 @@
|
|||
version = "4.3.0";
|
||||
sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Runtime.CompilerServices.Unsafe";
|
||||
version = "4.6.0";
|
||||
sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Runtime.CompilerServices.Unsafe";
|
||||
version = "5.0.0-preview.7.20364.11";
|
||||
|
|
@ -899,6 +909,11 @@
|
|||
version = "4.7.0";
|
||||
sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Security.AccessControl";
|
||||
version = "5.0.0";
|
||||
sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Security.Claims";
|
||||
version = "4.3.0";
|
||||
|
|
@ -959,6 +974,11 @@
|
|||
version = "4.7.0";
|
||||
sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Security.Principal.Windows";
|
||||
version = "5.0.0";
|
||||
sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Text.Encoding";
|
||||
version = "4.0.11";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_3
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5
|
||||
set -eo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
|
|
|
|||
|
|
@ -477,8 +477,8 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "weirongxu";
|
||||
repo = "coc-explorer";
|
||||
rev = "07b73e6e40951f4cecfc067dbf59dc9f34203802";
|
||||
sha256 = "0c1wl6n89f2cxchjakcipx7sajbsr5ab1zbsjabhpnlpp9sn65jc";
|
||||
rev = "c4330ee3a65658e2cdc2f57cb066064eb5bc93f7";
|
||||
sha256 = "19dsidp13wj1n841zj2pw7xwwx17iw72rzlpdnvh319cmjfg44r7";
|
||||
};
|
||||
meta.homepage = "https://github.com/weirongxu/coc-explorer/";
|
||||
};
|
||||
|
|
@ -2224,8 +2224,8 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "glepnir";
|
||||
repo = "lspsaga.nvim";
|
||||
rev = "3e230bb8a5cd788d899d11b5528cd63ea47466a9";
|
||||
sha256 = "0pnq8nbllk6ghjxxhnb5rbvxcj04pyplp58p58cw4dch7p4f82h5";
|
||||
rev = "b0e99487b09fb11e16c25d3e1fda2900a8bbf3da";
|
||||
sha256 = "0gvd6f25m7bcrs8wysssq1nf1xysfz6b7ximnlzyp2y1g9xiwx8f";
|
||||
};
|
||||
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
|
||||
};
|
||||
|
|
@ -2868,12 +2868,12 @@ let
|
|||
|
||||
nvim-dap-virtual-text = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-dap-virtual-text";
|
||||
version = "2021-01-23";
|
||||
version = "2021-01-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "nvim-dap-virtual-text";
|
||||
rev = "ce5223283753f1583ebe547c197f2c52975d545f";
|
||||
sha256 = "1nrzkyfdy01rw52mlr1xpf01yf8kqdmv8z9wrkl27q9240hklq9y";
|
||||
rev = "664482b6d1133e0a82d71db08965f8a07208c638";
|
||||
sha256 = "01nmpah4l99wv5kzm351qra8kacqdx77aplb4qqfmrmjzxgg6l5h";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
|
||||
};
|
||||
|
|
@ -2928,12 +2928,12 @@ let
|
|||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2021-01-24";
|
||||
version = "2021-01-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "9f3fee22c79c93610410cc81ddf3489c8ba1d007";
|
||||
sha256 = "05cdym1fvbzs98khi6dj08h5gwkmp737a3cs1zbbx3hajvv3c8i6";
|
||||
rev = "94a3e5137649a71f3356bf9eb3aa94b906e68066";
|
||||
sha256 = "1758kx8nxm3aw6rxxfzbf1pfmihxbhvayq4qw4b2dnl0d5pdcpgw";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
|
|
@ -3096,16 +3096,28 @@ let
|
|||
|
||||
oceanic-next = buildVimPluginFrom2Nix {
|
||||
pname = "oceanic-next";
|
||||
version = "2021-01-24";
|
||||
version = "2021-01-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhartington";
|
||||
repo = "oceanic-next";
|
||||
rev = "9f005681ce7c4664105832f23fc7c8516a13d8f5";
|
||||
sha256 = "1fp0yq93b161qrmx5vxkxvd56xa3x5iyxly99sv0llk8ib8g7gy6";
|
||||
rev = "0d5e2cbf88b4c1d312d30746496ca36d66de29e3";
|
||||
sha256 = "0kh4ak8jfq5q1p2ig6c4a4n20bbh2arnas1z843lw3r3if5f9jvs";
|
||||
};
|
||||
meta.homepage = "https://github.com/mhartington/oceanic-next/";
|
||||
};
|
||||
|
||||
one-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "one-nvim";
|
||||
version = "2021-01-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Th3Whit3Wolf";
|
||||
repo = "one-nvim";
|
||||
rev = "c58db68bc16ab3eb50aaa81e54082f809d318194";
|
||||
sha256 = "1m26qxa2hzkm03fw7vr547k7srawp0p533q7116c96gd3gsz3hxv";
|
||||
};
|
||||
meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/";
|
||||
};
|
||||
|
||||
onedark-vim = buildVimPluginFrom2Nix {
|
||||
pname = "onedark-vim";
|
||||
version = "2020-12-14";
|
||||
|
|
@ -3156,12 +3168,12 @@ let
|
|||
|
||||
packer-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "packer-nvim";
|
||||
version = "2021-01-22";
|
||||
version = "2021-01-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wbthomason";
|
||||
repo = "packer.nvim";
|
||||
rev = "3567ab93c60540407df7ce4faced7c454f89b941";
|
||||
sha256 = "14k6iajrari85cl3bi8vn193khhchxn62mq0j2f49gn47pl47f4k";
|
||||
rev = "9d2c03cec29d56827da8b63917a58567e1d9ab86";
|
||||
sha256 = "12g3vi4hhm53sfnqn4h5x8vl3q1s0qh0gbr1vdshg76hylyv8qx4";
|
||||
};
|
||||
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
|
||||
};
|
||||
|
|
@ -3252,12 +3264,12 @@ let
|
|||
|
||||
plenary-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "plenary-nvim";
|
||||
version = "2021-01-24";
|
||||
version = "2021-01-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lua";
|
||||
repo = "plenary.nvim";
|
||||
rev = "81dde2c7faf34a8afa2127151b067ebc2983f7d8";
|
||||
sha256 = "0knz5xzsxpqjaybg6ywx0svdy91yjz1pbv3zm7y19avbks2jhd6f";
|
||||
rev = "cf4537efbae62222d3cdd239b7105c8ed4361a14";
|
||||
sha256 = "0fg2jwqchyvhx52wavwk90i6dk9vf4i4xlbhz26g4a3pv7i5mhwj";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
|
||||
};
|
||||
|
|
@ -3999,12 +4011,12 @@ let
|
|||
|
||||
telescope-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-nvim";
|
||||
version = "2021-01-24";
|
||||
version = "2021-01-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "951ede2a7007059cb4ebc6b6761030dfb52b6bc5";
|
||||
sha256 = "176gz1mj6finfzgf86ra111sb5jbx1v45i0aalgr2znrr29f1a9z";
|
||||
rev = "ccbb7f56384921a81813f0f9ebc85cdba0b7c255";
|
||||
sha256 = "04s59yjkrz1apfb5ydi43v5q0wmpmgymjvakn3n88cxyxk9yl297";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
|
|
@ -5384,8 +5396,8 @@ let
|
|||
src = fetchFromGitHub {
|
||||
owner = "voldikss";
|
||||
repo = "vim-floaterm";
|
||||
rev = "8cc3bd21080c027de91224e37d897293f1b14a0f";
|
||||
sha256 = "1fnkidkvp4m95hxlhn874wc0xy179ydqb3ia5y8ijj8dddny8d67";
|
||||
rev = "f1a48620a74478a0415d492ac22d2763d140a76c";
|
||||
sha256 = "0h6c2zy2ikl0z0pa8n6kjl80ww13225mskrzaf0k07j20ks5dcf1";
|
||||
};
|
||||
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
|
||||
};
|
||||
|
|
@ -5813,12 +5825,12 @@ let
|
|||
|
||||
vim-illuminate = buildVimPluginFrom2Nix {
|
||||
pname = "vim-illuminate";
|
||||
version = "2021-01-24";
|
||||
version = "2021-01-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RRethy";
|
||||
repo = "vim-illuminate";
|
||||
rev = "a500e9fae73e433757c5d8a44da74e66373eb21e";
|
||||
sha256 = "1mxl0aziakvialk0qgm0mnpqdk9iwqnss9wqj7584nfxvz9zck20";
|
||||
rev = "929b68b008679dfbe1145da00b3de08fc4f041f2";
|
||||
sha256 = "089kignrkhqxl8f2csckhc9pc1hsjmw2ds8zcskryjbzrbak5mhv";
|
||||
};
|
||||
meta.homepage = "https://github.com/RRethy/vim-illuminate/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -548,6 +548,7 @@ ternjs/tern_for_vim
|
|||
terryma/vim-expand-region
|
||||
terryma/vim-multiple-cursors
|
||||
tex/vimpreviewpandoc
|
||||
Th3Whit3Wolf/one-nvim@main
|
||||
theHamsta/nvim-dap-virtual-text
|
||||
thinca/vim-ft-diff_fold
|
||||
thinca/vim-prettyprint
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@
|
|||
"braviatv" = ps: with ps; [ bravia-tv ];
|
||||
"broadlink" = ps: with ps; [ broadlink ];
|
||||
"brother" = ps: with ps; [ brother ];
|
||||
"brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan
|
||||
"brottsplatskartan" = ps: with ps; [ brottsplatskartan ];
|
||||
"browser" = ps: with ps; [ ];
|
||||
"brunt" = ps: with ps; [ ]; # missing inputs: brunt
|
||||
"bsblan" = ps: with ps; [ bsblan ];
|
||||
|
|
@ -202,7 +202,7 @@
|
|||
"econet" = ps: with ps; [ ]; # missing inputs: pyeconet
|
||||
"ecovacs" = ps: with ps; [ ]; # missing inputs: sucks
|
||||
"eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan]
|
||||
"edimax" = ps: with ps; [ ]; # missing inputs: pyedimax
|
||||
"edimax" = ps: with ps; [ pyedimax ];
|
||||
"edl21" = ps: with ps; [ ]; # missing inputs: pysml
|
||||
"ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox
|
||||
"efergy" = ps: with ps; [ ];
|
||||
|
|
|
|||
81
pkgs/tools/games/ajour/default.nix
Normal file
81
pkgs/tools/games/ajour/default.nix
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, autoPatchelfHook
|
||||
, cmake
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, python3
|
||||
, expat
|
||||
, freetype
|
||||
, kdialog
|
||||
, zenity
|
||||
, openssl
|
||||
, libX11
|
||||
, libxcb
|
||||
, libXcursor
|
||||
, libXi
|
||||
, libxkbcommon
|
||||
, libXrandr
|
||||
, vulkan-loader
|
||||
, wayland
|
||||
}:
|
||||
|
||||
let
|
||||
rpathLibs = [
|
||||
libXcursor
|
||||
libXi
|
||||
libxkbcommon
|
||||
libXrandr
|
||||
libX11
|
||||
vulkan-loader
|
||||
wayland
|
||||
];
|
||||
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
pname = "Ajour";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "casperstorm";
|
||||
repo = "ajour";
|
||||
rev = version;
|
||||
sha256 = "080759j18pws5c8bmqn1bwvmlaq8k01kzj7bnwncwinl5j35mi2j";
|
||||
};
|
||||
|
||||
cargoSha256 = "1614lln5zh2j2np68pllwcqmywvzzmkj71b158fw2d98ijbi9lmw";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
cmake
|
||||
makeWrapper
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
freetype
|
||||
openssl
|
||||
libxcb
|
||||
libX11
|
||||
];
|
||||
|
||||
fixupPhase = ''
|
||||
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $out/bin/ajour)" $out/bin/ajour
|
||||
wrapProgram $out/bin/ajour --prefix PATH ":" ${lib.makeBinPath [ zenity kdialog ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "World of Warcraft addon manager written in Rust";
|
||||
longDescription = ''
|
||||
Ajour is a World of Warcraft addon manager written in Rust with a
|
||||
strong focus on performance and simplicity. The project is
|
||||
completely advertisement free, privacy respecting and open source.
|
||||
'';
|
||||
homepage = "https://github.com/casperstorm/ajour";
|
||||
changelog = "https://github.com/casperstorm/ajour/blob/master/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "keybase";
|
||||
version = "5.5.2";
|
||||
version = "5.6.1";
|
||||
|
||||
goPackagePath = "github.com/keybase/client";
|
||||
subPackages = [ "go/kbnm" "go/keybase" ];
|
||||
|
|
@ -17,7 +17,7 @@ buildGoPackage rec {
|
|||
owner = "keybase";
|
||||
repo = "client";
|
||||
rev = "v${version}";
|
||||
sha256 = "01k50mank6cdc7q3yd8m7xi8vmyklsqlmz7hw17a35lqcsjzy9zj";
|
||||
sha256 = "12b0jdwhnvxb51x3pq0g0f23grv9yjbxmpsz36n8ab3j0fvmfg0g";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -4,17 +4,17 @@
|
|||
, runtimeShell, gsettings-desktop-schemas }:
|
||||
|
||||
let
|
||||
versionSuffix = "20201016183637.d4ebf7d999";
|
||||
versionSuffix = "20210125164223.f3b21527b9";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keybase-gui";
|
||||
version = "5.5.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
|
||||
version = "5.6.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
|
||||
|
||||
src = fetchurl {
|
||||
|
||||
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
|
||||
sha256 = "0qwbqnc6dhfnx3gdwl1lyhdsbclaxpkv3zr3dmxfx1242s64v0c1";
|
||||
sha256 = "12ckfd02j0f3p3pdlwc640f61z1wzblf2414h6fkf5vzd289h35p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "keycard-cli";
|
||||
version = "0.4.0";
|
||||
version = "0.6.0";
|
||||
|
||||
goPackagePath = "github.com/status-im/keycard-cli";
|
||||
subPackages = [ "." ];
|
||||
|
|
@ -14,7 +14,7 @@ buildGoPackage rec {
|
|||
owner = "status-im";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0917vl5lw8wgvyn5l8q6xa8bqh342fibaa38syr8hmz8b09qkh38";
|
||||
sha256 = "sha256-ejFvduZs3eWc6efr9o4pXb6qw2QWWQTtkTxF80vOGNU=";
|
||||
};
|
||||
|
||||
buildFlagsArray = [
|
||||
|
|
|
|||
|
|
@ -168,6 +168,7 @@ mapAliases ({
|
|||
firestr = throw "firestr has been removed."; # added 2019-12-08
|
||||
fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10
|
||||
flameGraph = flamegraph; # added 2018-04-25
|
||||
flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25
|
||||
flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03
|
||||
foldingathome = fahclient; # added 2020-09-03
|
||||
font-awesome-ttf = font-awesome; # 2018-02-25
|
||||
|
|
|
|||
|
|
@ -721,6 +721,11 @@ in
|
|||
|
||||
aj-snapshot = callPackage ../applications/audio/aj-snapshot { };
|
||||
|
||||
ajour = callPackage ../tools/games/ajour {
|
||||
inherit (gnome3) zenity;
|
||||
inherit (plasma5Packages) kdialog;
|
||||
};
|
||||
|
||||
albert = libsForQt5.callPackage ../applications/misc/albert {};
|
||||
|
||||
metapixel = callPackage ../tools/graphics/metapixel { };
|
||||
|
|
@ -2830,6 +2835,8 @@ in
|
|||
|
||||
appleseed = callPackage ../tools/graphics/appleseed { };
|
||||
|
||||
apple-music-electron = callPackage ../applications/audio/apple-music-electron { };
|
||||
|
||||
arping = callPackage ../tools/networking/arping { };
|
||||
|
||||
arpoison = callPackage ../tools/networking/arpoison { };
|
||||
|
|
@ -7159,6 +7166,8 @@ in
|
|||
|
||||
pastebinit = callPackage ../tools/misc/pastebinit { };
|
||||
|
||||
pifi = callPackage ../applications/audio/pifi { };
|
||||
|
||||
pmacct = callPackage ../tools/networking/pmacct { };
|
||||
|
||||
pmix = callPackage ../development/libraries/pmix { };
|
||||
|
|
@ -12245,6 +12254,10 @@ in
|
|||
|
||||
jam = callPackage ../development/tools/build-managers/jam { };
|
||||
|
||||
javacc = callPackage ../development/tools/parsing/javacc {
|
||||
jdk = jdk8;
|
||||
};
|
||||
|
||||
jbake = callPackage ../development/tools/jbake { };
|
||||
|
||||
jbang = callPackage ../development/tools/jbang { };
|
||||
|
|
@ -12896,6 +12909,8 @@ in
|
|||
|
||||
ytt = callPackage ../development/tools/ytt {};
|
||||
|
||||
zydis = callPackage ../development/libraries/zydis { };
|
||||
|
||||
winpdb = callPackage ../development/tools/winpdb { };
|
||||
|
||||
grabserial = callPackage ../development/tools/grabserial { };
|
||||
|
|
@ -16813,6 +16828,8 @@ in
|
|||
tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { };
|
||||
tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; };
|
||||
|
||||
tkrzw = callPackage ../development/libraries/tkrzw { };
|
||||
|
||||
tl-expected = callPackage ../development/libraries/tl-expected { };
|
||||
|
||||
tnt = callPackage ../development/libraries/tnt { };
|
||||
|
|
@ -21788,7 +21805,6 @@ in
|
|||
fldigi = callPackage ../applications/radio/fldigi { };
|
||||
|
||||
flink = callPackage ../applications/networking/cluster/flink { };
|
||||
flink_1_5 = flink.override { version = "1.5"; };
|
||||
|
||||
fllog = callPackage ../applications/radio/fllog { };
|
||||
|
||||
|
|
@ -23239,6 +23255,8 @@ in
|
|||
|
||||
lyx = libsForQt5.callPackage ../applications/misc/lyx { };
|
||||
|
||||
m4acut = callPackage ../applications/audio/m4acut { };
|
||||
|
||||
mac = callPackage ../development/libraries/mac { };
|
||||
|
||||
macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; };
|
||||
|
|
@ -27241,6 +27259,8 @@ in
|
|||
|
||||
gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { };
|
||||
|
||||
hhexen = callPackage ../games/hhexen { };
|
||||
|
||||
hsetroot = callPackage ../tools/X11/hsetroot { };
|
||||
|
||||
imwheel = callPackage ../tools/X11/imwheel { };
|
||||
|
|
|
|||
|
|
@ -1050,6 +1050,8 @@ in {
|
|||
|
||||
brotlipy = callPackage ../development/python-modules/brotlipy { };
|
||||
|
||||
brottsplatskartan = callPackage ../development/python-modules/brottsplatskartan { };
|
||||
|
||||
browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { };
|
||||
|
||||
browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy { });
|
||||
|
|
@ -5317,6 +5319,8 @@ in {
|
|||
|
||||
pyechonest = callPackage ../development/python-modules/pyechonest { };
|
||||
|
||||
pyedimax = callPackage ../development/python-modules/pyedimax { };
|
||||
|
||||
pyee = callPackage ../development/python-modules/pyee { };
|
||||
|
||||
pyelftools = callPackage ../development/python-modules/pyelftools { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue