From a4855047408261be2a2280f61ca9689bbbf742db Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 11 Jul 2017 21:59:40 +0200 Subject: [PATCH 1/7] config.users.ldap: do not include nss module if turned off --- nixos/modules/config/ldap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index 1a5dbcd4e26..5b81d5c0c54 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -240,9 +240,9 @@ in ''; }; - system.nssModules = singleton ( + system.nssModules = mkIf cfg.nsswitch (singleton ( if cfg.daemon.enable then nss_pam_ldapd else nss_ldap - ); + )); system.nssDatabases.group = optional cfg.nsswitch "ldap"; system.nssDatabases.passwd = optional cfg.nsswitch "ldap"; From 28039d8f56398de888c72bf424e9043fd691eb45 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 23 Nov 2020 12:24:00 +0100 Subject: [PATCH 2/7] py-spy: init at 0.3.3 --- pkgs/development/tools/py-spy/default.nix | 30 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/py-spy/default.nix diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix new file mode 100644 index 00000000000..5e1dcbfa6fc --- /dev/null +++ b/pkgs/development/tools/py-spy/default.nix @@ -0,0 +1,30 @@ +{ stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkgconfig, libunwind, python3 }: + +rustPlatform.buildRustPackage rec { + pname = "py-spy"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "benfred"; + repo = "py-spy"; + rev = "v${version}"; + sha256 = "1w9nwsmazafr78ghif6njdcqjisr0f1jb6cm1w4ngvigx5qlrbkv"; + }; + + NIX_CFLAGS_COMPILE = "-L${libunwind}/lib"; + + # error: linker `arm-linux-gnueabihf-gcc` not found + preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + export RUSTFLAGS="-Clinker=$CC" + ''; + + checkInputs = [ python3 ]; + + cargoSha256 = "0hrzmpwd2k4l8gjbry8ddrkv9q9qh8ag096md4q0fyn5bgnxhkah"; + + meta = with stdenv.lib; { + description = "Sampling profiler for Python programs"; + license = licenses.mit; + maintainers = [ maintainers.lnl7 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5ec64155f0..127995276b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6676,6 +6676,8 @@ in pythonPackages = python27Packages; }; + py-spy = callPackage ../development/tools/py-spy { }; + pytrainer = callPackage ../applications/misc/pytrainer { }; pywal = with python3Packages; toPythonApplication pywal; From e10a0ae16e6cd498258902490f06afbec77dcab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Wed, 9 Dec 2020 20:45:35 +0100 Subject: [PATCH 3/7] fluxcd: init at 0.5.0 This is flux v2. There is also fluxctl (flux v1). v1 is in maintenance mode, and it will be deprecated at some point, but some people may still depend on v1. --- .../networking/cluster/fluxcd/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/networking/cluster/fluxcd/default.nix diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix new file mode 100644 index 00000000000..bd903bf7253 --- /dev/null +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -0,0 +1,43 @@ +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "fluxcd"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "fluxcd"; + repo = "flux2"; + rev = "v${version}"; + sha256 = "125im8br7x8djd6zagvikpc02k55pxbd97rjj3g2frj9plbryh8n"; + }; + + vendorSha256 = "0f818a0z71nl061db93iqb87njx66vbrra1zh92warbx8djdsr7k"; + + nativeBuildInputs = [ installShellFiles ]; + + doCheck = false; + + subPackages = [ "cmd/flux" ]; + + buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/flux completion $shell > flux.$shell + installShellCompletion flux.$shell + done + ''; + + meta = with stdenv.lib; { + description = "Open and extensible continuous delivery solution for Kubernetes"; + longDescription = '' + Flux is a tool for keeping Kubernetes clusters in sync + with sources of configuration (like Git repositories), and automating + updates to configuration when there is new code to deploy. + ''; + homepage = "https://fluxcd.io"; + license = licenses.asl20; + maintainers = with maintainers; [ jlesquembre ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3c3330ae37..cf974288258 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22199,6 +22199,8 @@ in fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; + fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; + linkerd = callPackage ../applications/networking/cluster/linkerd { }; kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; From a2460414cb7915b2e44be268f22b76a6fd6831f9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 11 Dec 2020 17:13:59 +0000 Subject: [PATCH 4/7] nixos/mailman: run non-minutely jobs Fixes: b478e0043c53964c99cc9a145c155a673af3c7d8 ("nixos/mailman: refactor") --- nixos/modules/services/mail/mailman.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 5c61cfbebf6..18a607f5e2c 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -421,7 +421,7 @@ in { inherit startAt; restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; serviceConfig = { - ExecStart = "${pythonEnv}/bin/mailman-web runjobs minutely"; + ExecStart = "${pythonEnv}/bin/mailman-web runjobs ${name}"; User = cfg.webUser; Group = "mailman"; WorkingDirectory = "/var/lib/mailman-web"; From 7bb9e5053beb4b7a089f7a40947c4bd1b85ab6a9 Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Sat, 12 Dec 2020 07:43:21 -0300 Subject: [PATCH 5/7] hover: init at 0.43.0 (#80075) --- pkgs/development/tools/hover/default.nix | 100 ++++++++++++++++++ .../tools/hover/fix-assets-path.patch | 78 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 180 insertions(+) create mode 100644 pkgs/development/tools/hover/default.nix create mode 100644 pkgs/development/tools/hover/fix-assets-path.patch diff --git a/pkgs/development/tools/hover/default.nix b/pkgs/development/tools/hover/default.nix new file mode 100644 index 00000000000..7b50f473d8f --- /dev/null +++ b/pkgs/development/tools/hover/default.nix @@ -0,0 +1,100 @@ +{ lib +, buildGoModule +, buildFHSUserEnv +, dejavu_fonts +, pkgconfig +, fetchFromGitHub +, stdenv +, roboto +, writeScript +, xorg +, libglvnd +, addOpenGLRunpath +, makeWrapper +, gcc +, go +, flutter +}: + +let + pname = "hover"; + version = "0.43.0"; + + libs = with xorg; [ + libX11.dev + libXcursor.dev + libXext.dev + libXi.dev + libXinerama.dev + libXrandr.dev + libXrender.dev + libXfixes.dev + libXxf86vm + libglvnd.dev + xorgproto + ]; + hover = buildGoModule rec { + inherit pname version; + + meta = with stdenv.lib; { + description = "A build tool to run Flutter applications on desktop"; + homepage = "https://github.com/go-flutter-desktop/hover"; + license = licenses.bsd3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = [ maintainers.ericdallo maintainers.thiagokokada]; + }; + + subPackages = [ "." ]; + + vendorSha256 = "1wr08phjm87dxim47i8449rmq5wfscvjyz65g3lxmv468x209pam"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "go-flutter-desktop"; + repo = pname; + sha256 = "0iw6sxg86wfdbihl2hxzn43ppdzl1p7g5b9wl8ac3xa9ix8759ax"; + }; + + nativeBuildInputs = [ addOpenGLRunpath makeWrapper ]; + + buildInputs = libs; + + checkRun = false; + + patches = [ + ./fix-assets-path.patch + ]; + + postPatch = '' + sed -i 's|@assetsFolder@|'"''${out}/share/assets"'|g' internal/fileutils/assets.go + ''; + + postInstall = '' + mkdir -p $out/share + cp -r assets $out/share/assets + chmod -R a+rx $out/share/assets + + wrapProgram "$out/bin/hover" \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath libs} + ''; + + postFixup = '' + addOpenGLRunpath $out/bin/hover + ''; + }; + +in +buildFHSUserEnv rec { + name = pname; + targetPkgs = pkgs: [ + dejavu_fonts + flutter + gcc + go + hover + pkgconfig + roboto + ] ++ libs; + + runScript = "hover"; +} diff --git a/pkgs/development/tools/hover/fix-assets-path.patch b/pkgs/development/tools/hover/fix-assets-path.patch new file mode 100644 index 00000000000..27d49197e56 --- /dev/null +++ b/pkgs/development/tools/hover/fix-assets-path.patch @@ -0,0 +1,78 @@ +diff --git a/internal/fileutils/assets.go b/internal/fileutils/assets.go +index 83eacd9..0b80e51 100644 +--- a/internal/fileutils/assets.go ++++ b/internal/fileutils/assets.go +@@ -1,28 +1,7 @@ + //go:generate rice embed + package fileutils + +-import ( +- "os" +- "sync" +- +- rice "github.com/GeertJohan/go.rice" +- "github.com/go-flutter-desktop/hover/internal/log" +-) +- +-var ( +- assetsBox *rice.Box +- assetsBoxOnce sync.Once +-) +- + // AssetsBox hover's assets box +-func AssetsBox() *rice.Box { +- assetsBoxOnce.Do(func() { +- var err error +- assetsBox, err = rice.FindBox("../../assets") +- if err != nil { +- log.Errorf("Failed to find hover assets: %v", err) +- os.Exit(1) +- } +- }) +- return assetsBox ++func AssetsBox() string { ++ return "@assetsFolder@" + } +diff --git a/internal/fileutils/file.go b/internal/fileutils/file.go +index cb75563..3822e80 100644 +--- a/internal/fileutils/file.go ++++ b/internal/fileutils/file.go +@@ -11,8 +11,6 @@ import ( + "strings" + "text/template" + +- rice "github.com/GeertJohan/go.rice" +- + "github.com/go-flutter-desktop/hover/internal/log" + ) + +@@ -215,24 +213,24 @@ func ExecuteTemplateFromFile(boxed, to string, templateData interface{}) { + } + + // ExecuteTemplateFromAssetsBox create file from a template asset +-func ExecuteTemplateFromAssetsBox(boxed, to string, assetsBox *rice.Box, templateData interface{}) { +- templateString, err := assetsBox.String(boxed) ++func ExecuteTemplateFromAssetsBox(boxed, to string, assetsBox string, templateData interface{}) { ++ templateString, err := ioutil.ReadFile(boxed + "/" + boxed) + if err != nil { + log.Errorf("Failed to find template file: %v\n", err) + os.Exit(1) + } +- executeTemplateFromString(templateString, to, templateData) ++ executeTemplateFromString(string(templateString), to, templateData) + } + + // CopyAsset copies a file from asset +-func CopyAsset(boxed, to string, assetsBox *rice.Box) { ++func CopyAsset(boxed string, to string, assetsBox string) { + file, err := os.Create(to) + if err != nil { + log.Errorf("Failed to create %s: %v", to, err) + os.Exit(1) + } + defer file.Close() +- boxedFile, err := assetsBox.Open(boxed) ++ boxedFile, err := os.OpenFile(assetsBox + "/" + boxed, os.O_RDONLY, 0666) + if err != nil { + log.Errorf("Failed to find boxed file %s: %v", boxed, err) + os.Exit(1) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 970cdf7ad7e..0ddb64d0a48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21831,6 +21831,8 @@ in gtk = gtk3; }; + hover = callPackage ../development/tools/hover { }; + hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { }; howl = callPackage ../applications/editors/howl { }; From 0c9088ad2b76905811f4091fdb9d99bebc6b8ed9 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Sat, 12 Dec 2020 12:05:24 +0100 Subject: [PATCH 6/7] django-extensions: 3.0.8 -> 3.1.0 Also fix tests --- .../python-modules/django-extensions/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index ecf400b21d8..455eeebddde 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "3.0.8"; + version = "3.1.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1z2si9wpc8irqhi5i2wp4wr05dqxyw4mn2vj3amp0rvsvydws92c"; + sha256 = "hZ6GS2VkXH8KfKZuL1rR6JS/nDkx8SfKuUx5XrvTbec="; }; LC_ALL = "en_US.UTF-8"; @@ -49,10 +49,11 @@ buildPythonPackage rec { werkzeug ]; - # tests not compatible with pip>=20 + # remove tests that need network access checkPhase = '' rm tests/management/commands/test_pipchecker.py - ${python.interpreter} setup.py test + DJANGO_SETTINGS_MODULE=tests.testapp.settings \ + pytest django_extensions tests ''; meta = with lib; { From 9f8670c2069172773ea3d5a1780015cd4485ed99 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Sat, 12 Dec 2020 12:06:17 +0100 Subject: [PATCH 7/7] paperless: Fix build paperless wasn't building because django-cors-headers didn't build anymore with the pinned django version. I tested the paperless service (editd a few documents) and it works fine, even with django unpinned. --- .../applications/office/paperless/default.nix | 6 ------ .../paperless/python-modules/default.nix | 19 ------------------- 2 files changed, 25 deletions(-) diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index ebd057da5ce..499078611fc 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -111,15 +111,9 @@ let { pyocr = pyocrWithUserTesseract super; - # Paperless only supports Django 2.0 - django = customPkgs.django_2_0; - # Paperless is incompatible with factory_boy >= 3 factory_boy = customPkgs.factory_boy_2_12_0; - # The current version of django_extensions is incompatible with django 2.0 - django_extensions = customPkgs.django_extensions_2_2_8; - # These are pre-release versions, hence they are private to this pkg django-filter = self.callPackage ./python-modules/django-filter.nix {}; django-crispy-forms = self.callPackage ./python-modules/django-crispy-forms.nix {}; diff --git a/pkgs/applications/office/paperless/python-modules/default.nix b/pkgs/applications/office/paperless/python-modules/default.nix index 4c5510ebb74..e1fb227614f 100644 --- a/pkgs/applications/office/paperless/python-modules/default.nix +++ b/pkgs/applications/office/paperless/python-modules/default.nix @@ -1,24 +1,5 @@ pyPkgs: fetchFromGitHub: { - django_2_0 = pyPkgs.django_2.overridePythonAttrs (old: rec { - version = "2.0.12"; - src = pyPkgs.fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "15s8z54k0gf9brnz06521bikm60ddw5pn6v3nbvnl47j1jjsvwz2"; - }; - }); - - django_extensions_2_2_8 = pyPkgs.django_extensions.overridePythonAttrs (old: rec { - version = "2.2.8"; - src = fetchFromGitHub { - owner = old.pname; - repo = old.pname; - rev = version; - sha256 = "1gd3nykwzh3azq1p9cvgkc3l5dwrv7y86sfjxd9llbyj8ky71iaj"; - }; - }); - factory_boy_2_12_0 = pyPkgs.factory_boy.overridePythonAttrs (old: rec { version = "2.12.0"; src = pyPkgs.fetchPypi {