diff options
| -rw-r--r-- | nixos/modules/services/web-apps/peertube.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/gcovr/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/python-efl/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/tubeup/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/analysis/randoop/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/gomplate/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/misc/screensavers/xlockmore/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/hqplayerd/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/peertube/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
11 files changed, 32 insertions, 26 deletions
diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index 2fb05209c5c8..c5a80e2d7d9d 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -11,6 +11,7 @@ let NODE_CONFIG_DIR = "/var/lib/peertube/config"; NODE_ENV = "production"; NODE_EXTRA_CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"; + NPM_CONFIG_CACHE = "/var/cache/peertube/.npm"; NPM_CONFIG_PREFIX = cfg.package; HOME = cfg.package; }; @@ -425,6 +426,9 @@ in { # State directory and mode StateDirectory = "peertube"; StateDirectoryMode = "0750"; + # Cache directory and mode + CacheDirectory = "peertube"; + CacheDirectoryMode = "0750"; # Access write directories ReadWritePaths = cfg.dataDirs; # Environment diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 88fc47ad2a59..2661ae1503fd 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "gcovr"; - version = "5.1"; + version = "5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d4CEQ1m/8LlsBBR9r/8l5uWF4FWFvVQjabvDd9ad4SE="; + hash = "sha256-IXGVCF7JQ0YpGoe3sebZz97u5WKz4PmjKyXJUws7zo8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 01ce4bc1260c..beca9b848944 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; installPhase = '' - ${python.interpreter} setup.py install --prefix=$out + ${python.interpreter} setup.py install --prefix=$out --single-version-externally-managed ''; doCheck = false; diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index c86f0298d3bc..3c6690bd39e0 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "tubeup"; - version = "0.0.32"; + version = "0.0.33"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-YWBp6qXz4hNTBzywBGTXDQSzbWfoEEvJLQL5wy8DQ1g="; + sha256 = "sha256-RFM0vZeA5PDXf9KzlJ8RTSfM7bz50bpwwszU0gjV1DY="; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 66258d00935f..6c37a5dca422 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.3.0"; + version = "4.3.1"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "sha256-3svBmXcRvscaK8YD4qm/geQSJ6cAm0en/d7H09h41PQ="; + sha256 = "sha256-GWg3W/jjDKH6BcvjGt215J03NiDVWihU/m+2kejPVPA="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index 087c4fcf3c33..2df0e8ed9416 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gomplate"; - version = "3.10.0"; + version = "3.11.2"; owner = "hairyhenderson"; rev = "v${version}"; src = fetchFromGitHub { inherit owner rev; repo = pname; - sha256 = "0dbi9saxbwcvypxc0s656ln9zq2vysx8dhrcz488nmy6rcpqiiah"; + sha256 = "sha256-NIepoz1JToaX2EJCL/kqkpBJigJVy2Tkz0jGn4ukfvI="; }; - vendorSha256 = "0rvki8ghlbbaqgnjfsbs1jswj08jfzmnz9ilynv2c6kfkx9zs108"; + vendorSha256 = "sha256-fXbwNX+GoujciZVxxe7Tl21MxWhyAD4cW/p8PCAAElw="; postPatch = '' # some tests require network access @@ -24,6 +24,11 @@ buildGoModule rec { internal/tests/integration/datasources_vault*_test.go ''; + # TestInputDir_RespectsUlimit + preCheck = '' + ulimit -n 1024 + ''; + ldflags = [ "-s" "-w" diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index ac739d6a0db4..ff351961c755 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.69"; + version = "5.70"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-6pJlTAASJoSHZaJRpzvLxHPM7xe3IcwY1TYfWdvW07k="; + sha256 = "sha256-DzvLm4AkFs2Hu24WOjhD/qXX+tkP8Eg42hIsKSw9DaI="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index d072ec361a7d..c4716e9b1961 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -12,8 +12,8 @@ let # ./update-zen.py lqx lqxVariant = { version = "5.18.16"; #lqx - suffix = "lqx1"; #lqx - sha256 = "11xcbpf8c5j0gjymbwyq40rnwzjahwh81v26vaz5kavkzw2nma9r"; #lqx + suffix = "lqx2"; #lqx + sha256 = "1mmqsv6qbm6ndbcwnk50z6z2iffgkcrndf81s2ycqngb076hq969"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 26f71e9dcccb..37b60ce56aaf 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -5,7 +5,7 @@ , cairo , fetchurl , flac -, gcc11 +, gcc12 , gnome , gssdp , gupnp @@ -22,11 +22,11 @@ }: stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.32.2-92"; + version = "4.32.4-94sse42"; src = fetchurl { - url = "https://www.signalyst.eu/bins/${pname}/fc35/${pname}-${version}.fc35.x86_64.rpm"; - hash = "sha256-chgzu5r35VTSc1xOVTPCWCRrjABOy+vs57SsKOSzvkM="; + url = "https://www.signalyst.eu/bins/${pname}/fc36/${pname}-${version}.fc36.x86_64.rpm"; + hash = "sha256-hTckJdZzD/Sx/uV30dlGiT46QvzIGp6BQdNNRlQ/Mgw="; }; unpackPhase = '' @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { alsa-lib cairo flac - gcc11.cc.lib + gcc12.cc.lib gnome.rygel gssdp gupnp diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index f4a80cbe26f6..6b94fec15384 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -6,18 +6,18 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then "linux-x64" else throw "Unsupported architecture: ${stdenv.hostPlatform.system}"; - version = "4.2.1"; + version = "4.2.2"; source = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - sha256 = "sha256-bb22/GidSPaRtvbht6FzVqTGzzNDYgBdHqHGnzA1Iy0="; + sha256 = "sha256-q6wSk5AO91Z6dw5MgpO7QTAlA8Q5Xx1CboBr7SElVUA="; }; yarnOfflineCacheServer = fetchYarnDeps { yarnLock = "${source}/yarn.lock"; - sha256 = "sha256-7fYQ4YS92XbzeI7nwpQfI2reDp6EiDgncK5YGSWzHF0="; + sha256 = "sha256-MMsxh20jcbW4YYsJyoupKbT9+Xa1BWZAmYHoj2/t+LM="; }; yarnOfflineCacheTools = fetchYarnDeps { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e651320c0579..9dcfaf0e1288 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23709,10 +23709,7 @@ with pkgs; gomp = callPackage ../applications/version-management/gomp { }; - gomplate = callPackage ../development/tools/gomplate { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + gomplate = callPackage ../development/tools/gomplate { }; gpm = callPackage ../servers/gpm { withNcurses = false; # Keep curses disabled for lack of value |
