From 560dc49bff9409e00cc546d9b38de23b8c144f00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Dec 2020 11:23:55 +0100 Subject: [PATCH 1/6] maintainers: add fab --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e1b000529485..fe8ba2db8e85 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2905,6 +2905,16 @@ githubId = 11909469; name = "Fabian Geiselhart"; }; + fab = { + email = "mail@fabian-affolter.ch"; + name = "Fabian Affolter"; + github = "fabaff"; + githubId = 116184; + keys = [{ + longkeyid = "dsa1024/0xE23CD2DD36A4397F"; + fingerprint = "2F6C 930F D3C4 7E38 6AFA 4EB4 E23C D2DD 36A4 397F"; + }]; + }; fabianhauser = { email = "fabian.nixos@fh2.ch"; github = "fabianhauser"; From 702161d4d2dcd601c9b78f2120ea34502a44fa71 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 22 Dec 2020 18:25:24 -0600 Subject: [PATCH 2/6] winetricks: 20200412 -> 20201206 --- pkgs/misc/emulators/wine/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 4b16e78cd736..afa172823853 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -77,8 +77,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20200412"; - sha256 = "0ccr8wdmhkhbccxs5hvn44ppl969n8j0c3rnnir5v6akjcb2nzzv"; + version = "20201206"; + sha256 = "1xs09v1zr98yvwvdsmzgryc2hbk92mwn54yxx8162l461465razc"; owner = "Winetricks"; repo = "winetricks"; rev = version; From 02040cb53dbf8c2ac6de8467e9d2b63b5cae977e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 Dec 2020 02:24:55 +0000 Subject: [PATCH 3/6] python37Packages.chalice: 1.21.6 -> 1.21.7 --- pkgs/development/python-modules/chalice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 42018661f741..224ff33d5f05 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.21.6"; + version = "1.21.7"; src = fetchPypi { inherit pname version; - sha256 = "b7a17583e0553caa0e44d23186b4aad069f7665c24a473104d1f04e62cc4cb07"; + sha256 = "22512bccb9b881b8d5a33bd45c7ad539dee60f2f8685a5ed8afd5000a962b0f8"; }; checkInputs = [ watchdog pytest hypothesis mock ]; From e57c6c25c0df39f30cc83c9e5502e2a4d530117c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 Dec 2020 05:57:58 +0000 Subject: [PATCH 4/6] python37Packages.netcdf4: 1.5.5 -> 1.5.5.1 --- pkgs/development/python-modules/netcdf4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 432603d62055..33c7d307b037 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { pname = "netCDF4"; - version = "1.5.5"; + version = "1.5.5.1"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "910b0c9d1ca7bef9c5796c45e2f5f30b91df70997ac655c51a58073eff2634f9"; + sha256 = "d957e55a667d1fc651ddef22fea10ded0f142b7d9dbbf4d08c0012d32f445abd"; }; checkInputs = [ pytest ]; From 357f132b945c5fc38b5a5e37ed057285be6137b3 Mon Sep 17 00:00:00 2001 From: Justus K Date: Wed, 2 Dec 2020 20:53:19 +0100 Subject: [PATCH 5/6] doc: convert Steam to CommonMark --- doc/builders/packages/index.xml | 2 +- doc/builders/packages/steam.section.md | 69 ++++++++++++++ doc/builders/packages/steam.xml | 125 ------------------------- 3 files changed, 70 insertions(+), 126 deletions(-) create mode 100644 doc/builders/packages/steam.section.md delete mode 100644 doc/builders/packages/steam.xml diff --git a/doc/builders/packages/index.xml b/doc/builders/packages/index.xml index e1ddfd276e20..732560ec1992 100644 --- a/doc/builders/packages/index.xml +++ b/doc/builders/packages/index.xml @@ -18,7 +18,7 @@ - + diff --git a/doc/builders/packages/steam.section.md b/doc/builders/packages/steam.section.md new file mode 100644 index 000000000000..e33f1192f7c0 --- /dev/null +++ b/doc/builders/packages/steam.section.md @@ -0,0 +1,69 @@ +# Steam {#sec-steam} + +## Steam in Nix {#sec-steam-nix} + +Steam is distributed as a `.deb` file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called `steam` that in Ubuntu (their target distro) would go to `/usr/bin`. When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in \$HOME. + +Nix problems and constraints: + +- We don't have `/bin/bash` and many scripts point there. Similarly for `/usr/bin/python`. +- We don't have the dynamic loader in `/lib`. +- The `steam.sh` script in \$HOME can not be patched, as it is checked and rewritten by steam. +- The steam binary cannot be patched, it's also checked. + +The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented [here](http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html). This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment. + +## How to play {#sec-steam-play} + +Use `programs.steam.enable = true;` if you want to add steam to systemPackages and also enable a few workarrounds aswell as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pr. + +## Troubleshooting {#sec-steam-troub} + +- **Steam fails to start. What do I do?** + Try to run + + ```ShellSession + strace steam + ``` + + to see what is causing steam to fail. + +- **Using the FOSS Radeon or nouveau (nvidia) drivers** + + - The `newStdcpp` parameter was removed since NixOS 17.09 and should not be needed anymore. + - Steam ships statically linked with a version of libcrypto that conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error + ``` + steam.sh: line 713: 7842 Segmentation fault (core dumped) + ``` + have a look at [this pull request](https://github.com/NixOS/nixpkgs/pull/20269). + +- **Java** + + 1. There is no java in steam chrootenv by default. If you get a message like + + ``` + /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found + ``` + + You need to add + + ```nix + steam.override { withJava = true; }; + ``` + +## steam-run {#sec-steam-run} + +The FHS-compatible chroot used for steam can also be used to run other linux games that expect a FHS environment. To do it, add + +```nix +pkgs.steam.override ({ + nativeOnly = true; + newStdcpp = true; + }).run +``` + +to your configuration, rebuild, and run the game with + +``` +steam-run ./foo +``` diff --git a/doc/builders/packages/steam.xml b/doc/builders/packages/steam.xml deleted file mode 100644 index 59673328bace..000000000000 --- a/doc/builders/packages/steam.xml +++ /dev/null @@ -1,125 +0,0 @@ -
- Steam - -
- Steam in Nix - - - Steam is distributed as a .deb file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called steam that in Ubuntu (their target distro) would go to /usr/bin . When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in $HOME. - - - - Nix problems and constraints: - - - - We don't have /bin/bash and many scripts point there. Similarly for /usr/bin/python . - - - - - We don't have the dynamic loader in /lib . - - - - - The steam.sh script in $HOME can not be patched, as it is checked and rewritten by steam. - - - - - The steam binary cannot be patched, it's also checked. - - - - - - - The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented here. This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment. - -
- -
- How to play - - - Use programs.steam.enable = true; if you want to add steam to systemPackages and also enable a few workarrounds aswell as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pr. - -
- -
- Troubleshooting - - - - - - Steam fails to start. What do I do? - - - - Try to run -strace steam - to see what is causing steam to fail. - - - - - - Using the FOSS Radeon or nouveau (nvidia) drivers - - - - - - The newStdcpp parameter was removed since NixOS 17.09 and should not be needed anymore. - - - - - Steam ships statically linked with a version of libcrypto that conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error -steam.sh: line 713: 7842 Segmentation fault (core dumped) - have a look at this pull request. - - - - - - - - Java - - - - - - There is no java in steam chrootenv by default. If you get a message like -/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found - You need to add - steam.override { withJava = true; }; - to your configuration. - - - - - - - -
- -
- steam-run - - - The FHS-compatible chroot used for steam can also be used to run other linux games that expect a FHS environment. To do it, add -pkgs.(steam.override { - nativeOnly = true; - newStdcpp = true; - }).run - to your configuration, rebuild, and run the game with -steam-run ./foo - -
-
From 2ae527c50e049570dd25132f9325527aa2320e32 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 22 Dec 2020 23:17:04 +0800 Subject: [PATCH 6/6] qtractor: 0.9.18 -> 0.9.19 --- pkgs/applications/audio/qtractor/default.nix | 80 +++++++++++++++----- 1 file changed, 62 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 961314088d1a..f2d5ae1c8092 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,35 +1,79 @@ -{ alsaLib, autoconf, automake, dssi, fetchurl, libjack2 -, ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile -, libtool, libvorbis, lilv, lv2, pkgconfig, qttools, qtbase, rubberband, serd -, sord, sratom, stdenv, suil, wrapQtAppsHook }: +{ alsaLib +, aubio +, cmake +, dssi +, fetchurl +, flac +, libjack2 +, ladspaH +, ladspaPlugins +, liblo +, libmad +, libsamplerate +, libsndfile +, libtool +, libvorbis +, lilv +, lv2 +, mkDerivation +, opusfile +, pkg-config +, qttools +, qtbase +, rubberband +, serd +, sord +, sratom +, stdenv +, suil +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qtractor"; - version = "0.9.18"; + version = "0.9.19"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "121vmygdzp37p6f93f8dbbg2m2r55j7amyiapzkqgypgn4vfdbwr"; + sha256 = "sha256-98/trRZRvNRPEA4ASS81qp2rMevpo5TIrtsU1TYMuT0="; }; nativeBuildInputs = [ - autoconf automake libtool pkgconfig qttools wrapQtAppsHook + cmake + libtool + pkg-config + qttools ]; - buildInputs = - [ alsaLib dssi libjack2 ladspaH - ladspaPlugins liblo libmad libsamplerate libsndfile libtool - libvorbis lilv lv2 qtbase rubberband serd sord sratom - suil - ]; - - enableParallelBuilding = true; + buildInputs = [ + alsaLib + aubio + dssi + flac + libjack2 + ladspaH + ladspaPlugins + liblo + libmad + libsamplerate + libsndfile + libtool + libvorbis + lilv + lv2 + opusfile + qtbase + rubberband + serd + sord + sratom + suil + ]; meta = with stdenv.lib; { description = "Audio/MIDI multi-track sequencer"; - homepage = "http://qtractor.sourceforge.net"; + homepage = "https://qtractor.sourceforge.io"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; }; }