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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-18 08:57:16 -07:00
parent c227fb4b17 d189df235a
commit f7a112f6c4
264 changed files with 3781 additions and 1606 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/biology/est-sfs/default.nix
+4
View File
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
buildInputs = [ gsl ];
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
];
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share/doc/${pname}
pkgs/applications/science/chemistry/gwyddion/default.nix
+2 -2
View File
@@ -35,10 +35,10 @@ in
stdenv.mkDerivation rec {
pname = "gwyddion";
version = "2.57";
version = "2.58";
src = fetchurl {
url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz";
sha256 = "sha256-kx/WqtNDaJQyVehxZ3weddXyaM1knX+fCuv47A9GaH0=";
sha256 = "sha256-0xNnzYkuW3nEsO2o+0WEA+Z71XWoq6FYXm342OWO9Sw=";
};
nativeBuildInputs = [ pkg-config file ];
pkgs/applications/science/electronics/gtkwave/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gtkwave";
version = "3.3.108";
version = "3.3.109";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
sha256 = "sha256-LtlexZKih+Si/pH3oQpWdpzfZ6j+41Otgfx7nLMfFSQ=";
sha256 = "sha256-NUYezNm4tEcMqnirmo8U7Ky8ye/2MDPY3OWAk+eG3rc=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
pkgs/applications/science/electronics/kicad/default.nix
+4 -1
View File
@@ -257,9 +257,12 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/share
ln -s ${base}/share/applications $out/share/applications
ln -s ${base}/share/metainfo $out/share/metainfo
ln -s ${base}/share/icons $out/share/icons
ln -s ${base}/share/mime $out/share/mime
'' + optionalString (stable) ''
ln -s ${base}/share/appdata $out/share/appdata
'' + optionalString (!stable) ''
ln -s ${base}/share/metainfo $out/share/metainfo
'';
# can't run this for each pname
pkgs/applications/science/electronics/kicad/versions.nix
+4 -4
View File
@@ -27,14 +27,14 @@
};
"kicad-unstable" = {
kicadVersion = {
version = "2021-05-13";
version = "2021-05-16";
src = {
rev = "8513ca974c28d76d9f74a7dc96601d98e66e87fd";
sha256 = "1xlj6jwzwxsa14djqhj0csziii21mr9czvdj6fxqp6px84cifjsh";
rev = "c33b2cfa8d16072b9d1bce558e443c4afa889d06";
sha256 = "1fvbxjpf880ikjqjhzj8wlxj0845gzrj1yv35rk7akbg4vl9ph72";
};
};
libVersion = {
version = "2021-05-13";
version = "2021-05-16";
libSources = {
i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0";
i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl";
pkgs/applications/science/math/numworks-epsilon/0001-ion-linux-makerules.patch
+12
View File
@@ -0,0 +1,12 @@
diff --git a/ion/src/simulator/linux/Makefile b/ion/src/simulator/linux/Makefile
index ca7da03fa..b05bba115 100644
--- a/ion/src/simulator/linux/Makefile
+++ b/ion/src/simulator/linux/Makefile
@@ -28,7 +28,6 @@ ion_src += $(addprefix ion/src/simulator/shared/, \
collect_registers.cpp \
haptics.cpp \
journal.cpp \
- platform_action_modifier_ctrl.cpp \
state_file.cpp \
)
pkgs/applications/science/math/numworks-epsilon/default.nix
+13 -3
View File
@@ -2,6 +2,8 @@
, lib
, fetchFromGitHub
, libpng
, libjpeg
, freetype
, xorg
, python3
, imagemagick
@@ -11,18 +13,20 @@
stdenv.mkDerivation rec {
pname = "numworks-epsilon";
version = "15.3.2";
version = "15.5.0";
src = fetchFromGitHub {
owner = "numworks";
repo = "epsilon";
rev = version;
sha256 = "1q34dilyypiggjs16486jm122yf20wcigqxvspc77ig9albaxgh5";
sha256 = "fPBO3FzZ4k5OxG+Ifc6R/au4Te974HNKAEdHz+aFdSg=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libpng
libjpeg
freetype
xorg.libXext
python3
imagemagick
@@ -33,6 +37,12 @@ stdenv.mkDerivation rec {
"PLATFORM=simulator"
];
patches = [
# Remove make rule Introduced in cba596dde7
# which causes it to not build with nix
./0001-ion-linux-makerules.patch
];
installPhase = ''
runHook preInstall
@@ -44,7 +54,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "Emulator for Epsilon, a High-performance graphing calculator operating system";
description = "Simulator for Epsilon, a High-performance graphing calculator operating system";
homepage = "https://numworks.com/";
license = licenses.cc-by-nc-sa-40;
maintainers = with maintainers; [ erikbackman ];
pkgs/applications/science/misc/rink/default.nix
+4 -2
View File
@@ -1,4 +1,5 @@
{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses
, libiconv, Security }:
rustPlatform.buildRustPackage rec {
version = "0.6.1";
@@ -14,7 +15,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0x4rvfnw3gl2aj6i006nkk3y1f8skyv8g0ss3z2v6qj9nhs7pyir";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ncurses ];
buildInputs = [ ncurses ]
++ (if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]);
# Some tests fail and/or attempt to use internet servers.
doCheck = false;
pkgs/applications/science/robotics/mission-planner/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono6 }:
{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono }:
let
pname = "mission-planner";
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x";
};
nativeBuildInputs = [ makeWrapper mono6 unzip ];
nativeBuildInputs = [ makeWrapper mono unzip ];
sourceRoot = ".";
AOT_FILES = [ "MissionPlanner.exe" "MissionPlanner.*.dll" ];
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
install -m 444 -D mpdesktop150.png $out/share/icons/mission-planner.png
cp -r ${desktopItem}/share/applications $out/share/
mv * $out/opt/mission-planner
makeWrapper ${mono6}/bin/mono $out/bin/mission-planner \
makeWrapper ${mono}/bin/mono $out/bin/mission-planner \
--add-flags $out/opt/mission-planner/MissionPlanner.exe
runHook postInstall
'';