diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 62d59dccda7..46b98d0a87d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7267,6 +7267,16 @@ githubId = 10180857; name = "Anmol Sethi"; }; + nicbk = { + email = "nicolas@nicbk.com"; + github = "nicbk"; + githubId = 77309427; + name = "Nicolás Kennedy"; + keys = [{ + longkeyid = "rsa4096/0xC061089EFEBF7A35"; + fingerprint = "7BC1 77D9 C222 B1DC FB2F 0484 C061 089E FEBF 7A35"; + }]; + }; nichtsfrei = { email = "philipp.eder@posteo.net"; github = "nichtsfrei"; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 5039b842f41..5377a7b3d11 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast and robust (System)Verilog simulator/compiler"; homepage = "https://www.veripool.org/wiki/verilator"; - license = licenses.lgpl3; + license = with licenses; [ lgpl3Only artistic2 ]; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; }; diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index fbe96ca179d..568407c3614 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.14.0"; + version = "0.14.2"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "0dfnn5ar7zgvgvxcvw5f6vwpkgkwa017y07s7mvdv44zf4hzsj3s"; + sha256 = "1ga2hn9br71dyzn3p9jvjiksvnq21p6i5hp1z1j5fpz9la28nqzf"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1l3i7mxlzb2dkq6ff37rvnaarikxzxj0fg9i2kk26s8pz7vpqgjh"; + sha256 = "1kv7dm1nw85lw3brrclkj7xc9p021jx3n8wgp2fg3572s86ypskw"; }; @@ -62,5 +62,6 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; mainProgram = "purs"; + changelog = "https://github.com/purescript/purescript/releases/tag/v${version}"; }; } diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix new file mode 100644 index 00000000000..2ece4543c2a --- /dev/null +++ b/pkgs/development/ocaml-modules/cooltt/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, cmdliner +, menhir +, menhirLib +, ppx_deriving +, ppxlib +, uuseg +, uutf +}: + +buildDunePackage { + pname = "cooltt"; + version = "unstable-2021-05-25"; + + minimumOCamlVersion = "4.10"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "RedPRL"; + repo = "cooltt"; + rev = "8ac06cbf7e05417d777f3ac6a471fe3576249f79"; + sha256 = "sha256-JBLNJaRuP/gwlg8RS3cpOpzxChOVKfmFulf5HKhhHh4="; + }; + + nativeBuildInputs = [ + cmdliner + menhir + ppxlib + ]; + + propagatedBuildInputs = [ + menhirLib + ppx_deriving + uuseg + uutf + ]; + + meta = with lib; { + homepage = "https://github.com/RedPRL/cooltt"; + description = "A cool implementation of normalization by evaluation (nbe) & elaboration for Cartesian cubical type theory"; + license = licenses.asl20; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/tools/inputmethods/remote-touchpad/default.nix index 0bd2b09aafc..a4dc6a1c463 100644 --- a/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "0zmbn4s3yhcgmijc96vja7zj2sh6q0nkybhqy0fwz6sqzk8hq02x"; + sha256 = "09a252z69msy4wd5kazpca8dcn0a2djdw0vs663062fl977p73qs"; }; buildInputs = [ libX11 libXi libXt libXtst ]; buildFlags = [ "-tags" "portal,x11" ]; - vendorSha256 = "0q1qk5g7kqpcci5fgamvxa8989jglv69kwg5rvkphbnx1bzlivrl"; + vendorSha256 = "1pgj0m67g759mcs4s34h4pq3mc7gni643z5cp6ffq4rrn8mdi060"; meta = with lib; { description = "Control mouse and keyboard from the webbrowser of a smartphone."; diff --git a/pkgs/tools/misc/depotdownloader/default.nix b/pkgs/tools/misc/depotdownloader/default.nix new file mode 100644 index 00000000000..384234f1f9c --- /dev/null +++ b/pkgs/tools/misc/depotdownloader/default.nix @@ -0,0 +1,49 @@ +{ stdenv, lib, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper +, dotnet-sdk_5, dotnetPackages +}: + +let + fetchNuGet = {name, version, sha256}: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + deps = import ./deps.nix fetchNuGet; +in +stdenv.mkDerivation rec { + pname = "depotdownloader"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "SteamRE"; + repo = "DepotDownloader"; + rev = "DepotDownloader_${version}"; + sha256 = "1ldwda7wyvzqvqv1wshvqvqaimlm0rcdzhy9yn5hvxyswc0jxirr"; + }; + + nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget makeWrapper ]; + + buildPhase = '' + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_NOLOGO=1 + export HOME=$TMP/home + + nuget sources Add -Name tmpsrc -Source $TMP/nuget + nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget + + dotnet restore --source $TMP/nuget DepotDownloader/DepotDownloader.csproj + dotnet publish --no-restore -c Release --output $out + ''; + + installPhase = '' + makeWrapper ${dotnet-sdk_5}/bin/dotnet $out/bin/$pname \ + --add-flags $out/DepotDownloader.dll + ''; + + meta = with lib; { + description = "Steam depot downloader utilizing the SteamKit2 library."; + license = licenses.gpl2Only; + maintainers = [ maintainers.babbaj ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/tools/misc/depotdownloader/deps.nix b/pkgs/tools/misc/depotdownloader/deps.nix new file mode 100644 index 00000000000..6f061186f82 --- /dev/null +++ b/pkgs/tools/misc/depotdownloader/deps.nix @@ -0,0 +1,88 @@ +fetchNuGet: +[ + (fetchNuGet { + name = "protobuf-net"; + version = "3.0.101"; + sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; + }) + (fetchNuGet { + name = "SteamKit2"; + version = "2.4.0-Alpha.2"; + sha256 = "1r6chqdp912pr8f8d7px2vp4y1ydx0kida7d5a1hbf6b7acnsg7d"; + }) + (fetchNuGet { + name = "protobuf-net.Core"; + version = "3.0.101"; + sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App"; + version = "2.0.0"; + sha256 = "0j8xkssrashyxrmdraci6kmj2gdrdxb0z61jwnzf1r9r2kqrd7d2"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.DotNetAppHost"; + version = "2.0.0"; + sha256 = "0yixdk1rslbznrl50d6pyhg50xxr6jbfb1qpy2yd8xv44s4shgwd"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.DotNetHostPolicy"; + version = "2.0.0"; + sha256 = "1zz9yfzcvcai4il78s3phjp1hryib2zk3w2r16v3fxm2yllssyaf"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.DotNetHostResolver"; + version = "2.0.0"; + sha256 = "0xy45xqmdqz7r6v0g8m7c1rp761ghavjl8nzxiyrpbp0wccxl3xb"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "5.0.0"; + sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "5.0.0"; + sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "2.0.0"; + sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.7.1"; + sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.4"; + sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.7.0"; + sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.7.0"; + sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.3"; + sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; + }) + (fetchNuGet { + name = "System.Security.AccessControl"; + version = "5.0.0"; + sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "5.0.0"; + sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; + }) +] diff --git a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix new file mode 100644 index 00000000000..e216823f7ab --- /dev/null +++ b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix @@ -0,0 +1,32 @@ +{ lib, mkDerivation, fetchFromGitHub, gnumake, qmake }: + +mkDerivation rec { + name = "veikk-linux-driver-gui"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "jlam55555"; + repo = name; + rev = "v${version}"; + sha256 = "02g1q79kwjlzg95w38a1d7nxvcry8xcsvhax2js4c7xqvzhkki5j"; + }; + + nativeBuildInputs = [ qmake ]; + + postBuild = '' + make all clean + ''; + + installPhase = '' + mkdir -p $out/bin + cp veikk-linux-driver-gui $out/bin + ''; + + meta = with lib; { + description = "Configuration tool for the VEIKK Linux driver"; + homepage = "https://github.com/jlam55555/veikk-linux-driver-gui/"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ nicbk ]; + }; +} diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index 0d9dbd19117..3549677e22f 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -9,7 +9,8 @@ let versions = builtins.fromJSON (builtins.readFile ./versions.json); else if stdenv.isAarch64 then "arm64" else throw "Unsupported architecture"; os = if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "darwin" + else if (stdenv.isDarwin && stdenv.isx86_64) then "darwin" + else if stdenv.isDarwin then throw "Unsupported architecture" else throw "Unsupported os"; versionInfo = versions."${os}-${arch}"; inherit (versionInfo) version sha256 url; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dedf8c35599..f6d65e46ba5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -876,6 +876,8 @@ in tnat64 = callPackage ../tools/networking/tnat64 { }; + veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; + xcd = callPackage ../tools/misc/xcd { }; xtrt = callPackage ../tools/archivers/xtrt { }; @@ -30346,6 +30348,8 @@ in darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; + depotdownloader = callPackage ../tools/misc/depotdownloader { }; + desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome2) gtkglext libglade; }; dbacl = callPackage ../tools/misc/dbacl { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1fba7289130..92894bf7a3b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -191,6 +191,8 @@ let containers-data = callPackage ../development/ocaml-modules/containers/data.nix { }; + cooltt = callPackage ../development/ocaml-modules/cooltt { }; + cow = callPackage ../development/ocaml-modules/cow { }; cpdf = callPackage ../development/ocaml-modules/cpdf { };