diff --git a/doc/configuration.xml b/doc/configuration.xml index 4411b4844e99..c91f38f30930 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -378,7 +378,7 @@ myPackages = pkgs.buildEnv { name = "my-packages"; paths = [ aspell bc coreutils ffmpeg nixUnstable emscripten jq nox silver-searcher ]; - pathsToLink = [ "/share/man" "/share/doc" /bin" ]; + pathsToLink = [ "/share/man" "/share/doc" "/bin" ]; extraOutputsToInstall = [ "man" "doc" ]; }; }; @@ -416,7 +416,7 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh nox silver-searcher ]; - pathsToLink = [ "/share/man" "/share/doc" /bin" "/etc" ]; + pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ]; extraOutputsToInstall = [ "man" "doc" ]; }; }; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 07728c19fc9e..063878d63b87 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -47,15 +47,7 @@ rec { ben-nanonote = rec { config = "mipsel-unknown-linux-uclibc"; - platform = { - name = "ben_nanonote"; - kernelMajor = "2.6"; - kernelArch = "mips"; - gcc = { - arch = "mips32"; - float = "soft"; - }; - }; + platform = platforms.ben_nanonote; }; fuloongminipc = rec { diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 1315f290cefa..02ca3a6b3614 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -79,15 +79,20 @@ rec { armv8r = { bits = 32; significantByte = littleEndian; family = "arm"; }; armv8m = { bits = 32; significantByte = littleEndian; family = "arm"; }; aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; }; + i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; + mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; }; mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; }; + powerpc = { bits = 32; significantByte = bigEndian; family = "power"; }; + riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; }; riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; }; + wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; }; wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; }; }; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index d6587ac49a89..cceaecf01843 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -20,6 +20,10 @@ rec { kernelAutoModules = false; }; + ## + ## ARM + ## + pogoplug4 = { name = "pogoplug4"; @@ -372,84 +376,6 @@ rec { kernelBaseConfig = "guruplug_defconfig"; }; - fuloong2f_n32 = { - name = "fuloong2f_n32"; - kernelMajor = "2.6"; - kernelBaseConfig = "lemote2f_defconfig"; - kernelArch = "mips"; - kernelAutoModules = false; - kernelExtraConfig = '' - MIGRATION n - COMPACTION n - - # nixos mounts some cgroup - CGROUPS y - - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - EXT4_FS m - USB_STORAGE_CYPRESS_ATACB m - - IP_PNP y - IP_PNP_DHCP y - IP_PNP_BOOTP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # Needed for udev >= 150 - SYSFS_DEPRECATED_V2 n - - VGA_CONSOLE n - VT_HW_CONSOLE_BINDING y - SERIAL_8250_CONSOLE y - FRAMEBUFFER_CONSOLE y - EXT2_FS y - EXT3_FS y - REISERFS_FS y - MAGIC_SYSRQ y - - # The kernel doesn't boot at all, with FTRACE - FTRACE n - ''; - kernelTarget = "vmlinux"; - gcc = { - arch = "loongson2f"; - float = "hard"; - abi = "n32"; - }; - }; - beaglebone = armv7l-hf-multiplatform // { name = "beaglebone"; kernelBaseConfig = "bb.org_defconfig"; @@ -537,6 +463,102 @@ rec { }; }; + ## + ## MIPS + ## + + ben_nanonote = { + name = "ben_nanonote"; + kernelMajor = "2.6"; + kernelArch = "mips"; + gcc = { + arch = "mips32"; + float = "soft"; + }; + }; + + fuloong2f_n32 = { + name = "fuloong2f_n32"; + kernelMajor = "2.6"; + kernelBaseConfig = "lemote2f_defconfig"; + kernelArch = "mips"; + kernelAutoModules = false; + kernelExtraConfig = '' + MIGRATION n + COMPACTION n + + # nixos mounts some cgroup + CGROUPS y + + BLK_DEV_RAM y + BLK_DEV_INITRD y + BLK_DEV_CRYPTOLOOP m + BLK_DEV_DM m + DM_CRYPT m + MD y + REISERFS_FS m + EXT4_FS m + USB_STORAGE_CYPRESS_ATACB m + + IP_PNP y + IP_PNP_DHCP y + IP_PNP_BOOTP y + NFS_FS y + ROOT_NFS y + TUN m + NFS_V4 y + NFS_V4_1 y + NFS_FSCACHE y + NFSD m + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + + # Fail to build + DRM n + SCSI_ADVANSYS n + USB_ISP1362_HCD n + SND_SOC n + SND_ALI5451 n + FB_SAVAGE n + SCSI_NSP32 n + ATA_SFF n + SUNGEM n + IRDA n + ATM_HE n + SCSI_ACARD n + BLK_DEV_CMD640_ENHANCED n + + FUSE_FS m + + # Needed for udev >= 150 + SYSFS_DEPRECATED_V2 n + + VGA_CONSOLE n + VT_HW_CONSOLE_BINDING y + SERIAL_8250_CONSOLE y + FRAMEBUFFER_CONSOLE y + EXT2_FS y + EXT3_FS y + REISERFS_FS y + MAGIC_SYSRQ y + + # The kernel doesn't boot at all, with FTRACE + FTRACE n + ''; + kernelTarget = "vmlinux"; + gcc = { + arch = "loongson2f"; + float = "hard"; + abi = "n32"; + }; + }; + + ## + ## Other + ## + riscv-multiplatform = bits: { name = "riscv-multiplatform"; kernelArch = "riscv"; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 2536367f6ceb..80bc2d49efce 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -43,11 +43,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ]; propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc buildInputs = [ - babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes libgudev + babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes - ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ] + ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ]; pythonPath = [ pygtk ]; diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index db50b0d2169a..026cf9ecc14a 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hstr-${version}"; - version = "1.24"; + version = "1.25"; src = fetchurl { url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; - sha256 = "0w8is777fwq6r17zhl9xwrv9f7vanllzjiasx1pg6pxvppq7rh0x"; + sha256 = "10njj0a3s5czv497wk3whka3gxr7vmhabs12vaw7kgb07h4ssnhg"; }; buildInputs = [ readline ncurses ]; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 496353325255..e9c860f0b901 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -5,7 +5,7 @@ with python3Packages; buildPythonApplication rec { - version = "0.9.0"; + version = "0.9.1"; name = "kitty-${version}"; format = "other"; @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0q6dwwzq1qq3rgh4myxhidgk4bj1p23bhaw5cxb1q0hdgpc54ni8"; + sha256 = "08j2k3852c64z4mgh1j0dgdj6c2alkckpav67lzg1lxsz3w2izh2"; }; buildInputs = [ diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 2d3b9780090d..1748ebd5f3cd 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -8,15 +8,15 @@ }: let - majorVersion = "3.0"; - minorVersion = "1"; + majorVersion = "3.1"; + minorVersion = "0"; in stdenv.mkDerivation rec { name = "openmpi-${majorVersion}.${minorVersion}"; src = fetchurl { url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2"; - sha256 = "0pbqrm5faf57nasy1s81wqivl7zvxmv8lzjh8hvb0f3qxv8m0d36"; + sha256 = "0v7hrmf1z5d1rmm0z5gi79l536j3z5s5b0kf9q5rr1fc4i0h8p5j"; }; postPatch = '' diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix new file mode 100644 index 000000000000..e91925c75d50 --- /dev/null +++ b/pkgs/development/python-modules/outcome/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, attrs +, pytest +}: + +buildPythonPackage rec { + pname = "outcome"; + version = "0.1.0a0"; + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0cqwakzigw0602dxlb7c1882jwr8hn5nrxk1l8iwlmzc9whh48wn"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ attrs ]; + # Has a test dependency on trio, which depends on outcome. + doCheck = false; + + meta = { + description = "Capture the outcome of Python function calls."; + homepage = https://github.com/python-trio/outcome; + license = with lib.licenses; [ mit asl20 ]; + maintainers = with lib.maintainers; [ catern ]; + }; +} diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix new file mode 100644 index 000000000000..2bd607170fd5 --- /dev/null +++ b/pkgs/development/python-modules/trio/default.nix @@ -0,0 +1,42 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, attrs +, sortedcontainers +, async_generator +, idna +, outcome +, contextvars +, pytest +, pyopenssl +, trustme +}: + +buildPythonPackage rec { + pname = "trio"; + version = "0.4.0"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ib1x47knlad9pljb64ywfiv6m3dfrqqjwka6j1b73hixmszb5h4"; + }; + + checkInputs = [ pytest pyopenssl trustme ]; + # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. + checkPhase = '' + py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname' + ''; + propagatedBuildInputs = [ + attrs + sortedcontainers + async_generator + idna + outcome + ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; + + meta = { + description = "An async/await-native I/O library for humans and snake people"; + homepage = https://github.com/python-trio/trio; + license = with lib.licenses; [ mit asl20 ]; + maintainers = with lib.maintainers; [ catern ]; + }; +} diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix new file mode 100644 index 000000000000..0c3ccb5258e7 --- /dev/null +++ b/pkgs/development/python-modules/trustme/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, cryptography, pytest, pyopenssl, service-identity }: + +buildPythonPackage rec { + pname = "trustme"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1215vr6l6c0fzsv5gyay82fxd4fidvq2rd94wvjrljs6h2wajazk"; + }; + + checkInputs = [ pytest pyopenssl service-identity ]; + checkPhase = '' + py.test + ''; + propagatedBuildInputs = [ + cryptography + ]; + + meta = { + description = "#1 quality TLS certs while you wait, for the discerning tester"; + homepage = https://github.com/python-trio/trustme; + license = with lib.licenses; [ mit asl20 ]; + maintainers = with lib.maintainers; [ catern ]; + }; +} diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 95011653ad01..04a4a1a0e1f1 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -1,4 +1,4 @@ -{ version, sha256Hash, maintainers }: +{ version, sha256Hash }: { stdenv, fetchFromGitHub, fetchpatch , fusePackages, utillinux, gettext @@ -28,10 +28,7 @@ in stdenv.mkDerivation rec { url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa"; }) - ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch - # TODO: Only relevant for 3.2.2 (opened an upstream issue) - ++ stdenv.lib.optional isFuse3 ./fuse3-fix-version.patch; - + ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch; nativeBuildInputs = if isFuse3 then [ meson ninja pkgconfig ] @@ -76,10 +73,10 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Kernel module and library that allows filesystems to be implemented in user space"; - platforms = stdenv.lib.platforms.linux; - inherit maintainers; + platforms = platforms.linux; + maintainers = [ maintainers.primeos ]; }; } diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index ddf280bbe2f7..f308930f0dc5 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -4,17 +4,14 @@ let mkFuse = args: callPackage (import ./common.nix args) { inherit utillinux; }; - maintainers = stdenv.lib.maintainers; in { fuse_2 = mkFuse { version = "2.9.7"; sha256Hash = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2"; - maintainers = [ ]; }; fuse_3 = mkFuse { - version = "3.2.2"; - sha256Hash = "1a0x4vpyg9lc6clwvx995mk0v6jqd37xabzp9rpdir37x814g3wh"; - maintainers = [ maintainers.primeos ]; + version = "3.2.3"; + sha256Hash = "185p1vjcsyzpcdkrcyw06zpapv4jc43qw9i8a4amzpgk1rsgg19d"; }; } diff --git a/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch b/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch deleted file mode 100644 index b6351aab3c01..000000000000 --- a/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/meson.build 2018-04-01 01:05:19.612723597 +0200 -+++ b/meson.build 2018-04-01 01:40:58.171109615 +0200 -@@ -1,4 +1,4 @@ --project('libfuse3', 'c', version: '3.2.1', -+project('libfuse3', 'c', version: '3.2.2', - meson_version: '>= 0.38', - default_options: [ 'buildtype=debugoptimized' ]) - diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index e31c0da6306a..b0d1afc654d8 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "powerline-go"; - version = "1.10.0"; + version = "1.11.0"; name = "${pname}-${version}"; rev = "v${version}"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "justjanne"; repo = pname; inherit rev; - sha256 = "1bmgim61cx6i4m24a474nm3w4zqjflm0wnw3y24299n9dj14izs3"; + sha256 = "1s3d9p4jf23n63n6vx3frnw3wkmg3kyiazapixy66790qkx6ddi9"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/misc/powerline-go/deps.nix b/pkgs/tools/misc/powerline-go/deps.nix index 78e28efb3b10..e033a1cf48cf 100644 --- a/pkgs/tools/misc/powerline-go/deps.nix +++ b/pkgs/tools/misc/powerline-go/deps.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "63047d776e07105e370af46ecbd0ae96850f5ef2"; - sha256 = "0204f0gx3fd8ya6rb478a7a4gr2v4i3m71148iv3jrdfvr5q5aaw"; + rev = "57f370e13068146efe1cb7129f79e5d51da8a242"; + sha256 = "1ij0bbnfjj65afin8vhccr3cxvg6r0awmvcvb2ilza5wbbsslggb"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "2b6c08872f4b66da917bb4ce98df4f0307330f78"; - sha256 = "07wgdhs7ac3qmx0lfr4zazg2l159jqbwmn7jx49rr9811vivl1yh"; + rev = "2d027ae1dddd4694d54f7a8b6cbe78dca8720226"; + sha256 = "1fdab3scp9fm88jxwjw8a3hh5ykx6ads3zcacgy48k2n6b0rqrdw"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "79b0c6888797020a994db17c8510466c72fe75d9"; - sha256 = "0aydjw886c4dwcjg7ssb7xp39ag1529nh3ly1la71rqjr94cjnag"; + rev = "9950ad118b73f9207b991f01920a3509c68f7f2b"; + sha256 = "1607m89kpdxgc2lj14mrp02bg7c42g1zv0fzrl5961gvm5qzbjja"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f"; - sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr"; + rev = "7dd2c8130f5e924233f5543598300651c386d431"; + sha256 = "0ja6skzplirb7dgf5d4wi0navinf8j5iakak020lwm7287wnpcrg"; }; } { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7506ff979a1..1b1bc1b8d279 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -303,6 +303,8 @@ in { oauthenticator = callPackage ../development/python-modules/oauthenticator { }; + outcome = callPackage ../development/python-modules/outcome {}; + plantuml = callPackage ../tools/misc/plantuml { }; Pmw = callPackage ../development/python-modules/Pmw { }; @@ -436,6 +438,10 @@ in { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; + trustme = callPackage ../development/python-modules/trustme {}; + + trio = callPackage ../development/python-modules/trio {}; + tokenserver = callPackage ../development/python-modules/tokenserver {}; toml = callPackage ../development/python-modules/toml { };