TMP: merge PR with staging
This commit is contained in:
Vladimír Čunát
commit
dcd42d35dc
49 changed files with 229 additions and 510 deletions
|
|
@ -112,6 +112,18 @@
|
|||
</link>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Since Bittorrent Sync was superseded by Resilio Sync in 2016, the
|
||||
<literal>bittorrentSync</literal>, <literal>bittorrentSync14</literal>,
|
||||
and <literal>bittorrentSync16</literal> packages have been removed in
|
||||
favor of <literal>resilio-sync</literal>.
|
||||
</para>
|
||||
<para>
|
||||
The corresponding module, <option>services.btsync</option> has been
|
||||
replaced by the <option>services.resilio</option> module.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The limesurvey apache subservice was replaced with a full NixOS module.
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@
|
|||
#notbit = 111; # unused
|
||||
aerospike = 111;
|
||||
ngircd = 112;
|
||||
btsync = 113;
|
||||
#btsync = 113; # unused
|
||||
minecraft = 114;
|
||||
vault = 115;
|
||||
rippled = 116;
|
||||
|
|
@ -457,7 +457,7 @@
|
|||
#notbit = 111; # unused
|
||||
aerospike = 111;
|
||||
#ngircd = 112; # unused
|
||||
btsync = 113;
|
||||
#btsync = 113; # unused
|
||||
#minecraft = 114; # unused
|
||||
vault = 115;
|
||||
#ripped = 116; # unused
|
||||
|
|
|
|||
|
|
@ -542,7 +542,6 @@
|
|||
./services/networking/autossh.nix
|
||||
./services/networking/bird.nix
|
||||
./services/networking/bitlbee.nix
|
||||
./services/networking/btsync.nix
|
||||
./services/networking/charybdis.nix
|
||||
./services/networking/chrony.nix
|
||||
./services/networking/cjdns.nix
|
||||
|
|
|
|||
|
|
@ -1,324 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.btsync;
|
||||
|
||||
bittorrentSync = cfg.package;
|
||||
|
||||
listenAddr = cfg.httpListenAddr + ":" + (toString cfg.httpListenPort);
|
||||
|
||||
optionalEmptyStr = b: v: optionalString (b != "") v;
|
||||
|
||||
webUIConfig = optionalString cfg.enableWebUI
|
||||
''
|
||||
"webui":
|
||||
{
|
||||
${optionalEmptyStr cfg.httpLogin "\"login\": \"${cfg.httpLogin}\","}
|
||||
${optionalEmptyStr cfg.httpPass "\"password\": \"${cfg.httpPass}\","}
|
||||
${optionalEmptyStr cfg.apiKey "\"api_key\": \"${cfg.apiKey}\","}
|
||||
${optionalEmptyStr cfg.directoryRoot "\"directory_root\": \"${cfg.directoryRoot}\","}
|
||||
"listen": "${listenAddr}"
|
||||
}
|
||||
'';
|
||||
|
||||
knownHosts = e:
|
||||
optionalString (e ? "knownHosts")
|
||||
(concatStringsSep "," (map (v: "\"${v}\"") e."knownHosts"));
|
||||
|
||||
sharedFoldersRecord =
|
||||
concatStringsSep "," (map (entry:
|
||||
let helper = attr: v:
|
||||
if (entry ? attr) then boolToString entry.attr else boolToString v;
|
||||
in
|
||||
''
|
||||
{
|
||||
"secret": "${entry.secret}",
|
||||
"dir": "${entry.directory}",
|
||||
|
||||
"use_relay_server": ${helper "useRelayServer" true},
|
||||
"use_tracker": ${helper "useTracker" true},
|
||||
"use_dht": ${helper "useDHT" false},
|
||||
|
||||
"search_lan": ${helper "searchLAN" true},
|
||||
"use_sync_trash": ${helper "useSyncTrash" true},
|
||||
|
||||
"known_hosts": [${knownHosts entry}]
|
||||
}
|
||||
'') cfg.sharedFolders);
|
||||
|
||||
sharedFoldersConfig = optionalString (cfg.sharedFolders != [])
|
||||
''
|
||||
"shared_folders":
|
||||
[
|
||||
${sharedFoldersRecord}
|
||||
]
|
||||
'';
|
||||
|
||||
configFile = pkgs.writeText "btsync.config"
|
||||
''
|
||||
{
|
||||
"device_name": "${cfg.deviceName}",
|
||||
"storage_path": "${cfg.storagePath}",
|
||||
"listening_port": ${toString cfg.listeningPort},
|
||||
"use_gui": false,
|
||||
|
||||
"check_for_updates": ${boolToString cfg.checkForUpdates},
|
||||
"use_upnp": ${boolToString cfg.useUpnp},
|
||||
"download_limit": ${toString cfg.downloadLimit},
|
||||
"upload_limit": ${toString cfg.uploadLimit},
|
||||
"lan_encrypt_data": ${boolToString cfg.encryptLAN},
|
||||
|
||||
${webUIConfig}
|
||||
${sharedFoldersConfig}
|
||||
}
|
||||
'';
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.btsync = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
If enabled, start the Bittorrent Sync daemon. Once enabled, you can
|
||||
interact with the service through the Web UI, or configure it in your
|
||||
NixOS configuration. Enabling the <literal>btsync</literal> service
|
||||
also installs a systemd user unit which can be used to start
|
||||
user-specific copies of the daemon. Once installed, you can use
|
||||
<literal>systemctl --user start btsync</literal> as your user to start
|
||||
the daemon using the configuration file located at
|
||||
<literal>$HOME/.config/btsync.conf</literal>.
|
||||
'';
|
||||
};
|
||||
|
||||
deviceName = mkOption {
|
||||
type = types.str;
|
||||
example = "Voltron";
|
||||
description = ''
|
||||
Name of the Bittorrent Sync device.
|
||||
'';
|
||||
};
|
||||
|
||||
listeningPort = mkOption {
|
||||
type = types.int;
|
||||
default = 0;
|
||||
example = 44444;
|
||||
description = ''
|
||||
Listening port. Defaults to 0 which randomizes the port.
|
||||
'';
|
||||
};
|
||||
|
||||
checkForUpdates = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Determines whether to check for updates and alert the user
|
||||
about them in the UI.
|
||||
'';
|
||||
};
|
||||
|
||||
useUpnp = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Use Universal Plug-n-Play (UPnP)
|
||||
'';
|
||||
};
|
||||
|
||||
downloadLimit = mkOption {
|
||||
type = types.int;
|
||||
default = 0;
|
||||
example = 1024;
|
||||
description = ''
|
||||
Download speed limit. 0 is unlimited (default).
|
||||
'';
|
||||
};
|
||||
|
||||
uploadLimit = mkOption {
|
||||
type = types.int;
|
||||
default = 0;
|
||||
example = 1024;
|
||||
description = ''
|
||||
Upload speed limit. 0 is unlimited (default).
|
||||
'';
|
||||
};
|
||||
|
||||
httpListenAddr = mkOption {
|
||||
type = types.str;
|
||||
default = "0.0.0.0";
|
||||
example = "1.2.3.4";
|
||||
description = ''
|
||||
HTTP address to bind to.
|
||||
'';
|
||||
};
|
||||
|
||||
httpListenPort = mkOption {
|
||||
type = types.int;
|
||||
default = 9000;
|
||||
description = ''
|
||||
HTTP port to bind on.
|
||||
'';
|
||||
};
|
||||
|
||||
httpLogin = mkOption {
|
||||
type = types.str;
|
||||
example = "allyourbase";
|
||||
default = "";
|
||||
description = ''
|
||||
HTTP web login username.
|
||||
'';
|
||||
};
|
||||
|
||||
httpPass = mkOption {
|
||||
type = types.str;
|
||||
example = "arebelongtous";
|
||||
default = "";
|
||||
description = ''
|
||||
HTTP web login password.
|
||||
'';
|
||||
};
|
||||
|
||||
encryptLAN = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Encrypt LAN data.";
|
||||
};
|
||||
|
||||
enableWebUI = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enable Web UI for administration. Bound to the specified
|
||||
<literal>httpListenAddress</literal> and
|
||||
<literal>httpListenPort</literal>.
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
example = literalExample "pkgs.bittorrentSync20";
|
||||
description = ''
|
||||
Branch of bittorrent sync to use.
|
||||
'';
|
||||
};
|
||||
|
||||
storagePath = mkOption {
|
||||
type = types.path;
|
||||
default = "/var/lib/btsync/";
|
||||
description = ''
|
||||
Where BitTorrent Sync will store it's database files (containing
|
||||
things like username info and licenses). Generally, you should not
|
||||
need to ever change this.
|
||||
'';
|
||||
};
|
||||
|
||||
apiKey = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = "API key, which enables the developer API.";
|
||||
};
|
||||
|
||||
directoryRoot = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
example = "/media";
|
||||
description = "Default directory to add folders in the web UI.";
|
||||
};
|
||||
|
||||
sharedFolders = mkOption {
|
||||
default = [];
|
||||
example =
|
||||
[ { secret = "AHMYFPCQAHBM7LQPFXQ7WV6Y42IGUXJ5Y";
|
||||
directory = "/home/user/sync_test";
|
||||
useRelayServer = true;
|
||||
useTracker = true;
|
||||
useDHT = false;
|
||||
searchLAN = true;
|
||||
useSyncTrash = true;
|
||||
knownHosts =
|
||||
[ "192.168.1.2:4444"
|
||||
"192.168.1.3:4444"
|
||||
];
|
||||
}
|
||||
];
|
||||
description = ''
|
||||
Shared folder list. If enabled, web UI must be
|
||||
disabled. Secrets can be generated using <literal>btsync
|
||||
--generate-secret</literal>. Note that this secret will be
|
||||
put inside the Nix store, so it is realistically not very
|
||||
secret.
|
||||
|
||||
If you would like to be able to modify the contents of this
|
||||
directories, it is recommended that you make your user a
|
||||
member of the <literal>btsync</literal> group.
|
||||
|
||||
Directories in this list should be in the
|
||||
<literal>btsync</literal> group, and that group must have
|
||||
write access to the directory. It is also recommended that
|
||||
<literal>chmod g+s</literal> is applied to the directory
|
||||
so that any sub directories created will also belong to
|
||||
the <literal>btsync</literal> group. Also,
|
||||
<literal>setfacl -d -m group:btsync:rwx</literal> and
|
||||
<literal>setfacl -m group:btsync:rwx</literal> should also
|
||||
be applied so that the sub directories are writable by
|
||||
the group.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions =
|
||||
[ { assertion = cfg.deviceName != "";
|
||||
message = "Device name cannot be empty.";
|
||||
}
|
||||
{ assertion = cfg.enableWebUI -> cfg.sharedFolders == [];
|
||||
message = "If using shared folders, the web UI cannot be enabled.";
|
||||
}
|
||||
{ assertion = cfg.apiKey != "" -> cfg.enableWebUI;
|
||||
message = "If you're using an API key, you must enable the web server.";
|
||||
}
|
||||
];
|
||||
|
||||
services.btsync.package = mkOptionDefault pkgs.bittorrentSync14;
|
||||
|
||||
users.users.btsync = {
|
||||
description = "Bittorrent Sync Service user";
|
||||
home = cfg.storagePath;
|
||||
createHome = true;
|
||||
uid = config.ids.uids.btsync;
|
||||
group = "btsync";
|
||||
};
|
||||
|
||||
users.groups = [
|
||||
{ name = "btsync";
|
||||
}];
|
||||
|
||||
systemd.services.btsync = with pkgs; {
|
||||
description = "Bittorrent Sync Service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" "local-fs.target" ];
|
||||
serviceConfig = {
|
||||
Restart = "on-abort";
|
||||
UMask = "0002";
|
||||
User = "btsync";
|
||||
ExecStart =
|
||||
"${bittorrentSync}/bin/btsync --nodaemon --config ${configFile}";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.services.btsync = with pkgs; {
|
||||
description = "Bittorrent Sync user service";
|
||||
after = [ "network.target" "local-fs.target" ];
|
||||
serviceConfig = {
|
||||
Restart = "on-abort";
|
||||
ExecStart =
|
||||
"${bittorrentSync}/bin/btsync --nodaemon --config %h/.config/btsync.conf";
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,10 +7,19 @@ let
|
|||
|
||||
cfg = config.services.compton;
|
||||
|
||||
literalAttrs = v:
|
||||
if isString v then toString v
|
||||
else if isAttrs v then "{\n"
|
||||
+ concatStringsSep "\n" (mapAttrsToList
|
||||
(name: value: "${literalAttrs name} = ${literalAttrs value};")
|
||||
v)
|
||||
+ "\n}"
|
||||
else generators.toPretty {} v;
|
||||
|
||||
floatBetween = a: b: with lib; with types;
|
||||
addCheck str (x: versionAtLeast x a && versionOlder x b);
|
||||
|
||||
pairOf = x: with types; addCheck (listOf x) (y: lib.length y == 2);
|
||||
pairOf = x: with types; addCheck (listOf x) (y: length y == 2);
|
||||
|
||||
opacityRules = optionalString (length cfg.opacityRules != 0)
|
||||
(concatMapStringsSep ",\n" (rule: ''"${rule}"'') cfg.opacityRules);
|
||||
|
|
@ -23,8 +32,7 @@ let
|
|||
fade-in-step = ${elemAt cfg.fadeSteps 0};
|
||||
fade-out-step = ${elemAt cfg.fadeSteps 1};
|
||||
fade-exclude = ${toJSON cfg.fadeExclude};
|
||||
'' +
|
||||
optionalString cfg.shadow ''
|
||||
'' + optionalString cfg.shadow ''
|
||||
|
||||
# shadows
|
||||
shadow = true;
|
||||
|
|
@ -39,10 +47,7 @@ let
|
|||
inactive-opacity = ${cfg.inactiveOpacity};
|
||||
|
||||
wintypes:
|
||||
{
|
||||
popup_menu = { opacity = ${cfg.menuOpacity}; }
|
||||
dropdown_menu = { opacity = ${cfg.menuOpacity}; }
|
||||
};
|
||||
${literalAttrs cfg.wintypes};
|
||||
|
||||
opacity-rule = [
|
||||
${opacityRules}
|
||||
|
|
@ -50,7 +55,7 @@ let
|
|||
|
||||
# other options
|
||||
backend = ${toJSON cfg.backend};
|
||||
vsync = ${lib.boolToString cfg.vSync};
|
||||
vsync = ${boolToString cfg.vSync};
|
||||
refresh-rate = ${toString cfg.refreshRate};
|
||||
'' + cfg.extraOptions);
|
||||
|
||||
|
|
@ -98,7 +103,7 @@ in {
|
|||
example = [
|
||||
"window_type *= 'menu'"
|
||||
"name ~= 'Firefox$'"
|
||||
"focused = 1"
|
||||
"focused = 1"
|
||||
];
|
||||
description = ''
|
||||
List of conditions of windows that should not be faded.
|
||||
|
|
@ -138,7 +143,7 @@ in {
|
|||
example = [
|
||||
"window_type *= 'menu'"
|
||||
"name ~= 'Firefox$'"
|
||||
"focused = 1"
|
||||
"focused = 1"
|
||||
];
|
||||
description = ''
|
||||
List of conditions of windows that should have no shadow.
|
||||
|
|
@ -173,6 +178,15 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
wintypes = mkOption {
|
||||
type = types.attrs;
|
||||
default = { popup_menu = { opacity = cfg.menuOpacity; }; dropdown_menu = { opacity = cfg.menuOpacity; }; };
|
||||
example = {};
|
||||
description = ''
|
||||
Rules for specific window types.
|
||||
'';
|
||||
};
|
||||
|
||||
opacityRules = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
|
|
@ -201,7 +215,7 @@ in {
|
|||
let
|
||||
res = x != "none";
|
||||
msg = "The type of services.compton.vSync has changed to bool:"
|
||||
+ " interpreting ${x} as ${lib.boolToString res}";
|
||||
+ " interpreting ${x} as ${boolToString res}";
|
||||
in
|
||||
if isBool x then x
|
||||
else warn msg res;
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ def remove_old_entries(gens):
|
|||
except ValueError:
|
||||
pass
|
||||
for path in glob.iglob("@efiSysMountPoint@/efi/nixos/*"):
|
||||
if not path in known_paths:
|
||||
if not path in known_paths and not os.path.isdir(path):
|
||||
os.unlink(path)
|
||||
|
||||
def get_profiles():
|
||||
|
|
|
|||
|
|
@ -59,11 +59,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "drawpile-${version}";
|
||||
version = "2.1.8";
|
||||
version = "2.1.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";
|
||||
sha256 = "1gm58zb7nh9h6v0i5pr49sfi17piik5jj757nhl0wrd10nwkipn5";
|
||||
sha256 = "074lp5z5kh6qwar3y4ik7gma5mdgafdsb50q425xcd3pv00gy0hm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "urlscan";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firecat53";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "16cc1vvvhylrl9208d253k11rqzi95mg7hrf7xbd0bqxvd6rmxar";
|
||||
sha256 = "0z24k8sk2zfp2pwysyp844vmhr5vbkj74frwy4i0v5pj60i9jl0v";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python3Packages.urwid ];
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xterm-345";
|
||||
name = "xterm-346";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.invisible-island.net/xterm/${name}.tgz"
|
||||
"https://invisible-mirror.net/archives/xterm/${name}.tgz"
|
||||
];
|
||||
sha256 = "0dfmy9vgpmxi8rsnv2lb2lmq5ny26f0pjhcj348l0d3rs61afjb6";
|
||||
sha256 = "0xwamhawgh77q2nlibciv77hznirwhnbs3r52rl4sdaqq1rpscng";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
{ stdenv, fetchurl, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // {
|
||||
version = "1.4.111";
|
||||
sha256s = {
|
||||
"x86_64-linux" = "0bw3ds3ndcnkry5mpv645z2bfi5z387bh0f7b35blxq1yv93r83f";
|
||||
"i686-linux" = "1qwaj7l7nsd4afx7ksb4b1c22mki9qa40803v9x1a8bhbdfhkczk";
|
||||
};
|
||||
})
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
{ stdenv, fetchurl, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // {
|
||||
version = "2.3.8";
|
||||
sha256s = {
|
||||
"x86_64-linux" = "02n5s561cz3mprg682mrbmh3qai42dh64jgi05rqy9s6wgbn66ly";
|
||||
"i686-linux" = "118qrnxc7gvm30rsz0xfx6dlxmrr0dk5ajrvszhy06ww7xvqhzji";
|
||||
};
|
||||
})
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
{ stdenv, fetchurl, version, sha256s, ... }:
|
||||
|
||||
let
|
||||
arch = {
|
||||
"x86_64-linux" = "x64";
|
||||
"i686-linux" = "i386";
|
||||
}.${stdenv.hostPlatform.system} or throwSystem;
|
||||
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
|
||||
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "btsync-${version}";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
# annoyingly, downloads for 1.4 and 2.3 do not follow the same URL layout; this is
|
||||
# a simple work-around, in place of overriding the url in the caller.
|
||||
urls = [
|
||||
"https://download-cdn.getsync.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz"
|
||||
"http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz"
|
||||
];
|
||||
sha256 = sha256s.${stdenv.hostPlatform.system} or throwSystem;
|
||||
};
|
||||
|
||||
dontStrip = true; # Don't strip, otherwise patching the rpaths breaks
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
install -D btsync "$out/bin/btsync"
|
||||
patchelf --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/btsync"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Automatically sync files via secure, distributed technology";
|
||||
homepage = https://www.getsync.com/;
|
||||
license = stdenv.lib.licenses.unfreeRedistributable;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ domenkozar thoughtpolice cwoac ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,12 +3,12 @@
|
|||
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
|
||||
|
||||
let
|
||||
version = "5.0.0-beta.19";
|
||||
version = "5.1.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "franz-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
|
||||
sha256 = "1b9b8y19iqx8bnax7hbh9rkjfxk8a9gqb1akrcxwwfi46l816gyy";
|
||||
sha256 = "a474d2e9c6fb99abfc4c7e9290a0e52eef62233fa25c962afdde75fe151277d0";
|
||||
};
|
||||
|
||||
# don't remove runtime deps
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ let
|
|||
|
||||
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
|
||||
# source of the latter disappears much faster.
|
||||
version = "8.44.0.40";
|
||||
version = "8.45.0.41";
|
||||
|
||||
rpath = stdenv.lib.makeLibraryPath [
|
||||
alsaLib
|
||||
|
|
@ -58,7 +58,7 @@ let
|
|||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
|
||||
sha256 = "08b5nfx1c8czx5nga3zlg60rxnyg2iy627vnaq8cf9dv620vbrw8";
|
||||
sha256 = "1k54gpaphkjv5qhqlwm2vbxbbci7nra4a5l0bhylkkzhsip6cvcm";
|
||||
}
|
||||
else
|
||||
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "zim-${version}";
|
||||
version = "0.71.0";
|
||||
version = "0.71.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://zim-wiki.org/downloads/${name}.tar.gz";
|
||||
sha256 = "0mr3911ls5zp3z776ysrdm3sg89zg29r3ip23msydcdbl8wymw30";
|
||||
sha256 = "0d7whwpbklkhamlvysa0yyix1hchkpdynimf3gp1xbibg8mqzbxc";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk3 gobject-introspection wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "src-${version}";
|
||||
version = "1.25";
|
||||
version = "1.26";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.catb.org/~esr/src/${name}.tar.gz";
|
||||
sha256 = "0qd10w8fwbrgaj8sx49q6cfhqq3ylhwn7nl9v6kxi1yjlw2p098p";
|
||||
sha256 = "06npsnf2bfjgcs7wilhcqn24zn286nyy4qyp3yp88zapkxzlap23";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
let
|
||||
pname = "gnome-maps";
|
||||
version = "3.32.2";
|
||||
version = "3.32.2.1";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1yvwzdfxjdgx4478l2i240ssvbr8hm5sg4krc1gw2ps08sgap7yx";
|
||||
sha256 = "1m191iq1gjaqz79ci3dkbmwrkxp7pzknngimlf5bqib5x8yairlb";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnom3.gnome-nettool";
|
||||
attrPath = "gnome3.${pname}";
|
||||
versionPolicy = "none";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-control-center";
|
||||
version = "3.32.1";
|
||||
version = "3.32.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0xpcmwgnn29syi2kfxc8233a5f3j8cij5wcn76xmsmwxvxz5r85l";
|
||||
sha256 = "03np0mhfl9kkdw4cb711pda0cli9zgh2bq2gqn2zwbdi3qnhk9gs";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-software-${version}";
|
||||
version = "3.32.2";
|
||||
version = "3.32.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "12kw5vyg8jy0xiq1shfh4ksar2dpyzcdxbyx8lrp9494d606nrlx";
|
||||
sha256 = "1r24q2c0i5xwp7dahw4wzycrhijix0nl7bxq1x0za57qm62ysfl9";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rygel";
|
||||
version = "0.38.0";
|
||||
version = "0.38.1";
|
||||
|
||||
# TODO: split out lib
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "03ky18hwcz362lbhqm1zm0ax2a075r69xms5cznchn9p9w8z5axc";
|
||||
sha256 = "1w8bi2rw91qyfny1zxhy32k4qn62hdjl2m38f75cp7wv6494d7w0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, vala_0_42
|
||||
, intltool
|
||||
, vala
|
||||
, gettext
|
||||
, pkgconfig
|
||||
, gtk3
|
||||
, glib
|
||||
|
|
@ -24,34 +24,35 @@
|
|||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
, hicolor-icon-theme
|
||||
, libdazzle
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gitg";
|
||||
version = "3.30.1";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss";
|
||||
sha256 = "1wzsv7bh0a2w70f938hkpzbb9xkyrp3bil65c0q3yf2v72nbbn81";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with latest libgit2-glib
|
||||
# https://gitlab.gnome.org/GNOME/gitg/issues/213
|
||||
(fetchpatch {
|
||||
url = https://gitlab.gnome.org/GNOME/gitg/commit/42bceea265f53fe7fd4a41037b936deed975fc6c.patch;
|
||||
sha256 = "1xq245rsi1bi66lswk33pdiazfaagxf77836ds5q73900rx4r7fw";
|
||||
url = "https://gitlab.gnome.org/GNOME/gitg/merge_requests/83.patch";
|
||||
sha256 = "1f7wx1d3k5pnp8zbrqssip57b9jxn3hc7a83psm7fny970qmd18z";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
patchShebangs meson_post_install.py
|
||||
sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py
|
||||
|
||||
substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash"
|
||||
'';
|
||||
|
||||
doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed
|
||||
doCheck = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
|
|||
gtksourceview
|
||||
gtkspell3
|
||||
json-glib
|
||||
libdazzle
|
||||
libgee
|
||||
libgit2-glib
|
||||
libpeas
|
||||
|
|
@ -72,12 +74,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
intltool
|
||||
hicolor-icon-theme
|
||||
gettext
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
python3
|
||||
vala_0_42 # fails build with 0.44, drop in >3.30.1
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import ./generic.nix {
|
||||
major_version = "4";
|
||||
minor_version = "08";
|
||||
patch_version = "0+beta3";
|
||||
sha256 = "02pk4bxrgqb12hvpbxyqnl4nwr4g2h96wsfzfd1k8vj8h0jmxzc4";
|
||||
patch_version = "0+rc1";
|
||||
sha256 = "014yincnkfg0j2jy0cn30l5hb1y4sf2qf1gy9ix9ghgn32iw5ndk";
|
||||
|
||||
# If the executable is stripped it does not work
|
||||
dontStrip = true;
|
||||
|
|
|
|||
|
|
@ -2,18 +2,24 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cppzmq-${version}";
|
||||
version = "4.2.3";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeromq";
|
||||
repo = "cppzmq";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yjs25ra5s8zs0rhk50w3f1rrrl80hhq784lwdhh1m3risk740sa";
|
||||
sha256 = "1g45cdny1m08zw4l261bqcqfdb825mnwjwqcf35bkyc03fr4213l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zeromq ];
|
||||
|
||||
cmakeFlags = [
|
||||
# Tests try to download googletest at compile time; there is no option
|
||||
# to use a system one and no simple way to download it beforehand.
|
||||
"-DCPPZMQ_BUILD_TESTS=OFF"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/zeromq/cppzmq;
|
||||
license = licenses.bsd2;
|
||||
|
|
|
|||
|
|
@ -2,20 +2,24 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gbenchmark-${version}";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "benchmark";
|
||||
rev = "v${version}";
|
||||
sha256 = "0l1f6azka85fkb8kdmh4qmmpxhsv7lr7wvll6sld31mfz0cai1kd";
|
||||
sha256 = "0r9dbg4cbk47gwmayys31a83m3y67k0kh1f6pl8i869rbd609ndh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ gtest ];
|
||||
postPatch = ''
|
||||
cp -r ${gtest.src} googletest
|
||||
chmod -R u+w googletest
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A microbenchmark support library";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
|||
name = "libical-${version}";
|
||||
version = "3.0.4";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputs = [ "out" "dev" ]; #"devdoc" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libical";
|
||||
|
|
@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
perl pkgconfig cmake ninja vala gobject-introspection
|
||||
(python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests
|
||||
gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
|
||||
# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
|
||||
# gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
|
||||
];
|
||||
buildInputs = [ glib libxml2 icu ];
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = [
|
||||
"--disable-static"
|
||||
"--enable-gtk-doc"
|
||||
# "--enable-gtk-doc"
|
||||
"--enable-man"
|
||||
"--enable-valgrind-tests"
|
||||
"--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ stdenv, fetchurl, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libxls-1.4.0";
|
||||
name = "libxls-${version}";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libxls/${name}.zip";
|
||||
sha256 = "1g8ds7wbhsa4hdcn77xc2c0l3vvz5bx2hx9ng9c9n7aii92ymfnk";
|
||||
url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz";
|
||||
sha256 = "0dam8qgbc5ykzaxmrjhpmfm8lnlcdk6cbpzyaya91qwwa80qbj1v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }:
|
||||
|
||||
let version = "8.4.1";
|
||||
let version = "8.4.2";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qpdf-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
|
||||
sha256 = "1fsfy38dnm9cy1j40jw5x8vn84l6f2kgb68rdjl0wxignfw05z87";
|
||||
sha256 = "1hrys6zmia8fw6f6ih3ckgsc1jr12fizdwaiy7dyd64kxxjhm8v9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "qtwebkit-plugins-2015-05-09";
|
||||
name = "qtwebkit-plugins-2017-01-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QupZilla";
|
||||
repo = "qtwebkit-plugins";
|
||||
rev = "4e2e0402abd847346bec704be5305ba849eb754b";
|
||||
sha256 = "0xyq25l56jgdxgqqv0380brhw9gg0hin5hyrf1j6d3c8k1gka20m";
|
||||
rev = "b58ee9d5b31977491662aa4e8bee16404638bf14";
|
||||
sha256 = "04wvlhdj45g1v1a3zl0pkf9r72i22h1br10lhhrgad7ypym974gw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tpm2-tss";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0bbi1vpca5j7jbvy2z76jilpf5km5as1k37bkb2mwzmpibnypmf1";
|
||||
sha256 = "1hwrka0g817a4d1177vv0z13gp66bxzxhflfxswjhcdk93kaws8k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
buildPythonPackage rec {
|
||||
|
||||
pname = "XlsxWriter";
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
|
||||
# PyPI release tarball doesn't contain tests so let's use GitHub. See:
|
||||
# https://github.com/jmcnamara/XlsxWriter/issues/327
|
||||
|
|
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
|||
owner = "jmcnamara";
|
||||
repo = pname;
|
||||
rev = "RELEASE_${version}";
|
||||
sha256 = "1zv5222bymfr7046ps5512x1kk7ipcx46jjxylaap1p6llqj7zlj";
|
||||
sha256 = "19qhdcycaiamd3bp8v2z9rpirxsr4c29fgs219k2766fpmfrgx40";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,19 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, isPy3k }:
|
||||
{ lib, fetchPypi, buildPythonPackage, nose }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.10";
|
||||
version = "1.11";
|
||||
pname = "python-stdnum";
|
||||
# Failing tests and dependency issue on Py3k
|
||||
disabled = isPy3k;
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0prs63q8zdgwr5cxc5a43zvsm66l0gf9jk19qdf85m6isnp5186a";
|
||||
sha256 = "d5f0af1bee9ddd9a20b398b46ce062dbd4d41fcc9646940f2667256a44df3854";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
checkPhase = ''
|
||||
nosetests
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = https://arthurdejong.org/python-stdnum/;
|
||||
description = "Python module to handle standardized numbers and codes";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy3k
|
||||
, unittest2, mock, requests, simplejson }:
|
||||
{ lib, buildPythonPackage, fetchPypi, requests, toml, pytest, pytestcov, pytest-mock, pytest_xdist }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stripe";
|
||||
version = "2.27.0";
|
||||
version = "2.29.3";
|
||||
|
||||
# Tests require network connectivity and there's no easy way to disable
|
||||
# them. ~ C.
|
||||
|
|
@ -11,12 +10,16 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0pvypngbmiji92nfs28bmiyl7brsm6cj18d9vhnwyydnzn3nlkl1";
|
||||
sha256 = "73f9af72ef8125e0d1c713177d006f1cbe95602beb3e10cb0b0a4ae358d1ae86";
|
||||
};
|
||||
|
||||
checkInputs = [ unittest2 mock ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "toml>=0.9,<0.10" "toml>=0.9"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ requests ] ++ lib.optional (!isPy3k) simplejson;
|
||||
propagatedBuildInputs = [ toml requests ];
|
||||
|
||||
checkInputs = [ pytest pytestcov pytest-mock pytest_xdist ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Stripe Python bindings";
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "twilio";
|
||||
version = "6.26.2";
|
||||
version = "6.27.1";
|
||||
# tests not included in PyPi, so fetch from github instead
|
||||
src = fetchFromGitHub {
|
||||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
rev = version;
|
||||
sha256 = "0z0ahbckh5calwgkmd493znixclhjjrly8jfymhwlw6g0g79kavw";
|
||||
sha256 = "1yd4cpl4y01d3a956gsdg13vx02rb176wyh7mzr0aznkp38nyw5w";
|
||||
};
|
||||
|
||||
buildInputs = [ nose mock ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "uncertainties";
|
||||
version = "3.0.3";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1hp00k10d5n69s446flss8b4rd02wq8dscvakv7ylfyf2p8y564s";
|
||||
sha256 = "18b184110cbe31303d25a7bc7f73d51b9cb4e15563cb9aa25ccfbd0ebe07d448";
|
||||
};
|
||||
|
||||
buildInputs = [ nose numpy ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
From 95a75c95c5c4e641ce7cda0ded968d66f07f822a Mon Sep 17 00:00:00 2001
|
||||
From: worldofpeace <worldofpeace@protonmail.ch>
|
||||
Date: Sat, 18 May 2019 14:44:08 -0400
|
||||
Subject: [PATCH] highlight: fix permission on file style
|
||||
|
||||
---
|
||||
gtkdoc/highlight.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gtkdoc/highlight.py b/gtkdoc/highlight.py
|
||||
index 8f6e470..d11c432 100644
|
||||
--- a/gtkdoc/highlight.py
|
||||
+++ b/gtkdoc/highlight.py
|
||||
@@ -47,6 +47,6 @@ def highlight_code(code, lang='c'):
|
||||
|
||||
|
||||
def append_style_defs(css_file_name):
|
||||
- os.chmod(css_file_name, stat.S_IWRITE)
|
||||
+ os.chmod(css_file_name, 0o664)
|
||||
with open(css_file_name, 'at', newline='\n', encoding='utf-8') as css:
|
||||
css.write(HTML_FORMATTER.get_style_defs())
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
|
@ -1,30 +1,59 @@
|
|||
{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python3, libxml2Python, libxslt, which
|
||||
, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool, gnome3
|
||||
{ stdenv
|
||||
, fetchFromGitLab
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, python3
|
||||
, libxml2Python
|
||||
, docbook_xml_dtd_43
|
||||
, docbook_xsl
|
||||
, libxslt
|
||||
, gettext
|
||||
, gnome3
|
||||
, withDblatex ? false, dblatex
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtk-doc";
|
||||
version = "1.29";
|
||||
version = "1.30";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1cc6yl8l275qn3zpjl6f0s4fwmkczngjr9hhsdv74mln4h08wmql";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }";
|
||||
sha256 = "05lr6apj3pd3s59a7k6p45k9ywwrp577ra4pvkhxvb5p7v90c2fi";
|
||||
};
|
||||
|
||||
patches = [
|
||||
passthru.respect_xml_catalog_files_var_patch
|
||||
# https://gitlab.gnome.org/GNOME/gtk-doc/issues/84
|
||||
./0001-highlight-fix-permission-on-file-style.patch
|
||||
];
|
||||
|
||||
outputDevdoc = "out";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs =
|
||||
[ pkgconfig perl python3 libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
|
||||
gnome-doc-utils gettext which itstool
|
||||
] ++ stdenv.lib.optional withDblatex dblatex;
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
configureFlags = [ "--disable-scrollkeeper" ];
|
||||
buildInputs = [
|
||||
docbook_xml_dtd_43
|
||||
docbook_xsl
|
||||
libxslt
|
||||
pkgconfig
|
||||
python3
|
||||
libxml2Python
|
||||
]
|
||||
++ stdenv.lib.optional withDblatex dblatex
|
||||
;
|
||||
|
||||
mesonFlags = [
|
||||
"-Dtests=false"
|
||||
"-Dyelp_manual=false"
|
||||
];
|
||||
|
||||
# Make pygments available for binaries, python.withPackages creates a wrapper
|
||||
# but scripts are not allowed in shebangs so we link it into sys.path.
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gede-${version}";
|
||||
version = "2.13.1";
|
||||
version = "2.14.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gede.acidron.com/uploads/source/${name}.tar.xz";
|
||||
sha256 = "00qgp45hgcnmv8qj0vicqmiwa82rzyadcqy48xfxjd4xgf0qy5bk";
|
||||
sha256 = "1z7577zwz7h03d58as93hyx99isi3p4i3rhxr8l01zgi65mz0mr9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake makeWrapper python ];
|
||||
|
|
|
|||
|
|
@ -1,14 +1,16 @@
|
|||
{ stdenv, fetchzip, buildDunePackage, yojson }:
|
||||
{ stdenv, fetchFromGitHub, buildDunePackage, yojson }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "merlin";
|
||||
version = "3.2.2";
|
||||
version = "3.3.0";
|
||||
|
||||
minimumOCamlVersion = "4.02";
|
||||
minimumOCamlVersion = "4.02.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz";
|
||||
sha256 = "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1s4y7jz581hj4gqv4pkk3980khw4lm0qzcj416b4ckji40q7nf9d";
|
||||
};
|
||||
|
||||
buildInputs = [ yojson ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-make";
|
||||
version = "0.19.3";
|
||||
version = "0.19.4";
|
||||
|
||||
src =
|
||||
let
|
||||
|
|
@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "sagiegurari";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "11mkfwvzsr86w9675zpq8gcq5avsfvwffca26h6gkc7ahqcsx3ac";
|
||||
sha256 = "019dn401p4bds144fbvqxbnn8vswcj0lxr8cvgpxb2y22640z60l";
|
||||
};
|
||||
cargo-lock = fetchurl {
|
||||
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/3592410d14443cc6be675553a9c228401114fa5f/cargo-make-Cargo.lock";
|
||||
sha256 = "0m8m2pn8y7n1js1kkva4lxahz5j4d73lj7l45h8dd30lw2w4n3hg";
|
||||
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/c5b9fde279a9f6d55d97e0ba4e0b4cd62e0ab2bf/cargo-make-Cargo.lock";
|
||||
sha256 = "1d5md3m8hxwf3pwvx059fsk1b3vvqm17pxbbyiisn9v4psrsmld5";
|
||||
};
|
||||
in
|
||||
runCommand "cargo-make-src" {} ''
|
||||
|
|
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
cargoSha256 = "00yvx87s8vngb97ldq2amdhdv3nn38liys7nilay73phx0xybx4p";
|
||||
cargoSha256 = "0wf60ck0w3m9fa19dz99q84kw05sxlj2pp6bd8r1db3cfy8f8h8j";
|
||||
|
||||
# Some tests fail because they need network access.
|
||||
# However, Travis ensures a proper build.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, makeWrapper
|
||||
, openal, fluidsynth, soundfont-fluid, libGL, SDL2
|
||||
, openal, fluidsynth_1, soundfont-fluid, libGL, SDL2
|
||||
, bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
buildInputs = [
|
||||
SDL2 libGL openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123
|
||||
SDL2 libGL openal fluidsynth_1 bzip2 zlib libjpeg libsndfile mpg123
|
||||
game-music-emu
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -23,9 +23,10 @@ in stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
buildInputs = [ fpc libpng ] ++ sharedLibs;
|
||||
|
||||
# https://github.com/UltraStar-Deluxe/USDX/issues/462
|
||||
postPatch = ''
|
||||
# autoconf substitutes strange things otherwise
|
||||
substituteInPlace src/config.inc.in \
|
||||
--subst-var-by lua_LIB_NAME liblua.so \
|
||||
--subst-var-by libpcre_LIBNAME libpcre.so.1
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
} :
|
||||
|
||||
let
|
||||
version = "23.1";
|
||||
version = "24.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "rdma-core-${version}";
|
||||
|
|
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
|
|||
owner = "linux-rdma";
|
||||
repo = "rdma-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "0blwqfj73bnk7byj2mavvnyh87mwhpzwgzg60s9vv9jnfcnbhlhk";
|
||||
sha256 = "038msip4fnd8fh6m0vhnqwsaarp86dbnc9hvf5n19aqhlqbabbdc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig pandoc ];
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
{ stdenv, fetchFromGitHub, python3, libpulseaudio }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "pulsemixer";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GeorgeFilipkin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0l5zawv36d46sj3k31k5w6imnnxzyn62r83wdhr7fp5mi3ls1h5x";
|
||||
sha256 = "162nfpyqn4gp45x332a73n07c118vispz3jicin4p67x3f8f0g3j";
|
||||
};
|
||||
|
||||
inherit libpulseaudio;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "you-get";
|
||||
version = "0.4.1295";
|
||||
version = "0.4.1302";
|
||||
|
||||
# Tests aren't packaged, but they all hit the real network so
|
||||
# probably aren't suitable for a build environment anyway.
|
||||
|
|
@ -10,7 +10,7 @@ buildPythonApplication rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "15p9ngscrn20shkg909hcnsizqpbl038zbnmxwbprj88lnn8xz9m";
|
||||
sha256 = "09iip5y5h6jv7wc38117wldnl91ndwgbnn1h8p890h0v25hk28vh";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
|||
version = "1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz";
|
||||
url = "https://www.jabberwocky.com/software/paperkey/${name}.tar.gz";
|
||||
sha256 = "1xq5gni6gksjkd5avg0zpd73vsr97appksfx0gx2m38s4w9zsid2";
|
||||
};
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
retention qualities - far longer than the magnetic or optical means that
|
||||
are generally used to back up computer data.
|
||||
'';
|
||||
homepage = http://www.jabberwocky.com/software/paperkey/;
|
||||
homepage = "https://www.jabberwocky.com/software/paperkey/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ skeidel ];
|
||||
|
|
|
|||
|
|
@ -49,6 +49,9 @@ mapAliases ({
|
|||
bashCompletion = bash-completion; # Added 2016-09-28
|
||||
bridge_utils = bridge-utils; # added 2015-02-20
|
||||
btrfsProgs = btrfs-progs; # added 2016-01-03
|
||||
bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03
|
||||
bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03
|
||||
bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03
|
||||
buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
|
||||
bundler_HEAD = bundler; # added 2015-11-15
|
||||
cantarell_fonts = cantarell-fonts; # added 2018-03-03
|
||||
|
|
|
|||
|
|
@ -20056,10 +20056,6 @@ in
|
|||
|
||||
resilio-sync = callPackage ../applications/networking/resilio-sync { };
|
||||
|
||||
bittorrentSync = bittorrentSync14;
|
||||
bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { };
|
||||
bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { };
|
||||
|
||||
dropbox = callPackage ../applications/networking/dropbox { };
|
||||
|
||||
dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue