Project import generated by Copybara.
GitOrigin-RevId: 51bcdc4cdaac48535dabf0ad4642a66774c609ed
This commit is contained in:
Default email
parent
4b1fd796ae
commit
84cb9d505d
304 changed files with 4655 additions and 1988 deletions
5
third_party/nixpkgs/.github/CODEOWNERS
vendored
5
third_party/nixpkgs/.github/CODEOWNERS
vendored
|
|
@ -231,3 +231,8 @@
|
|||
|
||||
# Cinnamon
|
||||
/pkgs/desktops/cinnamon @mkg20001
|
||||
|
||||
#nim
|
||||
/pkgs/development/compilers/nim @ehmry
|
||||
/pkgs/development/nim-packages @ehmry
|
||||
/pkgs/top-level/nim-packages.nix @ehmry
|
||||
|
|
|
|||
6
third_party/nixpkgs/.github/labeler.yml
vendored
6
third_party/nixpkgs/.github/labeler.yml
vendored
|
|
@ -72,6 +72,12 @@
|
|||
- nixos/**/*
|
||||
- pkgs/os-specific/linux/nixos-rebuild/**/*
|
||||
|
||||
"6.topic: nim":
|
||||
- doc/languages-frameworks/nim.section.md
|
||||
- pkgs/development/compilers/nim/*
|
||||
- pkgs/development/nim-packages/**/*
|
||||
- pkgs/top-level/nim-packages.nix
|
||||
|
||||
"6.topic: ocaml":
|
||||
- doc/languages-frameworks/ocaml.section.md
|
||||
- pkgs/development/compilers/ocaml/**/*
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
<xi:include href="javascript.section.xml" />
|
||||
<xi:include href="lua.section.xml" />
|
||||
<xi:include href="maven.section.xml" />
|
||||
<xi:include href="nim.section.xml" />
|
||||
<xi:include href="ocaml.section.xml" />
|
||||
<xi:include href="octave.section.xml" />
|
||||
<xi:include href="perl.section.xml" />
|
||||
|
|
|
|||
91
third_party/nixpkgs/doc/languages-frameworks/nim.section.md
vendored
Normal file
91
third_party/nixpkgs/doc/languages-frameworks/nim.section.md
vendored
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
# Nim {#nim}
|
||||
|
||||
## Overview {#nim-overview}
|
||||
|
||||
The Nim compiler, a builder function, and some packaged libraries are available
|
||||
in Nixpkgs. Until now each compiler release has been effectively backwards
|
||||
compatible so only the latest version is available.
|
||||
|
||||
## Nim program packages in Nixpkgs {#nim-program-packages-in-nixpkgs}
|
||||
|
||||
Nim programs can be built using `nimPackages.buildNimPackage`. In the
|
||||
case of packages not containing exported library code the attribute
|
||||
`nimBinOnly` should be set to `true`.
|
||||
|
||||
The following example shows a Nim program that depends only on Nim libraries:
|
||||
|
||||
```nix
|
||||
{ lib, nimPackages, fetchurl }:
|
||||
|
||||
nimPackages.buildNimPackage rec {
|
||||
pname = "hottext";
|
||||
version = "1.4";
|
||||
|
||||
nimBinOnly = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.sr.ht/~ehmry/hottext/archive/v${version}.tar.gz";
|
||||
sha256 = "sha256-hIUofi81zowSMbt1lUsxCnVzfJGN3FEiTtN8CEFpwzY=";
|
||||
};
|
||||
|
||||
buildInputs = with nimPackages; [
|
||||
bumpy
|
||||
chroma
|
||||
flatty
|
||||
nimsimd
|
||||
pixie
|
||||
sdl2
|
||||
typography
|
||||
vmath
|
||||
zippy
|
||||
];
|
||||
}
|
||||
|
||||
```
|
||||
|
||||
## Nim library packages in Nixpkgs {#nim-library-packages-in-nixpkgs}
|
||||
|
||||
|
||||
Nim libraries can also be built using `nimPackages.buildNimPackage`, but
|
||||
often the product of a fetcher is sufficient to satisfy a dependency.
|
||||
The `fetchgit`, `fetchFromGitHub`, and `fetchNimble` functions yield an
|
||||
output that can be discovered during the `configurePhase` of `buildNimPackage`.
|
||||
|
||||
Nim library packages are listed in
|
||||
[pkgs/top-level/nim-packages.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/nim-packages.nix) and implemented at
|
||||
[pkgs/development/nim-packages](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/nim-packages).
|
||||
|
||||
The following example shows a Nim library that propagates a dependency on a
|
||||
non-Nim package:
|
||||
```nix
|
||||
{ lib, buildNimPackage, fetchNimble, SDL2 }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "sdl2";
|
||||
version = "2.0.4";
|
||||
src = fetchNimble {
|
||||
inherit pname version;
|
||||
hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";
|
||||
};
|
||||
propagatedBuildInputs = [ SDL2 ];
|
||||
}
|
||||
```
|
||||
|
||||
## `buildNimPackage` parameters {#buildnimpackage-parameters}
|
||||
|
||||
All parameters from `stdenv.mkDerivation` function are still supported. The
|
||||
following are specific to `buildNimPackage`:
|
||||
|
||||
* `nimBinOnly ? false`: If `true` then build only the programs listed in
|
||||
the Nimble file in the packages sources.
|
||||
* `nimbleFile`: Specify the Nimble file location of the package being built
|
||||
rather than discover the file at build-time.
|
||||
* `nimRelease ? true`: Build the package in *release* mode.
|
||||
* `nimDefines ? []`: A list of Nim defines. Key-value tuples are not supported.
|
||||
* `nimFlags ? []`: A list of command line arguments to pass to the Nim compiler.
|
||||
Use this to specify defines with arguments in the form of `-d:${name}=${value}`.
|
||||
* `nimDoc` ? false`: Build and install HTML documentation.
|
||||
|
||||
* `buildInputs` ? []: The packages listed here will be searched for `*.nimble`
|
||||
files which are used to populate the Nim library path. Otherwise the standard
|
||||
behavior is in effect.
|
||||
|
|
@ -2743,6 +2743,12 @@
|
|||
githubId = 40633781;
|
||||
name = "Sergei S.";
|
||||
};
|
||||
dit7ya = {
|
||||
email = "7rat13@gmail.com";
|
||||
github = "dit7ya";
|
||||
githubId = 14034137;
|
||||
name = "Mostly Void";
|
||||
};
|
||||
dizfer = {
|
||||
email = "david@izquierdofernandez.com";
|
||||
github = "dizfer";
|
||||
|
|
@ -5189,6 +5195,12 @@
|
|||
githubId = 9866621;
|
||||
name = "Jack";
|
||||
};
|
||||
jkarlson = {
|
||||
email = "jekarlson@gmail.com";
|
||||
github = "jkarlson";
|
||||
githubId = 1204734;
|
||||
name = "Emil Karlson";
|
||||
};
|
||||
jlesquembre = {
|
||||
email = "jl@lafuente.me";
|
||||
github = "jlesquembre";
|
||||
|
|
@ -7667,6 +7679,12 @@
|
|||
githubId = 6455574;
|
||||
name = "Matt Votava";
|
||||
};
|
||||
mvs = {
|
||||
email = "mvs@nya.yt";
|
||||
github = "illdefined";
|
||||
githubId = 772914;
|
||||
name = "Mikael Voss";
|
||||
};
|
||||
maxwilson = {
|
||||
email = "nixpkgs@maxwilson.dev";
|
||||
github = "mwilsoncoding";
|
||||
|
|
|
|||
|
|
@ -164,6 +164,14 @@ with lib.maintainers; {
|
|||
scope = "Maintain Kodi and related packages.";
|
||||
};
|
||||
|
||||
mate = {
|
||||
members = [
|
||||
j03
|
||||
romildo
|
||||
];
|
||||
scope = "Maintain Mate desktop environment and related packages.";
|
||||
};
|
||||
|
||||
matrix = {
|
||||
members = [
|
||||
ma27
|
||||
|
|
|
|||
|
|
@ -1031,7 +1031,7 @@
|
|||
./services/web-servers/shellinabox.nix
|
||||
./services/web-servers/tomcat.nix
|
||||
./services/web-servers/traefik.nix
|
||||
./services/web-servers/trafficserver.nix
|
||||
./services/web-servers/trafficserver/default.nix
|
||||
./services/web-servers/ttyd.nix
|
||||
./services/web-servers/uwsgi.nix
|
||||
./services/web-servers/varnish/default.nix
|
||||
|
|
|
|||
|
|
@ -253,7 +253,7 @@ in {
|
|||
(mkIf cfg.kubelet.enable {
|
||||
virtualisation.containerd = {
|
||||
enable = mkDefault true;
|
||||
settings = mkDefault defaultContainerdSettings;
|
||||
settings = mapAttrsRecursive (name: mkDefault) defaultContainerdSettings;
|
||||
};
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ in {
|
|||
};
|
||||
|
||||
services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail
|
||||
security.wrappers.smtpctl // { program = "sendmail"; };
|
||||
(security.wrappers.smtpctl // { program = "sendmail"; });
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /var/spool/smtpd 711 root - - -"
|
||||
|
|
|
|||
|
|
@ -26,12 +26,16 @@ in
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
environment.systemPackages = [ pkgs.safeeyes ];
|
||||
|
||||
systemd.user.services.safeeyes = {
|
||||
description = "Safeeyes";
|
||||
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
partOf = [ "graphical-session.target" ];
|
||||
|
||||
path = [ pkgs.alsa-utils ];
|
||||
|
||||
startLimitIntervalSec = 350;
|
||||
startLimitBurst = 10;
|
||||
serviceConfig = {
|
||||
|
|
|
|||
|
|
@ -8,21 +8,9 @@ let
|
|||
group = config.users.groups.trafficserver.name;
|
||||
|
||||
getManualUrl = name: "https://docs.trafficserver.apache.org/en/latest/admin-guide/files/${name}.en.html";
|
||||
getConfPath = name: "${pkgs.trafficserver}/etc/trafficserver/${name}";
|
||||
|
||||
yaml = pkgs.formats.yaml { };
|
||||
|
||||
fromYAML = f:
|
||||
let
|
||||
jsonFile = pkgs.runCommand "in.json"
|
||||
{
|
||||
nativeBuildInputs = [ pkgs.remarshal ];
|
||||
} ''
|
||||
yaml2json < "${f}" > "$out"
|
||||
'';
|
||||
in
|
||||
builtins.fromJSON (builtins.readFile jsonFile);
|
||||
|
||||
mkYamlConf = name: cfg:
|
||||
if cfg != null then {
|
||||
"trafficserver/${name}.yaml".source = yaml.generate "${name}.yaml" cfg;
|
||||
|
|
@ -73,7 +61,7 @@ in
|
|||
|
||||
ipAllow = mkOption {
|
||||
type = types.nullOr yaml.type;
|
||||
default = fromYAML (getConfPath "ip_allow.yaml");
|
||||
default = builtins.fromJSON (builtins.readFile ./ip_allow.json);
|
||||
defaultText = "upstream defaults";
|
||||
example = literalExample {
|
||||
ip_allow = [{
|
||||
|
|
@ -94,7 +82,7 @@ in
|
|||
|
||||
logging = mkOption {
|
||||
type = types.nullOr yaml.type;
|
||||
default = fromYAML (getConfPath "logging.yaml");
|
||||
default = builtins.fromJSON (builtins.readFile ./logging.json);
|
||||
defaultText = "upstream defaults";
|
||||
example = literalExample { };
|
||||
description = ''
|
||||
36
third_party/nixpkgs/nixos/modules/services/web-servers/trafficserver/ip_allow.json
vendored
Normal file
36
third_party/nixpkgs/nixos/modules/services/web-servers/trafficserver/ip_allow.json
vendored
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{
|
||||
"ip_allow": [
|
||||
{
|
||||
"apply": "in",
|
||||
"ip_addrs": "127.0.0.1",
|
||||
"action": "allow",
|
||||
"methods": "ALL"
|
||||
},
|
||||
{
|
||||
"apply": "in",
|
||||
"ip_addrs": "::1",
|
||||
"action": "allow",
|
||||
"methods": "ALL"
|
||||
},
|
||||
{
|
||||
"apply": "in",
|
||||
"ip_addrs": "0/0",
|
||||
"action": "deny",
|
||||
"methods": [
|
||||
"PURGE",
|
||||
"PUSH",
|
||||
"DELETE"
|
||||
]
|
||||
},
|
||||
{
|
||||
"apply": "in",
|
||||
"ip_addrs": "::/0",
|
||||
"action": "deny",
|
||||
"methods": [
|
||||
"PURGE",
|
||||
"PUSH",
|
||||
"DELETE"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
37
third_party/nixpkgs/nixos/modules/services/web-servers/trafficserver/logging.json
vendored
Normal file
37
third_party/nixpkgs/nixos/modules/services/web-servers/trafficserver/logging.json
vendored
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{
|
||||
"logging": {
|
||||
"formats": [
|
||||
{
|
||||
"name": "welf",
|
||||
"format": "id=firewall time=\"%<cqtd> %<cqtt>\" fw=%<phn> pri=6 proto=%<cqus> duration=%<ttmsf> sent=%<psql> rcvd=%<cqhl> src=%<chi> dst=%<shi> dstname=%<shn> user=%<caun> op=%<cqhm> arg=\"%<cqup>\" result=%<pssc> ref=\"%<{Referer}cqh>\" agent=\"%<{user-agent}cqh>\" cache=%<crc>"
|
||||
},
|
||||
{
|
||||
"name": "squid_seconds_only_timestamp",
|
||||
"format": "%<cqts> %<ttms> %<chi> %<crc>/%<pssc> %<psql> %<cqhm> %<cquc> %<caun> %<phr>/%<shn> %<psct>"
|
||||
},
|
||||
{
|
||||
"name": "squid",
|
||||
"format": "%<cqtq> %<ttms> %<chi> %<crc>/%<pssc> %<psql> %<cqhm> %<cquc> %<caun> %<phr>/%<shn> %<psct>"
|
||||
},
|
||||
{
|
||||
"name": "common",
|
||||
"format": "%<chi> - %<caun> [%<cqtn>] \"%<cqtx>\" %<pssc> %<pscl>"
|
||||
},
|
||||
{
|
||||
"name": "extended",
|
||||
"format": "%<chi> - %<caun> [%<cqtn>] \"%<cqtx>\" %<pssc> %<pscl> %<sssc> %<sscl> %<cqcl> %<pqcl> %<cqhl> %<pshl> %<pqhl> %<sshl> %<tts>"
|
||||
},
|
||||
{
|
||||
"name": "extended2",
|
||||
"format": "%<chi> - %<caun> [%<cqtn>] \"%<cqtx>\" %<pssc> %<pscl> %<sssc> %<sscl> %<cqcl> %<pqcl> %<cqhl> %<pshl> %<pqhl> %<sshl> %<tts> %<phr> %<cfsc> %<pfsc> %<crc>"
|
||||
}
|
||||
],
|
||||
"logs": [
|
||||
{
|
||||
"filename": "squid",
|
||||
"format": "squid",
|
||||
"mode": "binary"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -53,8 +53,11 @@ in
|
|||
virtualisation.containerd = {
|
||||
args.config = toString containerdConfigChecked;
|
||||
settings = {
|
||||
plugins.cri.containerd.snapshotter = lib.mkIf config.boot.zfs.enabled "zfs";
|
||||
plugins.cri.cni.bin_dir = lib.mkDefault "${pkgs.cni-plugins}/bin";
|
||||
plugins."io.containerd.grpc.v1.cri" = {
|
||||
containerd.snapshotter =
|
||||
lib.mkIf config.boot.zfs.enabled (lib.mkOptionDefault "zfs");
|
||||
cni.bin_dir = lib.mkOptionDefault "${pkgs.cni-plugins}/bin";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "praat";
|
||||
version = "6.1.52";
|
||||
version = "6.1.53";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praat";
|
||||
repo = "praat";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-O/PjR2J9IMifOtCIsvo90XeRK/G29HQYt3zrn2lVjxA=";
|
||||
sha256 = "sha256-4GOVrKVHl/Cj0PNx+rcLESn5fbyIsnzaheMOFLlEVMU=";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "ptcollab";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuxshao";
|
||||
repo = "ptcollab";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AeIjc+FoFsTcyWl261GvyySIHP107rL4JkuMXFhnPbk=";
|
||||
sha256 = "sha256-bFFWPl7yaTwCKz7/f9Vk6mg0roUnig0dFERS4IE4R7g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.32.2";
|
||||
version = "2.33.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
|
||||
sha256 = "14agkl6xf0f9s5qldla6p6kzl8zlx61q5m8qy63lq215hrzh9d50";
|
||||
sha256 = "1k1h37fbpsib9h8867m2dsfacdjs78gdm61gvrin5gpw1zj10syz";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ let
|
|||
sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "2021.1.1.11"; # "Android Studio Bumblebee (2021.1.1) Canary 11"
|
||||
sha256Hash = "0npvb7kr259799bs2bs2drvimmmwb0rdzswbkz8zgi5c2fwjcvvl";
|
||||
version = "2021.1.1.12"; # "Android Studio Bumblebee (2021.1.1) Canary 12"
|
||||
sha256Hash = "1dyn9435s0xbxwj28b0cciz6ry58pgfgba4rbny3jszxi5j3j0r1";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, dee, gtk2, intltool, libdbusmenu-gtk2, libunity, pkg-config, rsync }:
|
||||
{ lib, stdenv, fetchurl, dee, gtk3, intltool, libdbusmenu-gtk3, libunity, pkg-config, rsync }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2.8";
|
||||
version = "1.3.0";
|
||||
pname = "grsync";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/grsync/grsync-${version}.tar.gz";
|
||||
sha256 = "1c86jch73cy7ig9k4shvcd3jnaxk7jppfcr8nmkz8gbylsn5zsll";
|
||||
sha256 = "sha256-t8fGpi4FMC2DF8OHQefXHvmrRjnuW/8mIqODsgQ6Nfw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
dee
|
||||
gtk2
|
||||
libdbusmenu-gtk2
|
||||
gtk3
|
||||
libdbusmenu-gtk3
|
||||
libunity
|
||||
rsync
|
||||
];
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mkgmap";
|
||||
version = "4806";
|
||||
version = "4807";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz";
|
||||
sha256 = "kCjcjl0qXxtAS+WGpZB3o5Eq9Xg0vY0gcjFosYJbAsI=";
|
||||
sha256 = "3DEcXopoCIcBANYrGclZH6K0JLgeYADXtPjQtobyfps=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,23 +1,27 @@
|
|||
{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }:
|
||||
let
|
||||
appname = "SuperSlicer";
|
||||
version = "2.3.56.8";
|
||||
pname = "super-slicer";
|
||||
description = "PrusaSlicer fork with more features and faster development cycle";
|
||||
override = super: {
|
||||
|
||||
versions = {
|
||||
stable = { version = "2.3.56.9"; sha256 = "sha256-vv01wGQkrasKKjpGSDeDqZbd1X5/iTfGXYN5Jwz+FKE="; };
|
||||
staging = { version = "2.3.57.0"; sha256 = "sha256-7o0AqgQcKYc6c+Hi3x5pC/pKJZPlEsYOYk9sC21+mvM="; };
|
||||
};
|
||||
|
||||
override = { version, sha256 }: super: {
|
||||
inherit version pname;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supermerill";
|
||||
repo = "SuperSlicer";
|
||||
sha256 = "sha256-em0OgrcPaV2VYM8DpvtVJjgdojStMF/ROUEtZ8iLZfo=";
|
||||
inherit sha256;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# We don't need PS overrides anymore, and gcode-viewer is embedded in the binary.
|
||||
postInstall = null;
|
||||
dontStrip = true;
|
||||
separateDebugInfo = true;
|
||||
|
||||
# See https://github.com/supermerill/SuperSlicer/issues/432
|
||||
|
|
@ -44,5 +48,10 @@ let
|
|||
maintainers = with maintainers; [ cab404 moredread ];
|
||||
};
|
||||
|
||||
passthru = allVersions;
|
||||
|
||||
};
|
||||
in prusa-slicer.overrideAttrs override
|
||||
|
||||
allVersions = builtins.mapAttrs (_name: version: (prusa-slicer.overrideAttrs (override version))) versions;
|
||||
in
|
||||
allVersions.stable
|
||||
|
|
|
|||
|
|
@ -57,6 +57,9 @@ in buildPythonApplication rec {
|
|||
# safeeyes images
|
||||
--prefix XDG_DATA_DIRS : "$out/lib/${python.libPrefix}/site-packages/usr/share"
|
||||
)
|
||||
mkdir -p $out/share/applications
|
||||
cp -r safeeyes/platform/icons $out/share/
|
||||
cp safeeyes/platform/safeeyes.desktop $out/share/applications/
|
||||
'';
|
||||
|
||||
doCheck = false; # no tests
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "skytemple";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "03qmjp257rk4p1zkz89cv26awdgngvakqyg6jc3g6xrhmsvr4r2p";
|
||||
sha256 = "13vvsp47frgq5c2wfllkg4lmsy5vxl53j5rw9c84d5xix5bisk1n";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -41,6 +41,6 @@ python3Packages.buildPythonApplication rec {
|
|||
homepage = "https://github.com/SkyTemple/skytemple";
|
||||
description = "ROM hacking tool for Pokémon Mystery Dungeon Explorers of Sky";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ xfix ];
|
||||
maintainers = with maintainers; [ xfix marius851000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "upwork";
|
||||
version = "5.6.7.13";
|
||||
version = "5.6.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_7_13_9f0e0a44a59e4331/${pname}_${version}_amd64.deb";
|
||||
sha256 = "f1d3168cda47f77100192ee97aa629e2452fe62fb364dd59ad361adbc0d1da87";
|
||||
url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_8_0_836f43f6f6be4149/${pname}_${version}_amd64.deb";
|
||||
sha256 = "b3a52f773d633837882dc107b206006325722ca5d5d5a1e8bdf5453f872e1b6f";
|
||||
};
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
|
|
|||
|
|
@ -20,17 +20,17 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "angelfish";
|
||||
version = "21.06";
|
||||
version = "21.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/plasma-mobile/${version}/angelfish-${version}.tar.xz";
|
||||
sha256 = "sha256-iHgmG/DeaUPnRXlVIU8P/oUcYINienYmR2zI9Q4Yd3s=";
|
||||
sha256 = "1gzvlha159bw767mj8lisn89592j4j4dazzfws3v4anddjh60xnh";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "0zh0kli7kav18v9znq2f5jklhf3m1kyb41jzmivjx70g9xyfzlwk";
|
||||
sha256 = "1pbvw9hdzn3i97mahdy9y6jnjsmwmjs3lxfz7q6r9r10i8swbkak";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -63,7 +63,7 @@ mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Web browser for Plasma Mobile";
|
||||
homepage = "https://apps.kde.org/en/mobile.angelfish";
|
||||
homepage = "https://invent.kde.org/plasma-mobile/angelfish";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,24 +2,25 @@
|
|||
|
||||
let
|
||||
version = "0.17.2";
|
||||
sha256 = "0kcdx4ldnshk4pqq37a7p08xr5cpsjrbrifk9fc3jbiw39m09mhf";
|
||||
manifestsSha256 = "1v6md4xh4sq1vmb5a8qvb66l101fq75lmv2s4j2z3walssb5mmgj";
|
||||
|
||||
manifests = fetchzip {
|
||||
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
sha256 = "1v6md4xh4sq1vmb5a8qvb66l101fq75lmv2s4j2z3walssb5mmgj";
|
||||
sha256 = manifestsSha256;
|
||||
stripRoot = false;
|
||||
};
|
||||
in
|
||||
|
||||
buildGoModule rec {
|
||||
inherit version;
|
||||
|
||||
pname = "fluxcd";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fluxcd";
|
||||
repo = "flux2";
|
||||
rev = "v${version}";
|
||||
sha256 = "0kcdx4ldnshk4pqq37a7p08xr5cpsjrbrifk9fc3jbiw39m09mhf";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-glifJ0V3RwS7E6EWZsCa88m0MK883RhPSXCsAmMggVs=";
|
||||
|
|
@ -50,6 +51,8 @@ buildGoModule rec {
|
|||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open and extensible continuous delivery solution for Kubernetes";
|
||||
longDescription = ''
|
||||
|
|
|
|||
31
third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/update.sh
vendored
Executable file
31
third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/update.sh
vendored
Executable file
|
|
@ -0,0 +1,31 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnugrep gnused jq
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
cd $(dirname "${BASH_SOURCE[0]}")
|
||||
|
||||
TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/fluxcd/flux2/releases/latest | jq -r '.tag_name')
|
||||
|
||||
VERSION=$(echo ${TAG} | sed 's/^v//')
|
||||
|
||||
SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archive/refs/tags/${TAG}.tar.gz)
|
||||
|
||||
SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${TAG}/manifests.tar.gz)
|
||||
|
||||
setKV () {
|
||||
sed -i "s/$1 = \".*\"/$1 = \"$2\"/" ./default.nix
|
||||
}
|
||||
|
||||
setKV version ${VERSION}
|
||||
setKV sha256 ${SHA256}
|
||||
setKV manifestsSha256 ${SPEC_SHA256}
|
||||
setKV vendorSha256 ""
|
||||
|
||||
cd ../../../../../
|
||||
set +e
|
||||
VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's/ //g')
|
||||
set -e
|
||||
|
||||
cd - > /dev/null
|
||||
setKV vendorSha256 ${VENDOR_SHA256}
|
||||
|
|
@ -20,13 +20,13 @@ let
|
|||
"${electron}/bin/electron";
|
||||
in nodePackages.deltachat-desktop.override rec {
|
||||
pname = "deltachat-desktop";
|
||||
version = "1.21.1";
|
||||
version = "1.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-desktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "0d59z0mvi70i26d79s4h0sssclwcakidhvhq56zi78bkfqlx7xf1";
|
||||
sha256 = "0wrwjblpw3f5ky697b2nhi9lisn4q5bl05086fdkx5v5j2ghz3n9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "deltachat-desktop",
|
||||
"version": "1.21.1",
|
||||
"version": "1.22.1",
|
||||
"dependencies": {
|
||||
"@blueprintjs/core": "^3.22.3",
|
||||
"@mapbox/geojson-extent": "^1.0.0",
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dino";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dino";
|
||||
repo = "dino";
|
||||
rev = "v${version}";
|
||||
sha256 = "11m38syqzb1z92wmdaf45gryl6gjxwbcnk32j4p984ipqj2vdzd8";
|
||||
sha256 = "sha256-uYP3D2uyvfRP91fq/1jKOaKgp/+How0SUwmxSrLLH4c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Modern Jabber/XMPP Client using GTK/Vala";
|
||||
homepage = "https://github.com/dino/dino";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ mic92 qyliss ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ branch ? "stable", pkgs }:
|
||||
# Generated by ./update-discord.sh
|
||||
let
|
||||
inherit (pkgs) callPackage fetchurl;
|
||||
in {
|
||||
|
|
@ -7,30 +6,30 @@ in {
|
|||
pname = "discord";
|
||||
binaryName = "Discord";
|
||||
desktopName = "Discord";
|
||||
version = "0.0.15";
|
||||
version = "0.0.16";
|
||||
src = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
sha256 = "0pn2qczim79hqk2limgh88fsn93sa8wvana74mpdk5n6x5afkvdd";
|
||||
sha256 = "UTVKjs/i7C/m8141bXBsakQRFd/c//EmqqhKhkr1OOk=";
|
||||
};
|
||||
};
|
||||
ptb = callPackage ./base.nix rec {
|
||||
pname = "discord-ptb";
|
||||
binaryName = "DiscordPTB";
|
||||
desktopName = "Discord PTB";
|
||||
version = "0.0.25";
|
||||
version = "0.0.26";
|
||||
src = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
sha256 = "082ygmsycicddpkv5s03vw3rjkrk4lgprq29z8b1hdjifvw93b21";
|
||||
sha256 = "1rlj76yhxjwwfmdln3azjr69hvfx1bjqdg9jhdn4fp6mlirkrcq4";
|
||||
};
|
||||
};
|
||||
canary = callPackage ./base.nix rec {
|
||||
pname = "discord-canary";
|
||||
binaryName = "DiscordCanary";
|
||||
desktopName = "Discord Canary";
|
||||
version = "0.0.130";
|
||||
version = "0.0.131";
|
||||
src = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
sha256 = "sha256-UamSiwjR68Pfm3uyHaI871VaGwIKJ5DShl8uE3rvX+U=";
|
||||
sha256 = "087rzyivk0grhc73v7ldxxghks0n16ifrvpmk95vzaw99l9xv0v5";
|
||||
};
|
||||
};
|
||||
}.${branch}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
, libappindicator-gtk3
|
||||
, gst_all_1
|
||||
, pcre
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "5.7.31792.0820";
|
||||
version = "5.8.0.16";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
|
||||
sha256 = "16p8wn67hb6p9rn684bbpwz8w5knyqw9rv2nnw6cwg949qjv43lm";
|
||||
sha256 = "1axnh81bf3ab5gzxxqm172wpqlpfbj9a2h3cry3kyxzmrihzbwdm";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "msmtp";
|
||||
version = "1.8.15";
|
||||
version = "1.8.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-ImXcY56/Lt8waf/+CjvXZ0n4tY9AAdXN6uGYc5SQmc4=";
|
||||
sha256 = "1n271yr83grpki9szdirnk6wb5rcc319f0gmfabyw3fzyf4msjy0";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rclone";
|
||||
version = "1.56.0";
|
||||
version = "1.56.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "03fqwsbpwb8vmgxg6knkp8f4xlvgg88n2c7inwjg8x91c7c77i0b";
|
||||
sha256 = "sha256-2UIIJMa5Wlr4rvBRXvE9kwh798x8jVa63hVLZ51Ltp0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1gryisn63f6ss889s162ncvlsaznwgvgxdwk2pn5c5zw8dkmjdmi";
|
||||
vendorSha256 = "sha256-sTZZZ0P8F1bsFZO3/vbj9itNN7PCBJ0Q0tq4YayOPr8=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
25
third_party/nixpkgs/pkgs/applications/radio/kappanhang/default.nix
vendored
Normal file
25
third_party/nixpkgs/pkgs/applications/radio/kappanhang/default.nix
vendored
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, pkg-config, pulseaudio }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kappanhang";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nonoo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ycy8avq5s7zspfi0d9klqcwwkpmcaz742cigd7pmcnbbhspcicp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ pulseaudio ];
|
||||
|
||||
vendorSha256 = "1srjngcis42wfskwfqxxj101y9xyzrans1smy53bh1c9zm856xha";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/nonoo/kappanhang";
|
||||
description = "Remote control for Icom radio transceivers";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mvs ];
|
||||
};
|
||||
}
|
||||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "kstars";
|
||||
version = "3.5.4";
|
||||
version = "3.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
|
||||
sha256 = "sha256-JCdSYcogvoUmu+vB/vye+6ZMIJqVoScAKreh89dxoDU=";
|
||||
sha256 = "sha256-cD31YFBnKvEPyBQils6qJxNKagDoIi8/Znfxj/Gsa0M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
|
|
@ -33,11 +33,6 @@ mkDerivation rec {
|
|||
cfitsio indi-full xplanet libnova libraw gsl wcslib stellarsolver
|
||||
];
|
||||
|
||||
# See https://bugs.kde.org/show_bug.cgi?id=439541
|
||||
preConfigure = ''
|
||||
rm po/de/docs/kstars/index.docbook
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DINDI_PREFIX=${indi-full}"
|
||||
"-DXPLANET_PREFIX=${xplanet}"
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blast";
|
||||
version = "2.11.0";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz";
|
||||
sha256 = "0m0r9vkw631ky1za1wilsfk9k9spwqh22nkrb9a57rbwmrc1i3nq";
|
||||
sha256 = "122bf45cyj3s3zv2lw1y1rhz7g22v0va560ai30xdjl8sk4wk8zx";
|
||||
};
|
||||
|
||||
sourceRoot = "ncbi-blast-${version}+-src/c++";
|
||||
|
|
|
|||
|
|
@ -1,23 +1,9 @@
|
|||
{lib, stdenv, fetchFromGitHub, nim, htslib, pcre}:
|
||||
{lib, nimPackages, fetchFromGitHub, pcre}:
|
||||
|
||||
let
|
||||
hts-nim = fetchFromGitHub {
|
||||
owner = "brentp";
|
||||
repo = "hts-nim";
|
||||
rev = "v0.3.4";
|
||||
sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7";
|
||||
};
|
||||
|
||||
docopt = fetchFromGitHub {
|
||||
owner = "docopt";
|
||||
repo = "docopt.nim";
|
||||
rev = "v0.6.7";
|
||||
sha256 = "1ga7ckg21fzwwvh26jp2phn2h3pvkn8g8sm13dxif33rp471bv37";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
nimPackages.buildNimPackage rec {
|
||||
pname = "mosdepth";
|
||||
version = "0.3.2";
|
||||
nimBinOnly = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brentp";
|
||||
|
|
@ -26,15 +12,7 @@ in stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-uui4yC7ok+pvbXVKfBVsAarH40fnH4fnP8P4uzOqztQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nim ];
|
||||
buildInputs = [ htslib pcre ];
|
||||
|
||||
buildPhase = ''
|
||||
HOME=$TMPDIR
|
||||
nim -p:${hts-nim}/src -p:${docopt}/src c --nilseqs:on -d:release mosdepth.nim
|
||||
'';
|
||||
|
||||
installPhase = "install -Dt $out/bin mosdepth";
|
||||
buildInputs = with nimPackages; [ docopt hts-nim pcre ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
, customOCamlPackages ? null
|
||||
, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses
|
||||
, buildIde ? true
|
||||
, glib, gnome, wrapGAppsHook
|
||||
, glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems
|
||||
, csdp ? null
|
||||
, version, coq-version ? null,
|
||||
}@args:
|
||||
|
|
@ -124,7 +124,9 @@ self = stdenv.mkDerivation {
|
|||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ optional (!versionAtLeast "8.6") gnumake42;
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ optional buildIde copyDesktopItems
|
||||
++ optional (!versionAtLeast "8.6") gnumake42;
|
||||
buildInputs = [ ncurses ] ++ ocamlBuildInputs
|
||||
++ optionals buildIde
|
||||
(if versionAtLeast "8.10"
|
||||
|
|
@ -166,12 +168,24 @@ self = stdenv.mkDerivation {
|
|||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
desktopItems = optional buildIde (makeDesktopItem {
|
||||
name = "coqide";
|
||||
exec = "coqide";
|
||||
icon = "coq";
|
||||
desktopName = "CoqIDE";
|
||||
comment = "Graphical interface for the Coq proof assistant";
|
||||
categories = "Development;Science;Math;IDE;GTK";
|
||||
});
|
||||
|
||||
postInstall = ''
|
||||
cp bin/votour $out/bin/
|
||||
ln -s $out/lib/coq $OCAMLFIND_DESTDIR/coq
|
||||
'' + optionalString buildIde ''
|
||||
mkdir -p "$out/share/pixmaps"
|
||||
ln -s "$out/share/coq/coq.png" "$out/share/pixmaps/"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Coq proof assistant";
|
||||
longDescription = ''
|
||||
Coq is a formal proof management system. It provides a formal language
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
# extra support
|
||||
, pythonSupport ? true, pythonPackages ? null
|
||||
, opencvSupport ? false, opencv ? null
|
||||
, withSvmLight ? false
|
||||
}:
|
||||
|
||||
assert pythonSupport -> pythonPackages != null;
|
||||
|
|
@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/awild82/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch";
|
||||
sha256 = "158hqv4xzw648pmjbwrhxjp7qcppqa7kvriif87gn3zdn711c49s";
|
||||
})
|
||||
];
|
||||
] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch;
|
||||
|
||||
CCACHE_DISABLE="1";
|
||||
CCACHE_DIR=".ccache";
|
||||
|
|
@ -86,12 +87,29 @@ stdenv.mkDerivation rec {
|
|||
(flag "CMAKE_VERBOSE_MAKEFILE:BOOL" doCheck)
|
||||
(flag "PythonModular" pythonSupport)
|
||||
(flag "OpenCV" opencvSupport)
|
||||
(flag "USE_SVMLIGHT" withSvmLight)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix preprocessing SVMlight code
|
||||
sed -i \
|
||||
-e 's@#ifdef SVMLIGHT@#ifdef USE_SVMLIGHT@' \
|
||||
-e '/^#ifdef USE_SVMLIGHT/,/^#endif/ s@#endif@#endif //USE_SVMLIGHT@' \
|
||||
src/shogun/kernel/string/CommUlongStringKernel.cpp
|
||||
sed -i -e 's/#if USE_SVMLIGHT/#ifdef USE_SVMLIGHT/' src/interfaces/swig/Machine.i
|
||||
sed -i -e 's@// USE_SVMLIGHT@//USE_SVMLIGHT@' src/interfaces/swig/Transfer.i
|
||||
sed -i -e 's@/\* USE_SVMLIGHT \*/@//USE_SVMLIGHT@' src/interfaces/swig/Transfer_includes.i
|
||||
'' + lib.optionalString (!withSvmLight) ''
|
||||
# Run SVMlight scrubber
|
||||
patchShebangs scripts/light-scrubber.sh
|
||||
echo "removing SVMlight code"
|
||||
./scripts/light-scrubber.sh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A toolbox which offers a wide range of efficient and unified machine learning methods";
|
||||
homepage = "http://shogun-toolbox.org/";
|
||||
license = licenses.gpl3;
|
||||
license = if withSvmLight then licenses.unfree else licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
76
third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/svmlight-scrubber.patch
vendored
Normal file
76
third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/svmlight-scrubber.patch
vendored
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
From: Sebastián Mancilla <smancill@smancill.dev>
|
||||
Subject: Update SVMlight scrubber script
|
||||
|
||||
This requires previously fixing a few wrong preprocessor directives that
|
||||
are supposed to fence code using SVMlight.
|
||||
|
||||
- The script was too eager and removing *.light files in SVMlight format
|
||||
that are used by other tests. The code reading those files doesn't use
|
||||
any SVMlight code so it should be fine to keep it and run the tests.
|
||||
|
||||
- The Python test *domainadaptationsvm.py was not removed because of
|
||||
wrong globbing.
|
||||
|
||||
- Remove a couple of examples using SVMlight that were missed.
|
||||
|
||||
- The script is actually modifying (and breaking) itself because the
|
||||
grep for the USE_SVMLIGHT macro is too eager again and matches itself
|
||||
(and the version stored in upstream's Debian package control tarball
|
||||
is broken because of it). Just fix it by grepping for preprocessor
|
||||
directives only.
|
||||
|
||||
- No need to fix the Transfer_includes.i file in the script with a final
|
||||
%} when its preprocessor directives have been fixed.
|
||||
|
||||
- The Swig files were moved to a new directory at some point but the
|
||||
script was not updated accordingly.
|
||||
---
|
||||
scripts/light-scrubber.sh | 16 ++++++----------
|
||||
1 file changed, 6 insertions(+), 10 deletions(-)
|
||||
|
||||
diff a/scripts/light-scrubber.sh b/scripts/light-scrubber.sh
|
||||
--- a/scripts/light-scrubber.sh
|
||||
+++ b/scripts/light-scrubber.sh
|
||||
@@ -26,14 +26,16 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
-rm -rf examples/*/*/{*light*,*_domainadaptationsvm_*} \
|
||||
+rm -rf examples/*/*/{*light*.*,*domainadaptationsvm*} \
|
||||
examples/undocumented/matlab_and_octave/tests/*light* \
|
||||
+ examples/undocumented/python/serialization_string_kernels.py \
|
||||
+ examples/undocumented/python/mkl_binclass.py \
|
||||
src/shogun/classifier/svm/SVMLight.* \
|
||||
src/shogun/classifier/svm/SVMLightOneClass.* \
|
||||
src/shogun/regression/svr/SVRLight.* \
|
||||
doc/md/LICENSE_SVMlight*
|
||||
|
||||
-for _file in `grep -rl USE_SVMLIGHT .`
|
||||
+grep -rl '^#ifdef USE_SVMLIGHT' . | while read -r _file
|
||||
do
|
||||
sed -i.orig -e \
|
||||
'/\#ifdef USE_SVMLIGHT/,/\#endif \/\/USE_SVMLIGHT/c \\' ${_file} && \
|
||||
@@ -41,7 +43,7 @@ do
|
||||
rm -rf ${_file}.orig
|
||||
done
|
||||
|
||||
-for _file in `find . -depth -name 'CMakeLists.txt'`
|
||||
+find . -depth -name 'CMakeLists.txt' | while read -r _file
|
||||
do
|
||||
sed -i.orig -e 's!.*_sv[mr]light_.*!!g' ${_file} && \
|
||||
touch -r ${_file}.orig ${_file} && \
|
||||
@@ -56,13 +58,7 @@ do
|
||||
rm -rf ${_file}.orig
|
||||
done
|
||||
|
||||
-_file="src/interfaces/modular/Transfer_includes.i" && \
|
||||
-cp -a ${_file} ${_file}.orig && \
|
||||
-echo '%}' >> ${_file} && \
|
||||
-touch -r ${_file}.orig ${_file} && \
|
||||
-rm -rf ${_file}.orig
|
||||
-
|
||||
-_file="src/interfaces/modular/Machine.i" && \
|
||||
+_file="src/interfaces/swig/Machine.i" && \
|
||||
sed -i.orig -e '/.*CSVRLight.*/d' ${_file} && \
|
||||
touch -r ${_file}.orig ${_file} && \
|
||||
rm -rf ${_file}.orig
|
||||
|
|
@ -1,30 +1,9 @@
|
|||
{ lib, stdenv, fetchFromGitHub, nim, termbox, pcre }:
|
||||
{ lib, nimPackages, fetchFromGitHub, nim, termbox, pcre }:
|
||||
|
||||
let
|
||||
noise = fetchFromGitHub {
|
||||
owner = "jangko";
|
||||
repo = "nim-noise";
|
||||
rev = "v0.1.14";
|
||||
sha256 = "0wndiphznfyb1pac6zysi3bqljwlfwj6ziarcwnpf00sw2zni449";
|
||||
};
|
||||
|
||||
nimbox = fetchFromGitHub {
|
||||
owner = "dom96";
|
||||
repo = "nimbox";
|
||||
rev = "6a56e76c01481176f16ae29b7d7c526bd83f229b";
|
||||
sha256 = "15x1sdfxa1xcqnr68705jfnlv83lm0xnp2z9iz3pgc4bz5vwn4x1";
|
||||
};
|
||||
|
||||
lscolors = fetchFromGitHub {
|
||||
owner = "joachimschmidt557";
|
||||
repo = "nim-lscolors";
|
||||
rev = "v0.3.3";
|
||||
sha256 = "0526hqh46lcfsvymb67ldsc8xbfn24vicn3b8wrqnh6mag8wynf4";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
nimPackages.buildNimPackage rec {
|
||||
pname = "nimmm";
|
||||
version = "0.2.0";
|
||||
nimBinOnly = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joachimschmidt557";
|
||||
|
|
@ -33,17 +12,8 @@ in stdenv.mkDerivation rec {
|
|||
sha256 = "168n61avphbxsxfq8qzcnlqx6wgvz5yrjvs14g25cg3k46hj4xqg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nim ];
|
||||
buildInputs = [ termbox pcre ];
|
||||
|
||||
buildPhase = ''
|
||||
export HOME=$TMPDIR;
|
||||
nim -p:${noise} -p:${nimbox} -p:${lscolors}/src c -d:release src/nimmm.nim
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dt $out/bin src/nimmm
|
||||
'';
|
||||
buildInputs = [ termbox pcre ]
|
||||
++ (with nimPackages; [ noise nimbox lscolors ]);
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal file manager written in nim";
|
||||
|
|
|
|||
|
|
@ -1,29 +1,36 @@
|
|||
{ lib, buildPythonApplication, fetchPypi
|
||||
, installShellFiles, pbr
|
||||
, flake8, mock, pycodestyle, pylint, tox
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, git
|
||||
, stestr
|
||||
, nix-update-script
|
||||
, testVersion, git-machete
|
||||
, testVersion
|
||||
, git-machete
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0mq6hmb3wvj0ash27h4zyl46l3fikpf0mv3ng330lcy6v7bhy5b8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0sx45y1d1v6y66msjc1lw9jhjppgbxqj145kivmd7lr6ccw68kav";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pbr ];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# TODO: Add missing check inputs (2019-11-22):
|
||||
# - stestr
|
||||
doCheck = false;
|
||||
checkInputs = [ flake8 mock pycodestyle pylint tox ];
|
||||
checkInputs = [ git stestr ];
|
||||
|
||||
postCheck = ''
|
||||
stestr run
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash --name git-machete completion/git-machete.completion.bash
|
||||
installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh
|
||||
installShellCompletion --bash --name git-machete completion/git-machete.completion.bash
|
||||
installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
@ -42,7 +49,6 @@ buildPythonApplication rec {
|
|||
homepage = "https://github.com/VirtusLab/git-machete";
|
||||
description = "Git repository organizer and rebase/merge workflow automation tool";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.blitz ];
|
||||
maintainers = with maintainers; [ blitz ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-repo";
|
||||
version = "2.16.7";
|
||||
version = "2.16.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "android";
|
||||
repo = "tools_repo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AJD+WV8JilclcMXc4RFv2xY9QZNUJtYX1dsb1q85qZ0=";
|
||||
sha256 = "sha256-5EIuaGc93ll9YXLlleZ2HhT0maa+xtozk0LtneYYcDM=";
|
||||
};
|
||||
|
||||
# Fix 'NameError: name 'ssl' is not defined'
|
||||
|
|
|
|||
|
|
@ -4,23 +4,24 @@
|
|||
, pkg-config
|
||||
, glib
|
||||
, glibc
|
||||
, libseccomp
|
||||
, systemd
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conmon";
|
||||
version = "2.0.29";
|
||||
version = "2.0.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Idt+bN9Lf6GEjdGC/sM9Ln1ohXhUy78CrmJxSDA2Y0o=";
|
||||
sha256 = "sha256-NZMuHhQyo+95QTJcR79cyZr86ytkbo4nmaqTF0Bdt+s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ glib systemd ]
|
||||
buildInputs = [ glib libseccomp systemd ]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
|
||||
|
||||
# manpage requires building the vendored go-md2man
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "luna-icons";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0pww8882qvlnamxzvn7jxyi0h7lffrwld7qqs1q08h73xc3p18nv";
|
||||
sha256 = "sha256-qYFyZT1mLNHBRrX/NX2pmt9P5n8urEK/msQMctSckzE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,20 +6,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flat-remix-gnome";
|
||||
version = "20210716";
|
||||
version = "20210921";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daniruiz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-UAWi4MyqtuSzp5TEkVLYJF7+2tzH/aT60ObNOimCJ4o=";
|
||||
hash = "sha256-HnbKqdDAre2jhZH1Osf3jigz/dQpx7k0fPsVaZz7xC8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib ];
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
preInstall = ''
|
||||
# make install will back up this file, it will fail if the file doesn't exist.
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20210716/Makefile#L53
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20210921/Makefile#L53
|
||||
mkdir -p $out/share/gnome-shell/
|
||||
touch $out/share/gnome-shell/gnome-shell-theme.gresource
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = lib.optionals withPantheon [
|
||||
# https://github.com/elementary/browser
|
||||
# FIXME: Update the patches when https://github.com/elementary/browser/pull/41 merged
|
||||
./dark-style.patch
|
||||
./navigation-buttons.patch
|
||||
];
|
||||
|
|
|
|||
|
|
@ -75,6 +75,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/mate-desktop/caja-dropbox";
|
||||
license = with licenses; [ gpl3Plus cc-by-nd-30 ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = with licenses; [ gpl2Plus lgpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,11 +34,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "An image viewing and cataloging program for the MATE desktop";
|
||||
homepage = "https://mate-desktop.org";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/mate-desktop/libmatekbd";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/mate-desktop/libmatemixer";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/mate-desktop/libmateweather";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/mate-desktop/marco";
|
||||
license = [ licenses.gpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = with licenses; [ gpl2Plus lgpl2Plus ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = with licenses; [ gpl2Plus cc-by-sa-40 ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = [ licenses.gpl2Plus ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Common files for development of MATE packages";
|
||||
homepage = "https://mate-desktop.org";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/mate-desktop/mate-control-center";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Icon themes from MATE";
|
||||
homepage = "https://mate-desktop.org";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
license = with licenses; [ gpl3Plus lgpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo maintainers.chpatrick ];
|
||||
maintainers = teams.mate.members ++ (with maintainers; [ chpatrick ]);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/mate-desktop/mate-menus";
|
||||
license = with licenses; [ gpl2Plus lgpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = with licenses; [ gpl3Only lgpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/mate-desktop/mate-notification-daemon";
|
||||
license = with licenses; [ gpl2Plus gpl3Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/mate-desktop/mate-panel";
|
||||
license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = [ licenses.gpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = with licenses; [ gpl2Plus fdl11Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ romildo chpatrick ];
|
||||
maintainers = teams.mate.members ++ (with maintainers; [ chpatrick ]);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = with licenses; [ gpl2Plus lgpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
|
|||
description = "MATE panel applet for hardware sensors";
|
||||
license = with licenses; [ gpl2Plus ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,6 +55,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/mate-desktop/mate-session-manager";
|
||||
license = with licenses; [ gpl2Plus lgpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/mate-desktop/mate-settings-daemon";
|
||||
license = with licenses; [ gpl2Plus gpl3Plus lgpl2Plus mit ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = [ licenses.gpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = with licenses; [ lgpl21Plus lgpl3Only gpl3Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,6 +86,6 @@ python3Packages.buildPythonApplication rec {
|
|||
changelog = "https://github.com/ubuntu-mate/mate-tweak/releases/tag/${version}";
|
||||
license = [ licenses.gpl2Plus ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ luc65r ];
|
||||
maintainers = teams.mate.members ++ (with maintainers; [ luc65r ]);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = with licenses; [ gpl2Plus fdl12 ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/mate-desktop/mate-user-share";
|
||||
license = with licenses; [ gpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = with licenses; [ gpl2Plus lgpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
homepage = "https://github.com/mate-desktop/mozo";
|
||||
license = with licenses; [ lgpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://mate-desktop.org";
|
||||
license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/mate-desktop/python-caja";
|
||||
license = [ licenses.gpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-calendar";
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
|
||||
repoName = "calendar";
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "1caxc42jrys5s4x9qai5wdpcwpkmyvnqx9z75974g7swiz1lrzq6";
|
||||
sha256 = "16xp8gfgpyz9xpjsxm6jlk4skkknj65g0q4x0qvw9sg9f1p6a514";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sideload";
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0mwcaayzcm5pjcwdd61can93y66jiz4wyz9wr8j5fbns5hbk3z5m";
|
||||
sha256 = "0abpcawmmv5mgzk2i5n9rlairmjr2v9rg9b8c9g7xa085s496bi9";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -21,22 +21,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-keyboard";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1nsy9fh6qj5kyg22bs1hm6kpsvarwc63q0hl0nbwymvnhfjf6swp";
|
||||
sha256 = "1p1l7dx5v1zzz89hhhkm6n3ls7ig4cf2prh1099f1c054qiy9b0y";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream code not respecting our localedir
|
||||
# https://github.com/elementary/switchboard-plug-keyboard/pull/377
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/switchboard-plug-keyboard/commit/6d8bcadba05b4ee1115b891448b0de31bcba3749.patch";
|
||||
sha256 = "1bppxakj71r3cfy8sw19xbyngb7r6nyirc4g6pjf02cdidhw3v8l";
|
||||
})
|
||||
./0001-Remove-Install-Unlisted-Engines-function.patch
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-mouse-touchpad";
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "19kiwrdpan8hr5r79y591591qjx7pm3x814xfkg9vi11ndbcrznr";
|
||||
sha256 = "0nqgbpk1knvbj5xa078i0ka6lzqmaaa873gwj3mhjr5q2gzkw7y5";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
@ -60,12 +60,6 @@ stdenv.mkDerivation rec {
|
|||
src = ./fix-paths.patch;
|
||||
touchegg = touchegg;
|
||||
})
|
||||
# Upstream code not respecting our localedir
|
||||
# https://github.com/elementary/switchboard-plug-mouse-touchpad/pull/185
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/switchboard-plug-mouse-touchpad/commit/a6f84dc08be5dc6f7535082bacfa24e2dff4ef67.patch";
|
||||
sha256 = "0fxl894dzw1f84n36mb9y7gshs69xcb0samvs2gsa0pcdlzfp3cy";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-greeter";
|
||||
version = "6.0.0";
|
||||
version = "6.0.1";
|
||||
|
||||
repoName = "greeter";
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "1ny1003bbpdscc4kr2d94zc5vxm30y64dpj3fpd5zz2p2g0cq2h9";
|
||||
sha256 = "1f606ds56sp1c58q8dblfpaq9pwwkqw9i4gkwksw45m2xkwlbflq";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
@ -89,12 +89,6 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
patches = [
|
||||
# Upstream code not respecting our localedir
|
||||
# https://github.com/elementary/greeter/pull/545
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/greeter/commit/d1373a7db827bc753bfcd70d0c8f25460ea9f1de.patch";
|
||||
sha256 = "0s8l7ycd2s307d3dh1p4vdk33dbzjzqwxs6msyb9w0ycfyxlwdvp";
|
||||
})
|
||||
./sysconfdir-install.patch
|
||||
# Needed until https://github.com/elementary/greeter/issues/360 is fixed
|
||||
(substituteAll {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gleam";
|
||||
version = "0.16.1";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JivBYBhXTti285pO4HNhalj0WeR/Hly3IjxpA+qauWY=";
|
||||
sha256 = "sha256-HFcJUOfWMgMm+Sc3nAXW6FwXkiY34826QxMZ8rWPmnk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ] ++
|
||||
lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
|
||||
cargoSha256 = "sha256-SemHpvZ0lMqyMcgHPnmqI4C1krAJMM0hKCNNVMrulfI=";
|
||||
cargoSha256 = "sha256-zjb+ERikMwC+ulfx6EW+FXLweZACwKNw4HEIc9dH3+4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A statically typed language for the Erlang VM";
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
# Uses scheme to bootstrap the build of idris2
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "idris2";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "idris-lang";
|
||||
repo = "Idris2";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JRI5/dEy9GT8SIj3X+UcJ0SiTQ20pqevWeTNX6e+Nfw=";
|
||||
sha256 = "sha256-6CTn8o5geWSesXO7vTrrV/2EOQ3f+nPQ2M5cem13ZSY=";
|
||||
};
|
||||
|
||||
# We do not add any propagatedNativeBuildInputs because we do not want the
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotlin";
|
||||
version = "1.5.30";
|
||||
version = "1.5.31";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
sha256 = "sha256-Je69ubsuFl5LqO+/j/lDxF1Pw52//CwcqgWejdgTZ18=";
|
||||
sha256 = "sha256-ZhERKG8+WsBqrzqUA9hp2alqF2tisUGBS+YmpHJJ/p4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
|
|
|||
|
|
@ -18,6 +18,14 @@ stdenv.mkDerivation rec {
|
|||
./gnu-install-dirs.patch
|
||||
];
|
||||
|
||||
# On Darwin the llvm-config is perhaps not working fine as the
|
||||
# LLVM_MAIN_SRC_DIR is not getting set correctly, and the build fails as the
|
||||
# include path is not correct.
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace MachO/CMakeLists.txt --replace \
|
||||
'(''${LLVM_MAIN_SRC_DIR}/' '(../'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libllvm libxml2 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mlkit";
|
||||
version = "4.5.7";
|
||||
version = "4.5.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "melsman";
|
||||
repo = "mlkit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Wq+Os7nzRA5Pxz6Ba7DudcDQs3KA0eYVLy1nO/A16EE=";
|
||||
sha256 = "sha256-b+iPuGB82a0r0zl49+RbalxR6OpFNXOxZgubzKE+2M4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook mlton ];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
# https://nim-lang.github.io/Nim/packaging.html
|
||||
# https://nim-lang.org/docs/nimc.html
|
||||
|
||||
{ lib, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub, makeWrapper
|
||||
, openssl, pcre, readline, boehmgc, sqlite, nim-unwrapped }:
|
||||
{ lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub
|
||||
, makeWrapper, openssl, pcre, readline, boehmgc, sqlite, nim-unwrapped
|
||||
, nimble-unwrapped }:
|
||||
|
||||
let
|
||||
parseCpu = platform:
|
||||
|
|
@ -186,138 +187,141 @@ in {
|
|||
nim' = buildPackages.nim-unwrapped;
|
||||
nimble' = buildPackages.nimble-unwrapped;
|
||||
inherit (stdenv) targetPlatform;
|
||||
in stdenv.mkDerivation {
|
||||
name = "${targetPlatform.config}-nim-wrapper-${nim'.version}";
|
||||
inherit (nim') version;
|
||||
preferLocalBuild = true;
|
||||
strictDeps = true;
|
||||
self = stdenv.mkDerivation {
|
||||
name = "${targetPlatform.config}-nim-wrapper-${nim'.version}";
|
||||
inherit (nim') version;
|
||||
preferLocalBuild = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
patches = [
|
||||
./nim.cfg.patch
|
||||
# Remove configurations that clash with ours
|
||||
];
|
||||
patches = [
|
||||
./nim.cfg.patch
|
||||
# Remove configurations that clash with ours
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
tar xf ${nim'.src} nim-$version/config
|
||||
cd nim-$version
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildPhase =
|
||||
# Configure the Nim compiler to use $CC and $CXX as backends
|
||||
# The compiler is configured by two configuration files, each with
|
||||
# a different DSL. The order of evaluation matters and that order
|
||||
# is not documented, so duplicate the configuration across both files.
|
||||
''
|
||||
runHook preBuild
|
||||
cat >> config/config.nims << WTF
|
||||
|
||||
switch("os", "${nimTarget.os}")
|
||||
switch("cpu", "${nimTarget.cpu}")
|
||||
switch("define", "nixbuild")
|
||||
|
||||
# Configure the compiler using the $CC set by Nix at build time
|
||||
import strutils
|
||||
let cc = getEnv"CC"
|
||||
if cc.contains("gcc"):
|
||||
switch("cc", "gcc")
|
||||
elif cc.contains("clang"):
|
||||
switch("cc", "clang")
|
||||
WTF
|
||||
|
||||
mv config/nim.cfg config/nim.cfg.old
|
||||
cat > config/nim.cfg << WTF
|
||||
os = "${nimTarget.os}"
|
||||
cpu = "${nimTarget.cpu}"
|
||||
define:"nixbuild"
|
||||
WTF
|
||||
|
||||
cat >> config/nim.cfg < config/nim.cfg.old
|
||||
rm config/nim.cfg.old
|
||||
|
||||
cat >> config/nim.cfg << WTF
|
||||
|
||||
clang.cpp.exe %= "\$CXX"
|
||||
clang.cpp.linkerexe %= "\$CXX"
|
||||
clang.exe %= "\$CC"
|
||||
clang.linkerexe %= "\$CC"
|
||||
gcc.cpp.exe %= "\$CXX"
|
||||
gcc.cpp.linkerexe %= "\$CXX"
|
||||
gcc.exe %= "\$CC"
|
||||
gcc.linkerexe %= "\$CC"
|
||||
WTF
|
||||
|
||||
runHook postBuild
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
tar xf ${nim'.src} nim-$version/config
|
||||
cd nim-$version
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
wrapperArgs = [
|
||||
"--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${
|
||||
placeholder "out"
|
||||
}/bin"
|
||||
# Used by nim-gdb
|
||||
dontConfigure = true;
|
||||
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}"
|
||||
# These libraries may be referred to by the standard library.
|
||||
# This is broken for cross-compilation because the package
|
||||
# set will be shifted back by nativeBuildInputs.
|
||||
buildPhase =
|
||||
# Configure the Nim compiler to use $CC and $CXX as backends
|
||||
# The compiler is configured by two configuration files, each with
|
||||
# a different DSL. The order of evaluation matters and that order
|
||||
# is not documented, so duplicate the configuration across both files.
|
||||
''
|
||||
runHook preBuild
|
||||
cat >> config/config.nims << WTF
|
||||
|
||||
"--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
|
||||
# Use the custom configuration
|
||||
switch("os", "${nimTarget.os}")
|
||||
switch("cpu", "${nimTarget.cpu}")
|
||||
switch("define", "nixbuild")
|
||||
|
||||
''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"''
|
||||
# Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds.
|
||||
];
|
||||
# Configure the compiler using the $CC set by Nix at build time
|
||||
import strutils
|
||||
let cc = getEnv"CC"
|
||||
if cc.contains("gcc"):
|
||||
switch("cc", "gcc")
|
||||
elif cc.contains("clang"):
|
||||
switch("cc", "clang")
|
||||
WTF
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mv config/nim.cfg config/nim.cfg.old
|
||||
cat > config/nim.cfg << WTF
|
||||
os = "${nimTarget.os}"
|
||||
cpu = "${nimTarget.cpu}"
|
||||
define:"nixbuild"
|
||||
WTF
|
||||
|
||||
mkdir -p $out/bin $out/etc
|
||||
cat >> config/nim.cfg < config/nim.cfg.old
|
||||
rm config/nim.cfg.old
|
||||
|
||||
cp -r config $out/etc/nim
|
||||
cat >> config/nim.cfg << WTF
|
||||
|
||||
clang.cpp.exe %= "\$CXX"
|
||||
clang.cpp.linkerexe %= "\$CXX"
|
||||
clang.exe %= "\$CC"
|
||||
clang.linkerexe %= "\$CC"
|
||||
gcc.cpp.exe %= "\$CXX"
|
||||
gcc.cpp.linkerexe %= "\$CXX"
|
||||
gcc.exe %= "\$CC"
|
||||
gcc.linkerexe %= "\$CC"
|
||||
WTF
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
wrapperArgs = [
|
||||
"--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${
|
||||
placeholder "out"
|
||||
}/bin"
|
||||
# Used by nim-gdb
|
||||
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}"
|
||||
# These libraries may be referred to by the standard library.
|
||||
# This is broken for cross-compilation because the package
|
||||
# set will be shifted back by nativeBuildInputs.
|
||||
|
||||
"--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
|
||||
# Use the custom configuration
|
||||
|
||||
''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"''
|
||||
# Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds.
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/etc
|
||||
|
||||
cp -r config $out/etc/nim
|
||||
|
||||
for binpath in ${nim'}/bin/nim?*; do
|
||||
local binname=`basename $binpath`
|
||||
makeWrapper \
|
||||
$binpath $out/bin/${targetPlatform.config}-$binname \
|
||||
$wrapperArgs
|
||||
ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname
|
||||
done
|
||||
|
||||
for binpath in ${nim'}/bin/nim?*; do
|
||||
local binname=`basename $binpath`
|
||||
makeWrapper \
|
||||
$binpath $out/bin/${targetPlatform.config}-$binname \
|
||||
${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
|
||||
--set-default CC $(command -v $CC) \
|
||||
--set-default CXX $(command -v $CXX) \
|
||||
$wrapperArgs
|
||||
ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname
|
||||
done
|
||||
ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim
|
||||
|
||||
makeWrapper \
|
||||
${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
|
||||
--set-default CC $(command -v $CC) \
|
||||
--set-default CXX $(command -v $CXX) \
|
||||
$wrapperArgs
|
||||
ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim
|
||||
makeWrapper \
|
||||
${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \
|
||||
$wrapperArgs
|
||||
ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament
|
||||
|
||||
makeWrapper \
|
||||
${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \
|
||||
$wrapperArgs
|
||||
ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament
|
||||
makeWrapper \
|
||||
${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \
|
||||
--suffix PATH : $out/bin
|
||||
ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble
|
||||
|
||||
makeWrapper \
|
||||
${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \
|
||||
--suffix PATH : $out/bin
|
||||
ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
passthru = {
|
||||
nim = nim';
|
||||
nimble = nimble';
|
||||
};
|
||||
|
||||
passthru = {
|
||||
nim = nim';
|
||||
nimble = nimble';
|
||||
};
|
||||
|
||||
meta = nim'.meta // {
|
||||
description = nim'.meta.description
|
||||
+ " (${targetPlatform.config} wrapper)";
|
||||
platforms = with lib.platforms; unix ++ genode;
|
||||
meta = nim'.meta // {
|
||||
description = nim'.meta.description
|
||||
+ " (${targetPlatform.config} wrapper)";
|
||||
platforms = with lib.platforms; unix ++ genode;
|
||||
};
|
||||
};
|
||||
in self // {
|
||||
pkgs = callPackage ../../../top-level/nim-packages.nix { nim = self; };
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue